ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.46 by jsr166, Mon Jun 2 17:41:22 2014 UTC vs.
Revision 1.133 by jsr166, Sun Nov 15 19:39:25 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 259 | 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());
267 <        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);
277 <    }
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(0, f.getNumberOfDependents());
319 <        CompletableFuture g = f.thenRun(new Noop());
319 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
320          assertEquals(1, f.getNumberOfDependents());
321          assertEquals(0, g.getNumberOfDependents());
322 <        CompletableFuture h = f.thenRun(new Noop());
322 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
323          assertEquals(2, f.getNumberOfDependents());
324 <        f.complete(1);
324 >        assertEquals(0, h.getNumberOfDependents());
325 >        assertTrue(f.complete(v1));
326          checkCompletedNormally(g, null);
327 +        checkCompletedNormally(h, null);
328          assertEquals(0, f.getNumberOfDependents());
329          assertEquals(0, g.getNumberOfDependents());
330 <    }
330 >        assertEquals(0, h.getNumberOfDependents());
331 >    }}
332  
333      /**
334       * toString indicates current completion state
# Line 302 | 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 318 | 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 332 | 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);
339 <    static final BiFunction<Integer, Integer, Integer> subtract =
340 <        (Integer x, Integer y) -> subtract(x, y);
341 <    static final class IncAction implements Consumer<Integer> {
342 <        int invocationCount = 0;
343 <        Integer value;
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 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);
# Line 521 | Line 638 | public class CompletableFutureTest exten
638              }
639          },
640  
641 <        DEFAULT_ASYNC {
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);
# Line 586 | Line 713 | public class CompletableFutureTest exten
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());
# Line 649 | Line 785 | public class CompletableFutureTest exten
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
# Line 698 | Line 837 | public class CompletableFutureTest exten
837      {
838          final AtomicInteger a = new AtomicInteger(0);
839          final CompletableFuture<Integer> f = new CompletableFuture<>();
840 <        if (!createIncomplete) f.complete(v1);
840 >        if (!createIncomplete) assertTrue(f.complete(v1));
841          final CompletableFuture<Integer> g = f.exceptionally
842              ((Throwable t) -> {
704                // Should not be called
843                  a.getAndIncrement();
844 <                throw new AssertionError();
844 >                threadFail("should not be called");
845 >                return null;            // unreached
846              });
847 <        if (createIncomplete) f.complete(v1);
847 >        if (createIncomplete) assertTrue(f.complete(v1));
848  
849          checkCompletedNormally(g, v1);
850          checkCompletedNormally(f, v1);
851          assertEquals(0, a.get());
852      }}
853  
715
854      /**
855       * exceptionally action completes with function value on source
856       * exception
# Line 727 | Line 865 | public class CompletableFutureTest exten
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;
# Line 739 | Line 878 | public class CompletableFutureTest exten
878  
879      public void testExceptionally_exceptionalCompletionActionFailed() {
880          for (boolean createIncomplete : new boolean[] { true, false })
742        for (Integer v1 : new Integer[] { 1, null })
881      {
882          final AtomicInteger a = new AtomicInteger(0);
883          final CFException ex1 = new CFException();
# Line 748 | Line 886 | public class CompletableFutureTest exten
886          if (!createIncomplete) f.completeExceptionally(ex1);
887          final CompletableFuture<Integer> g = f.exceptionally
888              ((Throwable t) -> {
889 +                ExecutionMode.SYNC.checkExecutionMode();
890                  threadAssertSame(t, ex1);
891                  a.getAndIncrement();
892                  throw ex2;
893              });
894          if (createIncomplete) f.completeExceptionally(ex1);
895  
896 <        checkCompletedWithWrappedCFException(g, ex2);
896 >        checkCompletedWithWrappedException(g, ex2);
897 >        assertEquals(1, a.get());
898 >    }}
899 >
900 >    /**
901 >     * whenComplete action executes on normal completion, propagating
902 >     * source result.
903 >     */
904 >    public void testWhenComplete_normalCompletion() {
905 >        for (ExecutionMode m : ExecutionMode.values())
906 >        for (boolean createIncomplete : new boolean[] { true, false })
907 >        for (Integer v1 : new Integer[] { 1, null })
908 >    {
909 >        final AtomicInteger a = new AtomicInteger(0);
910 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
911 >        if (!createIncomplete) assertTrue(f.complete(v1));
912 >        final CompletableFuture<Integer> g = m.whenComplete
913 >            (f,
914 >             (Integer x, Throwable t) -> {
915 >                m.checkExecutionMode();
916 >                threadAssertSame(x, v1);
917 >                threadAssertNull(t);
918 >                a.getAndIncrement();
919 >            });
920 >        if (createIncomplete) assertTrue(f.complete(v1));
921 >
922 >        checkCompletedNormally(g, v1);
923 >        checkCompletedNormally(f, v1);
924 >        assertEquals(1, a.get());
925 >    }}
926 >
927 >    /**
928 >     * whenComplete action executes on exceptional completion, propagating
929 >     * source result.
930 >     */
931 >    public void testWhenComplete_exceptionalCompletion() {
932 >        for (ExecutionMode m : ExecutionMode.values())
933 >        for (boolean createIncomplete : new boolean[] { true, false })
934 >    {
935 >        final AtomicInteger a = new AtomicInteger(0);
936 >        final CFException ex = new CFException();
937 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
938 >        if (!createIncomplete) f.completeExceptionally(ex);
939 >        final CompletableFuture<Integer> g = m.whenComplete
940 >            (f,
941 >             (Integer x, Throwable t) -> {
942 >                m.checkExecutionMode();
943 >                threadAssertNull(x);
944 >                threadAssertSame(t, ex);
945 >                a.getAndIncrement();
946 >            });
947 >        if (createIncomplete) f.completeExceptionally(ex);
948 >
949 >        checkCompletedWithWrappedException(g, ex);
950 >        checkCompletedExceptionally(f, ex);
951 >        assertEquals(1, a.get());
952 >    }}
953 >
954 >    /**
955 >     * whenComplete action executes on cancelled source, propagating
956 >     * CancellationException.
957 >     */
958 >    public void testWhenComplete_sourceCancelled() {
959 >        for (ExecutionMode m : ExecutionMode.values())
960 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
961 >        for (boolean createIncomplete : new boolean[] { true, false })
962 >    {
963 >        final AtomicInteger a = new AtomicInteger(0);
964 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
965 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
966 >        final CompletableFuture<Integer> g = m.whenComplete
967 >            (f,
968 >             (Integer x, Throwable t) -> {
969 >                m.checkExecutionMode();
970 >                threadAssertNull(x);
971 >                threadAssertTrue(t instanceof CancellationException);
972 >                a.getAndIncrement();
973 >            });
974 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
975 >
976 >        checkCompletedWithWrappedCancellationException(g);
977 >        checkCancelled(f);
978 >        assertEquals(1, a.get());
979 >    }}
980 >
981 >    /**
982 >     * If a whenComplete action throws an exception when triggered by
983 >     * a normal completion, it completes exceptionally
984 >     */
985 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
986 >        for (boolean createIncomplete : new boolean[] { true, false })
987 >        for (ExecutionMode m : ExecutionMode.values())
988 >        for (Integer v1 : new Integer[] { 1, null })
989 >    {
990 >        final AtomicInteger a = new AtomicInteger(0);
991 >        final CFException ex = new CFException();
992 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 >        if (!createIncomplete) assertTrue(f.complete(v1));
994 >        final CompletableFuture<Integer> g = m.whenComplete
995 >            (f,
996 >             (Integer x, Throwable t) -> {
997 >                m.checkExecutionMode();
998 >                threadAssertSame(x, v1);
999 >                threadAssertNull(t);
1000 >                a.getAndIncrement();
1001 >                throw ex;
1002 >            });
1003 >        if (createIncomplete) assertTrue(f.complete(v1));
1004 >
1005 >        checkCompletedWithWrappedException(g, ex);
1006 >        checkCompletedNormally(f, v1);
1007 >        assertEquals(1, a.get());
1008 >    }}
1009 >
1010 >    /**
1011 >     * If a whenComplete action throws an exception when triggered by
1012 >     * a source completion that also throws an exception, the source
1013 >     * exception takes precedence.
1014 >     */
1015 >    public void testWhenComplete_actionFailedSourceFailed() {
1016 >        for (boolean createIncomplete : new boolean[] { true, false })
1017 >        for (ExecutionMode m : ExecutionMode.values())
1018 >    {
1019 >        final AtomicInteger a = new AtomicInteger(0);
1020 >        final CFException ex1 = new CFException();
1021 >        final CFException ex2 = new CFException();
1022 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1023 >
1024 >        if (!createIncomplete) f.completeExceptionally(ex1);
1025 >        final CompletableFuture<Integer> g = m.whenComplete
1026 >            (f,
1027 >             (Integer x, Throwable t) -> {
1028 >                m.checkExecutionMode();
1029 >                threadAssertSame(t, ex1);
1030 >                threadAssertNull(x);
1031 >                a.getAndIncrement();
1032 >                throw ex2;
1033 >            });
1034 >        if (createIncomplete) f.completeExceptionally(ex1);
1035 >
1036 >        checkCompletedWithWrappedException(g, ex1);
1037 >        checkCompletedExceptionally(f, ex1);
1038          assertEquals(1, a.get());
1039      }}
1040  
# Line 769 | Line 1049 | public class CompletableFutureTest exten
1049      {
1050          final CompletableFuture<Integer> f = new CompletableFuture<>();
1051          final AtomicInteger a = new AtomicInteger(0);
1052 <        if (!createIncomplete) f.complete(v1);
1052 >        if (!createIncomplete) assertTrue(f.complete(v1));
1053          final CompletableFuture<Integer> g = m.handle
1054              (f,
1055               (Integer x, Throwable t) -> {
1056 +                m.checkExecutionMode();
1057                  threadAssertSame(x, v1);
1058                  threadAssertNull(t);
1059                  a.getAndIncrement();
1060                  return inc(v1);
1061              });
1062 <        if (createIncomplete) f.complete(v1);
1062 >        if (createIncomplete) assertTrue(f.complete(v1));
1063  
1064          checkCompletedNormally(g, inc(v1));
1065          checkCompletedNormally(f, v1);
# Line 801 | Line 1082 | public class CompletableFutureTest exten
1082          final CompletableFuture<Integer> g = m.handle
1083              (f,
1084               (Integer x, Throwable t) -> {
1085 +                m.checkExecutionMode();
1086                  threadAssertNull(x);
1087                  threadAssertSame(t, ex);
1088                  a.getAndIncrement();
# Line 809 | Line 1091 | public class CompletableFutureTest exten
1091          if (createIncomplete) f.completeExceptionally(ex);
1092  
1093          checkCompletedNormally(g, v1);
1094 <        checkCompletedWithWrappedCFException(f, ex);
1094 >        checkCompletedExceptionally(f, ex);
1095          assertEquals(1, a.get());
1096      }}
1097  
# Line 829 | Line 1111 | public class CompletableFutureTest exten
1111          final CompletableFuture<Integer> g = m.handle
1112              (f,
1113               (Integer x, Throwable t) -> {
1114 +                m.checkExecutionMode();
1115                  threadAssertNull(x);
1116                  threadAssertTrue(t instanceof CancellationException);
1117                  a.getAndIncrement();
# Line 856 | Line 1139 | public class CompletableFutureTest exten
1139          final CompletableFuture<Integer> g = m.handle
1140              (f,
1141               (Integer x, Throwable t) -> {
1142 +                m.checkExecutionMode();
1143                  threadAssertNull(x);
1144                  threadAssertSame(ex1, t);
1145                  a.getAndIncrement();
# Line 863 | Line 1147 | public class CompletableFutureTest exten
1147              });
1148          if (createIncomplete) f.completeExceptionally(ex1);
1149  
1150 <        checkCompletedWithWrappedCFException(g, ex2);
1151 <        checkCompletedWithWrappedCFException(f, ex1);
1150 >        checkCompletedWithWrappedException(g, ex2);
1151 >        checkCompletedExceptionally(f, ex1);
1152          assertEquals(1, a.get());
1153      }}
1154  
1155 +    /**
1156 +     * If a "handle action" throws an exception when triggered by
1157 +     * a normal completion, it completes exceptionally
1158 +     */
1159      public void testHandle_sourceCompletedNormallyActionFailed() {
1160          for (ExecutionMode m : ExecutionMode.values())
1161          for (boolean createIncomplete : new boolean[] { true, false })
# Line 876 | Line 1164 | public class CompletableFutureTest exten
1164          final CompletableFuture<Integer> f = new CompletableFuture<>();
1165          final AtomicInteger a = new AtomicInteger(0);
1166          final CFException ex = new CFException();
1167 <        if (!createIncomplete) f.complete(v1);
1167 >        if (!createIncomplete) assertTrue(f.complete(v1));
1168          final CompletableFuture<Integer> g = m.handle
1169              (f,
1170               (Integer x, Throwable t) -> {
1171 +                m.checkExecutionMode();
1172                  threadAssertSame(x, v1);
1173                  threadAssertNull(t);
1174                  a.getAndIncrement();
1175                  throw ex;
1176              });
1177 <        if (createIncomplete) f.complete(v1);
1177 >        if (createIncomplete) assertTrue(f.complete(v1));
1178  
1179 <        checkCompletedWithWrappedCFException(g, ex);
1179 >        checkCompletedWithWrappedException(g, ex);
1180          checkCompletedNormally(f, v1);
1181          assertEquals(1, a.get());
1182      }}
# Line 895 | Line 1184 | public class CompletableFutureTest exten
1184      /**
1185       * runAsync completes after running Runnable
1186       */
1187 <    public void testRunAsync() {
1188 <        Noop r = new Noop();
1189 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1190 <        assertNull(f.join());
1191 <        assertEquals(1, r.invocationCount);
1192 <        checkCompletedNormally(f, null);
1193 <    }
1194 <
1195 <    /**
907 <     * runAsync with executor completes after running Runnable
908 <     */
909 <    public void testRunAsync2() {
910 <        Noop r = new Noop();
911 <        ThreadExecutor exec = new ThreadExecutor();
912 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
1187 >    public void testRunAsync_normalCompletion() {
1188 >        ExecutionMode[] executionModes = {
1189 >            ExecutionMode.ASYNC,
1190 >            ExecutionMode.EXECUTOR,
1191 >        };
1192 >        for (ExecutionMode m : executionModes)
1193 >    {
1194 >        final Noop r = new Noop(m);
1195 >        final CompletableFuture<Void> f = m.runAsync(r);
1196          assertNull(f.join());
914        assertEquals(1, r.invocationCount);
1197          checkCompletedNormally(f, null);
1198 <        assertEquals(1, exec.count.get());
1199 <    }
1198 >        r.assertInvoked();
1199 >    }}
1200  
1201      /**
1202       * failing runAsync completes exceptionally after running Runnable
1203       */
1204 <    public void testRunAsync3() {
1205 <        FailingNoop r = new FailingNoop();
1206 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1204 >    public void testRunAsync_exceptionalCompletion() {
1205 >        ExecutionMode[] executionModes = {
1206 >            ExecutionMode.ASYNC,
1207 >            ExecutionMode.EXECUTOR,
1208 >        };
1209 >        for (ExecutionMode m : executionModes)
1210 >    {
1211 >        final FailingRunnable r = new FailingRunnable(m);
1212 >        final CompletableFuture<Void> f = m.runAsync(r);
1213          checkCompletedWithWrappedCFException(f);
1214 <        assertEquals(1, r.invocationCount);
1215 <    }
1214 >        r.assertInvoked();
1215 >    }}
1216  
1217      /**
1218       * supplyAsync completes with result of supplier
1219       */
1220 <    public void testSupplyAsync() {
1221 <        CompletableFuture<Integer> f;
1222 <        f = CompletableFuture.supplyAsync(supplyOne);
1223 <        assertEquals(f.join(), one);
1224 <        checkCompletedNormally(f, one);
1225 <    }
1226 <
1227 <    /**
1228 <     * supplyAsync with executor completes with result of supplier
1229 <     */
1230 <    public void testSupplyAsync2() {
1231 <        CompletableFuture<Integer> f;
1232 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1233 <        assertEquals(f.join(), one);
946 <        checkCompletedNormally(f, one);
947 <    }
1220 >    public void testSupplyAsync_normalCompletion() {
1221 >        ExecutionMode[] executionModes = {
1222 >            ExecutionMode.ASYNC,
1223 >            ExecutionMode.EXECUTOR,
1224 >        };
1225 >        for (ExecutionMode m : executionModes)
1226 >        for (Integer v1 : new Integer[] { 1, null })
1227 >    {
1228 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1229 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1230 >        assertSame(v1, f.join());
1231 >        checkCompletedNormally(f, v1);
1232 >        r.assertInvoked();
1233 >    }}
1234  
1235      /**
1236       * Failing supplyAsync completes exceptionally
1237       */
1238 <    public void testSupplyAsync3() {
1239 <        FailingSupplier r = new FailingSupplier();
1240 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1238 >    public void testSupplyAsync_exceptionalCompletion() {
1239 >        ExecutionMode[] executionModes = {
1240 >            ExecutionMode.ASYNC,
1241 >            ExecutionMode.EXECUTOR,
1242 >        };
1243 >        for (ExecutionMode m : executionModes)
1244 >    {
1245 >        FailingSupplier r = new FailingSupplier(m);
1246 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1247          checkCompletedWithWrappedCFException(f);
1248 <        assertEquals(1, r.invocationCount);
1249 <    }
1248 >        r.assertInvoked();
1249 >    }}
1250  
1251      // seq completion methods
1252  
1253      /**
1254       * thenRun result completes normally after normal completion of source
1255       */
1256 <    public void testThenRun() {
1257 <        CompletableFuture<Integer> f;
1258 <        CompletableFuture<Void> g;
1259 <        Noop r;
1260 <
1261 <        f = new CompletableFuture<>();
1262 <        g = f.thenRun(r = new Noop());
971 <        f.complete(null);
972 <        checkCompletedNormally(g, null);
973 <        assertEquals(1, r.invocationCount);
1256 >    public void testThenRun_normalCompletion() {
1257 >        for (ExecutionMode m : ExecutionMode.values())
1258 >        for (Integer v1 : new Integer[] { 1, null })
1259 >    {
1260 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1261 >        final Noop[] rs = new Noop[6];
1262 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1263  
1264 <        f = new CompletableFuture<>();
1265 <        f.complete(null);
1266 <        g = f.thenRun(r = new Noop());
1267 <        checkCompletedNormally(g, null);
1268 <        assertEquals(1, r.invocationCount);
1269 <    }
1264 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1265 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1266 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1267 >        checkIncomplete(h0);
1268 >        checkIncomplete(h1);
1269 >        checkIncomplete(h2);
1270 >        assertTrue(f.complete(v1));
1271 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1272 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1273 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1274 >
1275 >        checkCompletedNormally(h0, null);
1276 >        checkCompletedNormally(h1, null);
1277 >        checkCompletedNormally(h2, null);
1278 >        checkCompletedNormally(h3, null);
1279 >        checkCompletedNormally(h4, null);
1280 >        checkCompletedNormally(h5, null);
1281 >        checkCompletedNormally(f, v1);
1282 >        for (Noop r : rs) r.assertInvoked();
1283 >    }}
1284  
1285      /**
1286       * thenRun result completes exceptionally after exceptional
1287       * completion of source
1288       */
1289 <    public void testThenRun2() {
1290 <        CompletableFuture<Integer> f;
1291 <        CompletableFuture<Void> g;
1292 <        Noop r;
1293 <
1294 <        f = new CompletableFuture<>();
1295 <        g = f.thenRun(r = new Noop());
993 <        f.completeExceptionally(new CFException());
994 <        checkCompletedWithWrappedCFException(g);
995 <        assertEquals(0, r.invocationCount);
996 <
997 <        f = new CompletableFuture<>();
998 <        f.completeExceptionally(new CFException());
999 <        g = f.thenRun(r = new Noop());
1000 <        checkCompletedWithWrappedCFException(g);
1001 <        assertEquals(0, r.invocationCount);
1002 <    }
1003 <
1004 <    /**
1005 <     * thenRun result completes exceptionally if action does
1006 <     */
1007 <    public void testThenRun3() {
1008 <        CompletableFuture<Integer> f;
1009 <        CompletableFuture<Void> g;
1010 <        FailingNoop r;
1011 <
1012 <        f = new CompletableFuture<>();
1013 <        g = f.thenRun(r = new FailingNoop());
1014 <        f.complete(null);
1015 <        checkCompletedWithWrappedCFException(g);
1289 >    public void testThenRun_exceptionalCompletion() {
1290 >        for (ExecutionMode m : ExecutionMode.values())
1291 >    {
1292 >        final CFException ex = new CFException();
1293 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1294 >        final Noop[] rs = new Noop[6];
1295 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1296  
1297 <        f = new CompletableFuture<>();
1298 <        f.complete(null);
1299 <        g = f.thenRun(r = new FailingNoop());
1300 <        checkCompletedWithWrappedCFException(g);
1301 <    }
1297 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1298 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1299 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1300 >        checkIncomplete(h0);
1301 >        checkIncomplete(h1);
1302 >        checkIncomplete(h2);
1303 >        assertTrue(f.completeExceptionally(ex));
1304 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1305 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1306 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1307 >
1308 >        checkCompletedWithWrappedException(h0, ex);
1309 >        checkCompletedWithWrappedException(h1, ex);
1310 >        checkCompletedWithWrappedException(h2, ex);
1311 >        checkCompletedWithWrappedException(h3, ex);
1312 >        checkCompletedWithWrappedException(h4, ex);
1313 >        checkCompletedWithWrappedException(h5, ex);
1314 >        checkCompletedExceptionally(f, ex);
1315 >        for (Noop r : rs) r.assertNotInvoked();
1316 >    }}
1317  
1318      /**
1319       * thenRun result completes exceptionally if source cancelled
1320       */
1321 <    public void testThenRun4() {
1322 <        CompletableFuture<Integer> f;
1323 <        CompletableFuture<Void> g;
1324 <        Noop r;
1325 <
1326 <        f = new CompletableFuture<>();
1327 <        g = f.thenRun(r = new Noop());
1033 <        assertTrue(f.cancel(true));
1034 <        checkCompletedWithWrappedCancellationException(g);
1035 <
1036 <        f = new CompletableFuture<>();
1037 <        assertTrue(f.cancel(true));
1038 <        g = f.thenRun(r = new Noop());
1039 <        checkCompletedWithWrappedCancellationException(g);
1040 <    }
1041 <
1042 <    /**
1043 <     * thenApply result completes normally after normal completion of source
1044 <     */
1045 <    public void testThenApply() {
1046 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1047 <        CompletableFuture<Integer> g = f.thenApply(inc);
1048 <        f.complete(one);
1049 <        checkCompletedNormally(g, two);
1050 <    }
1051 <
1052 <    /**
1053 <     * thenApply result completes exceptionally after exceptional
1054 <     * completion of source
1055 <     */
1056 <    public void testThenApply2() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1058 <        CompletableFuture<Integer> g = f.thenApply(inc);
1059 <        f.completeExceptionally(new CFException());
1060 <        checkCompletedWithWrappedCFException(g);
1061 <    }
1062 <
1063 <    /**
1064 <     * thenApply result completes exceptionally if action does
1065 <     */
1066 <    public void testThenApply3() {
1067 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1068 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1069 <        f.complete(one);
1070 <        checkCompletedWithWrappedCFException(g);
1071 <    }
1072 <
1073 <    /**
1074 <     * thenApply result completes exceptionally if source cancelled
1075 <     */
1076 <    public void testThenApply4() {
1077 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1078 <        CompletableFuture<Integer> g = f.thenApply(inc);
1079 <        assertTrue(f.cancel(true));
1080 <        checkCompletedWithWrappedCancellationException(g);
1081 <    }
1082 <
1083 <    /**
1084 <     * thenAccept result completes normally after normal completion of source
1085 <     */
1086 <    public void testThenAccept() {
1087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1088 <        IncAction r = new IncAction();
1089 <        CompletableFuture<Void> g = f.thenAccept(r);
1090 <        f.complete(one);
1091 <        checkCompletedNormally(g, null);
1092 <        assertEquals(r.value, (Integer) 2);
1093 <    }
1094 <
1095 <    /**
1096 <     * thenAccept result completes exceptionally after exceptional
1097 <     * completion of source
1098 <     */
1099 <    public void testThenAccept2() {
1100 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1101 <        IncAction r = new IncAction();
1102 <        CompletableFuture<Void> g = f.thenAccept(r);
1103 <        f.completeExceptionally(new CFException());
1104 <        checkCompletedWithWrappedCFException(g);
1105 <    }
1106 <
1107 <    /**
1108 <     * thenAccept result completes exceptionally if action does
1109 <     */
1110 <    public void testThenAccept3() {
1111 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1112 <        FailingConsumer r = new FailingConsumer();
1113 <        CompletableFuture<Void> g = f.thenAccept(r);
1114 <        f.complete(one);
1115 <        checkCompletedWithWrappedCFException(g);
1116 <        assertEquals(1, r.invocationCount);
1117 <    }
1321 >    public void testThenRun_sourceCancelled() {
1322 >        for (ExecutionMode m : ExecutionMode.values())
1323 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1324 >    {
1325 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1326 >        final Noop[] rs = new Noop[6];
1327 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1328  
1329 <    /**
1330 <     * thenAccept result completes exceptionally if source cancelled
1331 <     */
1332 <    public void testThenAccept4() {
1333 <        CompletableFuture<Integer> f = new CompletableFuture<>();
1334 <        IncAction r = new IncAction();
1335 <        CompletableFuture<Void> g = f.thenAccept(r);
1336 <        assertTrue(f.cancel(true));
1337 <        checkCompletedWithWrappedCancellationException(g);
1338 <    }
1329 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1330 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1331 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1332 >        checkIncomplete(h0);
1333 >        checkIncomplete(h1);
1334 >        checkIncomplete(h2);
1335 >        assertTrue(f.cancel(mayInterruptIfRunning));
1336 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1337 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1338 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1339 >
1340 >        checkCompletedWithWrappedCancellationException(h0);
1341 >        checkCompletedWithWrappedCancellationException(h1);
1342 >        checkCompletedWithWrappedCancellationException(h2);
1343 >        checkCompletedWithWrappedCancellationException(h3);
1344 >        checkCompletedWithWrappedCancellationException(h4);
1345 >        checkCompletedWithWrappedCancellationException(h5);
1346 >        checkCancelled(f);
1347 >        for (Noop r : rs) r.assertNotInvoked();
1348 >    }}
1349  
1350      /**
1351 <     * thenCombine result completes normally after normal completion
1132 <     * of sources
1351 >     * thenRun result completes exceptionally if action does
1352       */
1353 <    public void testThenCombine_normalCompletion1() {
1135 <        for (boolean createIncomplete : new boolean[] { true, false })
1136 <        for (boolean fFirst : new boolean[] { true, false })
1353 >    public void testThenRun_actionFailed() {
1354          for (ExecutionMode m : ExecutionMode.values())
1355          for (Integer v1 : new Integer[] { 1, null })
1356 <        for (Integer v2 : new Integer[] { 2, null }) {
1140 <
1356 >    {
1357          final CompletableFuture<Integer> f = new CompletableFuture<>();
1358 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1359 <        final SubtractFunction r = new SubtractFunction();
1144 <        CompletableFuture<Integer> h = null;
1145 <        if (createIncomplete) h = m.thenCombine(f, g, r);
1146 <
1147 <        if (fFirst)
1148 <            f.complete(v1);
1149 <        else
1150 <            g.complete(v2);
1151 <        if (createIncomplete) checkIncomplete(h);
1152 <        assertEquals(0, r.invocationCount);
1153 <        if (!fFirst)
1154 <            f.complete(v1);
1155 <        else
1156 <            g.complete(v2);
1157 <        if (!createIncomplete) h = m.thenCombine(f, g, r);
1358 >        final FailingRunnable[] rs = new FailingRunnable[6];
1359 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1360  
1361 <        checkCompletedNormally(h, subtract(v1, v2));
1361 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1362 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1363 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1364 >        assertTrue(f.complete(v1));
1365 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1366 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1367 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1368 >
1369 >        checkCompletedWithWrappedCFException(h0);
1370 >        checkCompletedWithWrappedCFException(h1);
1371 >        checkCompletedWithWrappedCFException(h2);
1372 >        checkCompletedWithWrappedCFException(h3);
1373 >        checkCompletedWithWrappedCFException(h4);
1374 >        checkCompletedWithWrappedCFException(h5);
1375          checkCompletedNormally(f, v1);
1376 <        checkCompletedNormally(g, v2);
1162 <        assertEquals(1, r.invocationCount);
1163 <        }
1164 <    }
1376 >    }}
1377  
1378      /**
1379 <     * thenCombine result completes exceptionally after exceptional
1168 <     * completion of either source
1379 >     * thenApply result completes normally after normal completion of source
1380       */
1381 <    public void testThenCombine_exceptionalCompletion1() {
1381 >    public void testThenApply_normalCompletion() {
1382          for (ExecutionMode m : ExecutionMode.values())
1383 <        for (Integer v1 : new Integer[] { 1, null }) {
1384 <
1174 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1175 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1176 <        final SubtractFunction r = new SubtractFunction();
1177 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1178 <        final CFException ex = new CFException();
1179 <
1180 <        f.completeExceptionally(ex);
1181 <        checkIncomplete(h);
1182 <        g.complete(v1);
1183 <
1184 <        checkCompletedWithWrappedCFException(h, ex);
1185 <        checkCompletedWithWrappedCFException(f, ex);
1186 <        assertEquals(0, r.invocationCount);
1187 <        checkCompletedNormally(g, v1);
1188 <        }
1189 <    }
1190 <
1191 <    public void testThenCombine_exceptionalCompletion2() {
1192 <        for (ExecutionMode m : ExecutionMode.values())
1193 <        for (Integer v1 : new Integer[] { 1, null }) {
1194 <
1383 >        for (Integer v1 : new Integer[] { 1, null })
1384 >    {
1385          final CompletableFuture<Integer> f = new CompletableFuture<>();
1386 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1387 <        final SubtractFunction r = new SubtractFunction();
1198 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1199 <        final CFException ex = new CFException();
1200 <
1201 <        g.completeExceptionally(ex);
1202 <        checkIncomplete(h);
1203 <        f.complete(v1);
1386 >        final IncFunction[] rs = new IncFunction[4];
1387 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1388  
1389 <        checkCompletedWithWrappedCFException(h, ex);
1390 <        checkCompletedWithWrappedCFException(g, ex);
1391 <        assertEquals(0, r.invocationCount);
1389 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1390 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1391 >        checkIncomplete(h0);
1392 >        checkIncomplete(h1);
1393 >        assertTrue(f.complete(v1));
1394 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1395 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1396 >
1397 >        checkCompletedNormally(h0, inc(v1));
1398 >        checkCompletedNormally(h1, inc(v1));
1399 >        checkCompletedNormally(h2, inc(v1));
1400 >        checkCompletedNormally(h3, inc(v1));
1401          checkCompletedNormally(f, v1);
1402 <        }
1403 <    }
1402 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1403 >    }}
1404  
1405 <    public void testThenCombine_exceptionalCompletion3() {
1405 >    /**
1406 >     * thenApply result completes exceptionally after exceptional
1407 >     * completion of source
1408 >     */
1409 >    public void testThenApply_exceptionalCompletion() {
1410          for (ExecutionMode m : ExecutionMode.values())
1411 <        for (Integer v1 : new Integer[] { 1, null }) {
1215 <
1216 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1218 <        final SubtractFunction r = new SubtractFunction();
1411 >    {
1412          final CFException ex = new CFException();
1220
1221        g.completeExceptionally(ex);
1222        f.complete(v1);
1223        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1224
1225        checkCompletedWithWrappedCFException(h, ex);
1226        checkCompletedWithWrappedCFException(g, ex);
1227        assertEquals(0, r.invocationCount);
1228        checkCompletedNormally(f, v1);
1229        }
1230    }
1231
1232    public void testThenCombine_exceptionalCompletion4() {
1233        for (ExecutionMode m : ExecutionMode.values())
1234        for (Integer v1 : new Integer[] { 1, null }) {
1235
1413          final CompletableFuture<Integer> f = new CompletableFuture<>();
1414 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1415 <        final SubtractFunction r = new SubtractFunction();
1239 <        final CFException ex = new CFException();
1240 <
1241 <        f.completeExceptionally(ex);
1242 <        g.complete(v1);
1243 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1414 >        final IncFunction[] rs = new IncFunction[4];
1415 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1416  
1417 <        checkCompletedWithWrappedCFException(h, ex);
1418 <        checkCompletedWithWrappedCFException(f, ex);
1419 <        assertEquals(0, r.invocationCount);
1420 <        checkCompletedNormally(g, v1);
1421 <        }
1422 <    }
1417 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1418 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1419 >        assertTrue(f.completeExceptionally(ex));
1420 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1421 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1422 >
1423 >        checkCompletedWithWrappedException(h0, ex);
1424 >        checkCompletedWithWrappedException(h1, ex);
1425 >        checkCompletedWithWrappedException(h2, ex);
1426 >        checkCompletedWithWrappedException(h3, ex);
1427 >        checkCompletedExceptionally(f, ex);
1428 >        for (IncFunction r : rs) r.assertNotInvoked();
1429 >    }}
1430  
1431      /**
1432 <     * thenCombine result completes exceptionally if action does
1432 >     * thenApply result completes exceptionally if source cancelled
1433       */
1434 <    public void testThenCombine_actionFailed1() {
1434 >    public void testThenApply_sourceCancelled() {
1435          for (ExecutionMode m : ExecutionMode.values())
1436 <        for (Integer v1 : new Integer[] { 1, null })
1437 <        for (Integer v2 : new Integer[] { 2, null }) {
1259 <
1436 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1437 >    {
1438          final CompletableFuture<Integer> f = new CompletableFuture<>();
1439 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1440 <        final FailingBiFunction r = new FailingBiFunction();
1263 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1439 >        final IncFunction[] rs = new IncFunction[4];
1440 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1441  
1442 <        f.complete(v1);
1443 <        checkIncomplete(h);
1444 <        g.complete(v2);
1442 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1443 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1444 >        assertTrue(f.cancel(mayInterruptIfRunning));
1445 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1446 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1447  
1448 <        checkCompletedWithWrappedCFException(h);
1449 <        checkCompletedNormally(f, v1);
1450 <        checkCompletedNormally(g, v2);
1451 <        }
1452 <    }
1448 >        checkCompletedWithWrappedCancellationException(h0);
1449 >        checkCompletedWithWrappedCancellationException(h1);
1450 >        checkCompletedWithWrappedCancellationException(h2);
1451 >        checkCompletedWithWrappedCancellationException(h3);
1452 >        checkCancelled(f);
1453 >        for (IncFunction r : rs) r.assertNotInvoked();
1454 >    }}
1455  
1456 <    public void testThenCombine_actionFailed2() {
1456 >    /**
1457 >     * thenApply result completes exceptionally if action does
1458 >     */
1459 >    public void testThenApply_actionFailed() {
1460          for (ExecutionMode m : ExecutionMode.values())
1461          for (Integer v1 : new Integer[] { 1, null })
1462 <        for (Integer v2 : new Integer[] { 2, null }) {
1279 <
1462 >    {
1463          final CompletableFuture<Integer> f = new CompletableFuture<>();
1464 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1465 <        final FailingBiFunction r = new FailingBiFunction();
1283 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1284 <
1285 <        g.complete(v2);
1286 <        checkIncomplete(h);
1287 <        f.complete(v1);
1464 >        final FailingFunction[] rs = new FailingFunction[4];
1465 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1466  
1467 <        checkCompletedWithWrappedCFException(h);
1467 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1468 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1469 >        assertTrue(f.complete(v1));
1470 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1471 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1472 >
1473 >        checkCompletedWithWrappedCFException(h0);
1474 >        checkCompletedWithWrappedCFException(h1);
1475 >        checkCompletedWithWrappedCFException(h2);
1476 >        checkCompletedWithWrappedCFException(h3);
1477          checkCompletedNormally(f, v1);
1478 <        checkCompletedNormally(g, v2);
1292 <        }
1293 <    }
1478 >    }}
1479  
1480      /**
1481 <     * thenCombine result completes exceptionally if either source cancelled
1481 >     * thenAccept result completes normally after normal completion of source
1482       */
1483 <    public void testThenCombine_sourceCancelled1() {
1483 >    public void testThenAccept_normalCompletion() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1486 <        for (Integer v1 : new Integer[] { 1, null }) {
1302 <
1303 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1304 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1305 <        final SubtractFunction r = new SubtractFunction();
1306 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1307 <
1308 <        assertTrue(f.cancel(mayInterruptIfRunning));
1309 <        checkIncomplete(h);
1310 <        g.complete(v1);
1311 <
1312 <        checkCompletedWithWrappedCancellationException(h);
1313 <        checkCancelled(f);
1314 <        assertEquals(0, r.invocationCount);
1315 <        checkCompletedNormally(g, v1);
1316 <        }
1317 <    }
1318 <
1319 <    public void testThenCombine_sourceCancelled2() {
1320 <        for (ExecutionMode m : ExecutionMode.values())
1321 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1322 <        for (Integer v1 : new Integer[] { 1, null }) {
1323 <
1485 >        for (Integer v1 : new Integer[] { 1, null })
1486 >    {
1487          final CompletableFuture<Integer> f = new CompletableFuture<>();
1488 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1489 <        final SubtractFunction r = new SubtractFunction();
1327 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1328 <
1329 <        assertTrue(g.cancel(mayInterruptIfRunning));
1330 <        checkIncomplete(h);
1331 <        f.complete(v1);
1488 >        final NoopConsumer[] rs = new NoopConsumer[4];
1489 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1490  
1491 <        checkCompletedWithWrappedCancellationException(h);
1492 <        checkCancelled(g);
1493 <        assertEquals(0, r.invocationCount);
1491 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1492 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1493 >        checkIncomplete(h0);
1494 >        checkIncomplete(h1);
1495 >        assertTrue(f.complete(v1));
1496 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1497 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1498 >
1499 >        checkCompletedNormally(h0, null);
1500 >        checkCompletedNormally(h1, null);
1501 >        checkCompletedNormally(h2, null);
1502 >        checkCompletedNormally(h3, null);
1503          checkCompletedNormally(f, v1);
1504 <        }
1505 <    }
1504 >        for (NoopConsumer r : rs) r.assertValue(v1);
1505 >    }}
1506  
1507 <    public void testThenCombine_sourceCancelled3() {
1507 >    /**
1508 >     * thenAccept result completes exceptionally after exceptional
1509 >     * completion of source
1510 >     */
1511 >    public void testThenAccept_exceptionalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1514 <        for (Integer v1 : new Integer[] { 1, null }) {
1344 <
1513 >    {
1514 >        final CFException ex = new CFException();
1515          final CompletableFuture<Integer> f = new CompletableFuture<>();
1516 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1517 <        final SubtractFunction r = new SubtractFunction();
1348 <
1349 <        assertTrue(g.cancel(mayInterruptIfRunning));
1350 <        f.complete(v1);
1351 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1516 >        final NoopConsumer[] rs = new NoopConsumer[4];
1517 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1518  
1519 <        checkCompletedWithWrappedCancellationException(h);
1520 <        checkCancelled(g);
1521 <        assertEquals(0, r.invocationCount);
1522 <        checkCompletedNormally(f, v1);
1523 <        }
1524 <    }
1519 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1520 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1521 >        assertTrue(f.completeExceptionally(ex));
1522 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1523 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1524 >
1525 >        checkCompletedWithWrappedException(h0, ex);
1526 >        checkCompletedWithWrappedException(h1, ex);
1527 >        checkCompletedWithWrappedException(h2, ex);
1528 >        checkCompletedWithWrappedException(h3, ex);
1529 >        checkCompletedExceptionally(f, ex);
1530 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1531 >    }}
1532  
1533 <    public void testThenCombine_sourceCancelled4() {
1533 >    /**
1534 >     * thenAccept result completes exceptionally if source cancelled
1535 >     */
1536 >    public void testThenAccept_sourceCancelled() {
1537          for (ExecutionMode m : ExecutionMode.values())
1538          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1539 <        for (Integer v1 : new Integer[] { 1, null }) {
1364 <
1539 >    {
1540          final CompletableFuture<Integer> f = new CompletableFuture<>();
1541 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1542 <        final SubtractFunction r = new SubtractFunction();
1541 >        final NoopConsumer[] rs = new NoopConsumer[4];
1542 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1543  
1544 +        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1545 +        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1546          assertTrue(f.cancel(mayInterruptIfRunning));
1547 <        g.complete(v1);
1548 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1547 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1548 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1549  
1550 <        checkCompletedWithWrappedCancellationException(h);
1550 >        checkCompletedWithWrappedCancellationException(h0);
1551 >        checkCompletedWithWrappedCancellationException(h1);
1552 >        checkCompletedWithWrappedCancellationException(h2);
1553 >        checkCompletedWithWrappedCancellationException(h3);
1554          checkCancelled(f);
1555 <        assertEquals(0, r.invocationCount);
1556 <        checkCompletedNormally(g, v1);
1377 <        }
1378 <    }
1555 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1556 >    }}
1557  
1558      /**
1559 <     * thenAcceptBoth result completes normally after normal
1382 <     * completion of sources
1559 >     * thenAccept result completes exceptionally if action does
1560       */
1561 <    public void testThenAcceptBoth_normalCompletion1() {
1385 <        for (ExecutionMode m : ExecutionMode.values())
1386 <        for (Integer v1 : new Integer[] { 1, null })
1387 <        for (Integer v2 : new Integer[] { 2, null }) {
1388 <
1389 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1391 <        final SubtractAction r = new SubtractAction();
1392 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1393 <
1394 <        f.complete(v1);
1395 <        checkIncomplete(h);
1396 <        assertEquals(0, r.invocationCount);
1397 <        g.complete(v2);
1398 <
1399 <        checkCompletedNormally(h, null);
1400 <        assertEquals(subtract(v1, v2), r.value);
1401 <        checkCompletedNormally(f, v1);
1402 <        checkCompletedNormally(g, v2);
1403 <        }
1404 <    }
1405 <
1406 <    public void testThenAcceptBoth_normalCompletion2() {
1561 >    public void testThenAccept_actionFailed() {
1562          for (ExecutionMode m : ExecutionMode.values())
1563          for (Integer v1 : new Integer[] { 1, null })
1564 <        for (Integer v2 : new Integer[] { 2, null }) {
1410 <
1564 >    {
1565          final CompletableFuture<Integer> f = new CompletableFuture<>();
1566 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1567 <        final SubtractAction r = new SubtractAction();
1414 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1566 >        final FailingConsumer[] rs = new FailingConsumer[4];
1567 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1568  
1569 <        g.complete(v2);
1570 <        checkIncomplete(h);
1571 <        assertEquals(0, r.invocationCount);
1572 <        f.complete(v1);
1573 <
1574 <        checkCompletedNormally(h, null);
1575 <        assertEquals(subtract(v1, v2), r.value);
1569 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1570 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1571 >        assertTrue(f.complete(v1));
1572 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1573 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1574 >
1575 >        checkCompletedWithWrappedCFException(h0);
1576 >        checkCompletedWithWrappedCFException(h1);
1577 >        checkCompletedWithWrappedCFException(h2);
1578 >        checkCompletedWithWrappedCFException(h3);
1579          checkCompletedNormally(f, v1);
1580 <        checkCompletedNormally(g, v2);
1425 <        }
1426 <    }
1427 <
1428 <    public void testThenAcceptBoth_normalCompletion3() {
1429 <        for (ExecutionMode m : ExecutionMode.values())
1430 <        for (Integer v1 : new Integer[] { 1, null })
1431 <        for (Integer v2 : new Integer[] { 2, null }) {
1432 <
1433 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1434 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1435 <        final SubtractAction r = new SubtractAction();
1436 <
1437 <        g.complete(v2);
1438 <        f.complete(v1);
1439 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1440 <
1441 <        checkCompletedNormally(h, null);
1442 <        assertEquals(subtract(v1, v2), r.value);
1443 <        checkCompletedNormally(f, v1);
1444 <        checkCompletedNormally(g, v2);
1445 <        }
1446 <    }
1580 >    }}
1581  
1582 <    public void testThenAcceptBoth_normalCompletion4() {
1582 >    /**
1583 >     * thenCombine result completes normally after normal completion
1584 >     * of sources
1585 >     */
1586 >    public void testThenCombine_normalCompletion() {
1587          for (ExecutionMode m : ExecutionMode.values())
1588 +        for (boolean fFirst : new boolean[] { true, false })
1589          for (Integer v1 : new Integer[] { 1, null })
1590 <        for (Integer v2 : new Integer[] { 2, null }) {
1591 <
1590 >        for (Integer v2 : new Integer[] { 2, null })
1591 >    {
1592          final CompletableFuture<Integer> f = new CompletableFuture<>();
1593          final CompletableFuture<Integer> g = new CompletableFuture<>();
1594 <        final SubtractAction r = new SubtractAction();
1594 >        final SubtractFunction[] rs = new SubtractFunction[6];
1595 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1596  
1597 <        f.complete(v1);
1598 <        g.complete(v2);
1599 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1597 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1598 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1599 >        final Integer w1 =  fFirst ? v1 : v2;
1600 >        final Integer w2 = !fFirst ? v1 : v2;
1601 >
1602 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1603 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1604 >        assertTrue(fst.complete(w1));
1605 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1606 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1607 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1608 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1609 >        checkCompletedNormally(h1, subtract(w1, w1));
1610 >        checkCompletedNormally(h3, subtract(w1, w1));
1611 >        rs[1].assertValue(subtract(w1, w1));
1612 >        rs[3].assertValue(subtract(w1, w1));
1613 >        assertTrue(snd.complete(w2));
1614 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1615 >
1616 >        checkCompletedNormally(h0, subtract(v1, v2));
1617 >        checkCompletedNormally(h2, subtract(v1, v2));
1618 >        checkCompletedNormally(h4, subtract(v1, v2));
1619 >        rs[0].assertValue(subtract(v1, v2));
1620 >        rs[2].assertValue(subtract(v1, v2));
1621 >        rs[4].assertValue(subtract(v1, v2));
1622  
1461        checkCompletedNormally(h, null);
1462        assertEquals(subtract(v1, v2), r.value);
1623          checkCompletedNormally(f, v1);
1624          checkCompletedNormally(g, v2);
1625 <        }
1466 <    }
1625 >    }}
1626  
1627      /**
1628 <     * thenAcceptBoth result completes exceptionally after exceptional
1628 >     * thenCombine result completes exceptionally after exceptional
1629       * completion of either source
1630       */
1631 <    public void testThenAcceptBoth_exceptionalCompletion1() {
1473 <        for (ExecutionMode m : ExecutionMode.values())
1474 <        for (Integer v1 : new Integer[] { 1, null }) {
1475 <
1476 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 <        final SubtractAction r = new SubtractAction();
1479 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1480 <        final CFException ex = new CFException();
1481 <
1482 <        f.completeExceptionally(ex);
1483 <        checkIncomplete(h);
1484 <        g.complete(v1);
1485 <
1486 <        checkCompletedWithWrappedCFException(h, ex);
1487 <        checkCompletedWithWrappedCFException(f, ex);
1488 <        assertEquals(0, r.invocationCount);
1489 <        checkCompletedNormally(g, v1);
1490 <        }
1491 <    }
1492 <
1493 <    public void testThenAcceptBoth_exceptionalCompletion2() {
1631 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1632          for (ExecutionMode m : ExecutionMode.values())
1633 <        for (Integer v1 : new Integer[] { 1, null }) {
1634 <
1635 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1636 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1499 <        final SubtractAction r = new SubtractAction();
1500 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1501 <        final CFException ex = new CFException();
1502 <
1503 <        g.completeExceptionally(ex);
1504 <        checkIncomplete(h);
1505 <        f.complete(v1);
1506 <
1507 <        checkCompletedWithWrappedCFException(h, ex);
1508 <        checkCompletedWithWrappedCFException(g, ex);
1509 <        assertEquals(0, r.invocationCount);
1510 <        checkCompletedNormally(f, v1);
1511 <        }
1512 <    }
1513 <
1514 <    public void testThenAcceptBoth_exceptionalCompletion3() {
1515 <        for (ExecutionMode m : ExecutionMode.values())
1516 <        for (Integer v1 : new Integer[] { 1, null }) {
1517 <
1518 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1519 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1520 <        final SubtractAction r = new SubtractAction();
1521 <        final CFException ex = new CFException();
1522 <
1523 <        g.completeExceptionally(ex);
1524 <        f.complete(v1);
1525 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1526 <
1527 <        checkCompletedWithWrappedCFException(h, ex);
1528 <        checkCompletedWithWrappedCFException(g, ex);
1529 <        assertEquals(0, r.invocationCount);
1530 <        checkCompletedNormally(f, v1);
1531 <        }
1532 <    }
1533 <
1534 <    public void testThenAcceptBoth_exceptionalCompletion4() {
1535 <        for (ExecutionMode m : ExecutionMode.values())
1536 <        for (Integer v1 : new Integer[] { 1, null }) {
1537 <
1633 >        for (boolean fFirst : new boolean[] { true, false })
1634 >        for (boolean failFirst : new boolean[] { true, false })
1635 >        for (Integer v1 : new Integer[] { 1, null })
1636 >    {
1637          final CompletableFuture<Integer> f = new CompletableFuture<>();
1638          final CompletableFuture<Integer> g = new CompletableFuture<>();
1540        final SubtractAction r = new SubtractAction();
1639          final CFException ex = new CFException();
1640 <
1641 <        f.completeExceptionally(ex);
1642 <        g.complete(v1);
1643 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1644 <
1645 <        checkCompletedWithWrappedCFException(h, ex);
1646 <        checkCompletedWithWrappedCFException(f, ex);
1647 <        assertEquals(0, r.invocationCount);
1648 <        checkCompletedNormally(g, v1);
1649 <        }
1650 <    }
1640 >        final SubtractFunction r1 = new SubtractFunction(m);
1641 >        final SubtractFunction r2 = new SubtractFunction(m);
1642 >        final SubtractFunction r3 = new SubtractFunction(m);
1643 >
1644 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1645 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1646 >        final Callable<Boolean> complete1 = failFirst ?
1647 >            () -> fst.completeExceptionally(ex) :
1648 >            () -> fst.complete(v1);
1649 >        final Callable<Boolean> complete2 = failFirst ?
1650 >            () -> snd.complete(v1) :
1651 >            () -> snd.completeExceptionally(ex);
1652 >
1653 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1654 >        assertTrue(complete1.call());
1655 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1656 >        checkIncomplete(h1);
1657 >        checkIncomplete(h2);
1658 >        assertTrue(complete2.call());
1659 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1660 >
1661 >        checkCompletedWithWrappedException(h1, ex);
1662 >        checkCompletedWithWrappedException(h2, ex);
1663 >        checkCompletedWithWrappedException(h3, ex);
1664 >        r1.assertNotInvoked();
1665 >        r2.assertNotInvoked();
1666 >        r3.assertNotInvoked();
1667 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1668 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1669 >    }}
1670  
1671      /**
1672 <     * thenAcceptBoth result completes exceptionally if action does
1672 >     * thenCombine result completes exceptionally if either source cancelled
1673       */
1674 <    public void testThenAcceptBoth_actionFailed1() {
1674 >    public void testThenCombine_sourceCancelled() throws Throwable {
1675          for (ExecutionMode m : ExecutionMode.values())
1676 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1677 +        for (boolean fFirst : new boolean[] { true, false })
1678 +        for (boolean failFirst : new boolean[] { true, false })
1679          for (Integer v1 : new Integer[] { 1, null })
1680 <        for (Integer v2 : new Integer[] { 2, null }) {
1561 <
1680 >    {
1681          final CompletableFuture<Integer> f = new CompletableFuture<>();
1682          final CompletableFuture<Integer> g = new CompletableFuture<>();
1683 <        final FailingBiConsumer r = new FailingBiConsumer();
1684 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1685 <
1686 <        f.complete(v1);
1687 <        checkIncomplete(h);
1688 <        g.complete(v2);
1689 <
1690 <        checkCompletedWithWrappedCFException(h);
1691 <        checkCompletedNormally(f, v1);
1692 <        checkCompletedNormally(g, v2);
1693 <        }
1694 <    }
1683 >        final SubtractFunction r1 = new SubtractFunction(m);
1684 >        final SubtractFunction r2 = new SubtractFunction(m);
1685 >        final SubtractFunction r3 = new SubtractFunction(m);
1686 >
1687 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1688 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1689 >        final Callable<Boolean> complete1 = failFirst ?
1690 >            () -> fst.cancel(mayInterruptIfRunning) :
1691 >            () -> fst.complete(v1);
1692 >        final Callable<Boolean> complete2 = failFirst ?
1693 >            () -> snd.complete(v1) :
1694 >            () -> snd.cancel(mayInterruptIfRunning);
1695 >
1696 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1697 >        assertTrue(complete1.call());
1698 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1699 >        checkIncomplete(h1);
1700 >        checkIncomplete(h2);
1701 >        assertTrue(complete2.call());
1702 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1703 >
1704 >        checkCompletedWithWrappedCancellationException(h1);
1705 >        checkCompletedWithWrappedCancellationException(h2);
1706 >        checkCompletedWithWrappedCancellationException(h3);
1707 >        r1.assertNotInvoked();
1708 >        r2.assertNotInvoked();
1709 >        r3.assertNotInvoked();
1710 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1711 >        checkCancelled(failFirst ? fst : snd);
1712 >    }}
1713  
1714 <    public void testThenAcceptBoth_actionFailed2() {
1714 >    /**
1715 >     * thenCombine result completes exceptionally if action does
1716 >     */
1717 >    public void testThenCombine_actionFailed() {
1718          for (ExecutionMode m : ExecutionMode.values())
1719 +        for (boolean fFirst : new boolean[] { true, false })
1720          for (Integer v1 : new Integer[] { 1, null })
1721 <        for (Integer v2 : new Integer[] { 2, null }) {
1722 <
1721 >        for (Integer v2 : new Integer[] { 2, null })
1722 >    {
1723          final CompletableFuture<Integer> f = new CompletableFuture<>();
1724          final CompletableFuture<Integer> g = new CompletableFuture<>();
1725 <        final FailingBiConsumer r = new FailingBiConsumer();
1726 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1727 <
1728 <        g.complete(v2);
1729 <        checkIncomplete(h);
1730 <        f.complete(v1);
1731 <
1732 <        checkCompletedWithWrappedCFException(h);
1725 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1726 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1727 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1728 >
1729 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1730 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1731 >        final Integer w1 =  fFirst ? v1 : v2;
1732 >        final Integer w2 = !fFirst ? v1 : v2;
1733 >
1734 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1735 >        assertTrue(fst.complete(w1));
1736 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1737 >        assertTrue(snd.complete(w2));
1738 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1739 >
1740 >        checkCompletedWithWrappedCFException(h1);
1741 >        checkCompletedWithWrappedCFException(h2);
1742 >        checkCompletedWithWrappedCFException(h3);
1743 >        r1.assertInvoked();
1744 >        r2.assertInvoked();
1745 >        r3.assertInvoked();
1746          checkCompletedNormally(f, v1);
1747          checkCompletedNormally(g, v2);
1748 <        }
1595 <    }
1748 >    }}
1749  
1750      /**
1751 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1751 >     * thenAcceptBoth result completes normally after normal
1752 >     * completion of sources
1753       */
1754 <    public void testThenAcceptBoth_sourceCancelled1() {
1754 >    public void testThenAcceptBoth_normalCompletion() {
1755          for (ExecutionMode m : ExecutionMode.values())
1756 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1757 <        for (Integer v1 : new Integer[] { 1, null }) {
1758 <
1759 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1606 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1607 <        final SubtractAction r = new SubtractAction();
1608 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1609 <
1610 <        assertTrue(f.cancel(mayInterruptIfRunning));
1611 <        checkIncomplete(h);
1612 <        g.complete(v1);
1613 <
1614 <        checkCompletedWithWrappedCancellationException(h);
1615 <        checkCancelled(f);
1616 <        assertEquals(0, r.invocationCount);
1617 <        checkCompletedNormally(g, v1);
1618 <        }
1619 <    }
1620 <
1621 <    public void testThenAcceptBoth_sourceCancelled2() {
1622 <        for (ExecutionMode m : ExecutionMode.values())
1623 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1624 <        for (Integer v1 : new Integer[] { 1, null }) {
1625 <
1626 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1627 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1628 <        final SubtractAction r = new SubtractAction();
1629 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1630 <
1631 <        assertTrue(g.cancel(mayInterruptIfRunning));
1632 <        checkIncomplete(h);
1633 <        f.complete(v1);
1634 <
1635 <        checkCompletedWithWrappedCancellationException(h);
1636 <        checkCancelled(g);
1637 <        assertEquals(0, r.invocationCount);
1638 <        checkCompletedNormally(f, v1);
1639 <        }
1640 <    }
1641 <
1642 <    public void testThenAcceptBoth_sourceCancelled3() {
1643 <        for (ExecutionMode m : ExecutionMode.values())
1644 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1645 <        for (Integer v1 : new Integer[] { 1, null }) {
1646 <
1756 >        for (boolean fFirst : new boolean[] { true, false })
1757 >        for (Integer v1 : new Integer[] { 1, null })
1758 >        for (Integer v2 : new Integer[] { 2, null })
1759 >    {
1760          final CompletableFuture<Integer> f = new CompletableFuture<>();
1761          final CompletableFuture<Integer> g = new CompletableFuture<>();
1762 <        final SubtractAction r = new SubtractAction();
1763 <
1764 <        assertTrue(g.cancel(mayInterruptIfRunning));
1765 <        f.complete(v1);
1766 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1767 <
1768 <        checkCompletedWithWrappedCancellationException(h);
1769 <        checkCancelled(g);
1770 <        assertEquals(0, r.invocationCount);
1762 >        final SubtractAction r1 = new SubtractAction(m);
1763 >        final SubtractAction r2 = new SubtractAction(m);
1764 >        final SubtractAction r3 = new SubtractAction(m);
1765 >
1766 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1767 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1768 >        final Integer w1 =  fFirst ? v1 : v2;
1769 >        final Integer w2 = !fFirst ? v1 : v2;
1770 >
1771 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1772 >        assertTrue(fst.complete(w1));
1773 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1774 >        checkIncomplete(h1);
1775 >        checkIncomplete(h2);
1776 >        r1.assertNotInvoked();
1777 >        r2.assertNotInvoked();
1778 >        assertTrue(snd.complete(w2));
1779 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1780 >
1781 >        checkCompletedNormally(h1, null);
1782 >        checkCompletedNormally(h2, null);
1783 >        checkCompletedNormally(h3, null);
1784 >        r1.assertValue(subtract(v1, v2));
1785 >        r2.assertValue(subtract(v1, v2));
1786 >        r3.assertValue(subtract(v1, v2));
1787          checkCompletedNormally(f, v1);
1788 <        }
1789 <    }
1661 <
1662 <    public void testThenAcceptBoth_sourceCancelled4() {
1663 <        for (ExecutionMode m : ExecutionMode.values())
1664 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1665 <        for (Integer v1 : new Integer[] { 1, null }) {
1666 <
1667 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1668 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1669 <        final SubtractAction r = new SubtractAction();
1670 <
1671 <        assertTrue(f.cancel(mayInterruptIfRunning));
1672 <        g.complete(v1);
1673 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1674 <
1675 <        checkCompletedWithWrappedCancellationException(h);
1676 <        checkCancelled(f);
1677 <        assertEquals(0, r.invocationCount);
1678 <        checkCompletedNormally(g, v1);
1679 <        }
1680 <    }
1788 >        checkCompletedNormally(g, v2);
1789 >    }}
1790  
1791      /**
1792 <     * runAfterBoth result completes normally after normal
1793 <     * completion of sources
1792 >     * thenAcceptBoth result completes exceptionally after exceptional
1793 >     * completion of either source
1794       */
1795 <    public void testRunAfterBoth_normalCompletion1() {
1795 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1796          for (ExecutionMode m : ExecutionMode.values())
1797 +        for (boolean fFirst : new boolean[] { true, false })
1798 +        for (boolean failFirst : new boolean[] { true, false })
1799          for (Integer v1 : new Integer[] { 1, null })
1800 <        for (Integer v2 : new Integer[] { 2, null }) {
1690 <
1800 >    {
1801          final CompletableFuture<Integer> f = new CompletableFuture<>();
1802          final CompletableFuture<Integer> g = new CompletableFuture<>();
1803 <        final Noop r = new Noop();
1804 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1805 <
1806 <        f.complete(v1);
1807 <        checkIncomplete(h);
1808 <        assertEquals(0, r.invocationCount);
1809 <        g.complete(v2);
1810 <
1811 <        checkCompletedNormally(h, null);
1812 <        assertEquals(1, r.invocationCount);
1813 <        checkCompletedNormally(f, v1);
1814 <        checkCompletedNormally(g, v2);
1815 <        }
1816 <    }
1803 >        final CFException ex = new CFException();
1804 >        final SubtractAction r1 = new SubtractAction(m);
1805 >        final SubtractAction r2 = new SubtractAction(m);
1806 >        final SubtractAction r3 = new SubtractAction(m);
1807 >
1808 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1809 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1810 >        final Callable<Boolean> complete1 = failFirst ?
1811 >            () -> fst.completeExceptionally(ex) :
1812 >            () -> fst.complete(v1);
1813 >        final Callable<Boolean> complete2 = failFirst ?
1814 >            () -> snd.complete(v1) :
1815 >            () -> snd.completeExceptionally(ex);
1816 >
1817 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1818 >        assertTrue(complete1.call());
1819 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1820 >        checkIncomplete(h1);
1821 >        checkIncomplete(h2);
1822 >        assertTrue(complete2.call());
1823 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1824 >
1825 >        checkCompletedWithWrappedException(h1, ex);
1826 >        checkCompletedWithWrappedException(h2, ex);
1827 >        checkCompletedWithWrappedException(h3, ex);
1828 >        r1.assertNotInvoked();
1829 >        r2.assertNotInvoked();
1830 >        r3.assertNotInvoked();
1831 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1832 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1833 >    }}
1834  
1835 <    public void testRunAfterBoth_normalCompletion2() {
1835 >    /**
1836 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1837 >     */
1838 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1839          for (ExecutionMode m : ExecutionMode.values())
1840 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1841 +        for (boolean fFirst : new boolean[] { true, false })
1842 +        for (boolean failFirst : new boolean[] { true, false })
1843          for (Integer v1 : new Integer[] { 1, null })
1844 <        for (Integer v2 : new Integer[] { 2, null }) {
1712 <
1844 >    {
1845          final CompletableFuture<Integer> f = new CompletableFuture<>();
1846          final CompletableFuture<Integer> g = new CompletableFuture<>();
1847 <        final Noop r = new Noop();
1848 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1849 <
1850 <        g.complete(v2);
1851 <        checkIncomplete(h);
1852 <        assertEquals(0, r.invocationCount);
1853 <        f.complete(v1);
1854 <
1855 <        checkCompletedNormally(h, null);
1856 <        assertEquals(1, r.invocationCount);
1857 <        checkCompletedNormally(f, v1);
1858 <        checkCompletedNormally(g, v2);
1859 <        }
1860 <    }
1847 >        final SubtractAction r1 = new SubtractAction(m);
1848 >        final SubtractAction r2 = new SubtractAction(m);
1849 >        final SubtractAction r3 = new SubtractAction(m);
1850 >
1851 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1852 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1853 >        final Callable<Boolean> complete1 = failFirst ?
1854 >            () -> fst.cancel(mayInterruptIfRunning) :
1855 >            () -> fst.complete(v1);
1856 >        final Callable<Boolean> complete2 = failFirst ?
1857 >            () -> snd.complete(v1) :
1858 >            () -> snd.cancel(mayInterruptIfRunning);
1859 >
1860 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1861 >        assertTrue(complete1.call());
1862 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1863 >        checkIncomplete(h1);
1864 >        checkIncomplete(h2);
1865 >        assertTrue(complete2.call());
1866 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1867 >
1868 >        checkCompletedWithWrappedCancellationException(h1);
1869 >        checkCompletedWithWrappedCancellationException(h2);
1870 >        checkCompletedWithWrappedCancellationException(h3);
1871 >        r1.assertNotInvoked();
1872 >        r2.assertNotInvoked();
1873 >        r3.assertNotInvoked();
1874 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1875 >        checkCancelled(failFirst ? fst : snd);
1876 >    }}
1877  
1878 <    public void testRunAfterBoth_normalCompletion3() {
1878 >    /**
1879 >     * thenAcceptBoth result completes exceptionally if action does
1880 >     */
1881 >    public void testThenAcceptBoth_actionFailed() {
1882          for (ExecutionMode m : ExecutionMode.values())
1883 +        for (boolean fFirst : new boolean[] { true, false })
1884          for (Integer v1 : new Integer[] { 1, null })
1885 <        for (Integer v2 : new Integer[] { 2, null }) {
1886 <
1885 >        for (Integer v2 : new Integer[] { 2, null })
1886 >    {
1887          final CompletableFuture<Integer> f = new CompletableFuture<>();
1888          final CompletableFuture<Integer> g = new CompletableFuture<>();
1889 <        final Noop r = new Noop();
1890 <
1891 <        g.complete(v2);
1892 <        f.complete(v1);
1893 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1894 <
1895 <        checkCompletedNormally(h, null);
1896 <        assertEquals(1, r.invocationCount);
1889 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1890 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1891 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1892 >
1893 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1894 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1895 >        final Integer w1 =  fFirst ? v1 : v2;
1896 >        final Integer w2 = !fFirst ? v1 : v2;
1897 >
1898 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1899 >        assertTrue(fst.complete(w1));
1900 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1901 >        assertTrue(snd.complete(w2));
1902 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1903 >
1904 >        checkCompletedWithWrappedCFException(h1);
1905 >        checkCompletedWithWrappedCFException(h2);
1906 >        checkCompletedWithWrappedCFException(h3);
1907 >        r1.assertInvoked();
1908 >        r2.assertInvoked();
1909 >        r3.assertInvoked();
1910          checkCompletedNormally(f, v1);
1911          checkCompletedNormally(g, v2);
1912 <        }
1748 <    }
1912 >    }}
1913  
1914 <    public void testRunAfterBoth_normalCompletion4() {
1914 >    /**
1915 >     * runAfterBoth result completes normally after normal
1916 >     * completion of sources
1917 >     */
1918 >    public void testRunAfterBoth_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1920 +        for (boolean fFirst : new boolean[] { true, false })
1921          for (Integer v1 : new Integer[] { 1, null })
1922 <        for (Integer v2 : new Integer[] { 2, null }) {
1923 <
1922 >        for (Integer v2 : new Integer[] { 2, null })
1923 >    {
1924          final CompletableFuture<Integer> f = new CompletableFuture<>();
1925          final CompletableFuture<Integer> g = new CompletableFuture<>();
1926 <        final Noop r = new Noop();
1927 <
1928 <        f.complete(v1);
1929 <        g.complete(v2);
1930 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1931 <
1932 <        checkCompletedNormally(h, null);
1933 <        assertEquals(1, r.invocationCount);
1926 >        final Noop r1 = new Noop(m);
1927 >        final Noop r2 = new Noop(m);
1928 >        final Noop r3 = new Noop(m);
1929 >
1930 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1931 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1932 >        final Integer w1 =  fFirst ? v1 : v2;
1933 >        final Integer w2 = !fFirst ? v1 : v2;
1934 >
1935 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1936 >        assertTrue(fst.complete(w1));
1937 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1938 >        checkIncomplete(h1);
1939 >        checkIncomplete(h2);
1940 >        r1.assertNotInvoked();
1941 >        r2.assertNotInvoked();
1942 >        assertTrue(snd.complete(w2));
1943 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1944 >
1945 >        checkCompletedNormally(h1, null);
1946 >        checkCompletedNormally(h2, null);
1947 >        checkCompletedNormally(h3, null);
1948 >        r1.assertInvoked();
1949 >        r2.assertInvoked();
1950 >        r3.assertInvoked();
1951          checkCompletedNormally(f, v1);
1952          checkCompletedNormally(g, v2);
1953 <        }
1768 <    }
1953 >    }}
1954  
1955      /**
1956       * runAfterBoth result completes exceptionally after exceptional
1957       * completion of either source
1958       */
1959 <    public void testRunAfterBoth_exceptionalCompletion1() {
1775 <        for (ExecutionMode m : ExecutionMode.values())
1776 <        for (Integer v1 : new Integer[] { 1, null }) {
1777 <
1778 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1779 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1780 <        final Noop r = new Noop();
1781 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1782 <        final CFException ex = new CFException();
1783 <
1784 <        f.completeExceptionally(ex);
1785 <        checkIncomplete(h);
1786 <        g.complete(v1);
1787 <
1788 <        checkCompletedWithWrappedCFException(h, ex);
1789 <        checkCompletedWithWrappedCFException(f, ex);
1790 <        assertEquals(0, r.invocationCount);
1791 <        checkCompletedNormally(g, v1);
1792 <        }
1793 <    }
1794 <
1795 <    public void testRunAfterBoth_exceptionalCompletion2() {
1796 <        for (ExecutionMode m : ExecutionMode.values())
1797 <        for (Integer v1 : new Integer[] { 1, null }) {
1798 <
1799 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1800 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1801 <        final Noop r = new Noop();
1802 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1803 <        final CFException ex = new CFException();
1804 <
1805 <        g.completeExceptionally(ex);
1806 <        checkIncomplete(h);
1807 <        f.complete(v1);
1808 <
1809 <        checkCompletedWithWrappedCFException(h, ex);
1810 <        checkCompletedWithWrappedCFException(g, ex);
1811 <        assertEquals(0, r.invocationCount);
1812 <        checkCompletedNormally(f, v1);
1813 <        }
1814 <    }
1815 <
1816 <    public void testRunAfterBoth_exceptionalCompletion3() {
1959 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1960          for (ExecutionMode m : ExecutionMode.values())
1961 <        for (Integer v1 : new Integer[] { 1, null }) {
1962 <
1963 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1964 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1822 <        final Noop r = new Noop();
1823 <        final CFException ex = new CFException();
1824 <
1825 <        g.completeExceptionally(ex);
1826 <        f.complete(v1);
1827 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1828 <
1829 <        checkCompletedWithWrappedCFException(h, ex);
1830 <        checkCompletedWithWrappedCFException(g, ex);
1831 <        assertEquals(0, r.invocationCount);
1832 <        checkCompletedNormally(f, v1);
1833 <        }
1834 <    }
1835 <
1836 <    public void testRunAfterBoth_exceptionalCompletion4() {
1837 <        for (ExecutionMode m : ExecutionMode.values())
1838 <        for (Integer v1 : new Integer[] { 1, null }) {
1839 <
1961 >        for (boolean fFirst : new boolean[] { true, false })
1962 >        for (boolean failFirst : new boolean[] { true, false })
1963 >        for (Integer v1 : new Integer[] { 1, null })
1964 >    {
1965          final CompletableFuture<Integer> f = new CompletableFuture<>();
1966          final CompletableFuture<Integer> g = new CompletableFuture<>();
1842        final Noop r = new Noop();
1967          final CFException ex = new CFException();
1968 <
1969 <        f.completeExceptionally(ex);
1970 <        g.complete(v1);
1971 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1972 <
1973 <        checkCompletedWithWrappedCFException(h, ex);
1974 <        checkCompletedWithWrappedCFException(f, ex);
1975 <        assertEquals(0, r.invocationCount);
1976 <        checkCompletedNormally(g, v1);
1977 <        }
1978 <    }
1968 >        final Noop r1 = new Noop(m);
1969 >        final Noop r2 = new Noop(m);
1970 >        final Noop r3 = new Noop(m);
1971 >
1972 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1973 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1974 >        final Callable<Boolean> complete1 = failFirst ?
1975 >            () -> fst.completeExceptionally(ex) :
1976 >            () -> fst.complete(v1);
1977 >        final Callable<Boolean> complete2 = failFirst ?
1978 >            () -> snd.complete(v1) :
1979 >            () -> snd.completeExceptionally(ex);
1980 >
1981 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1982 >        assertTrue(complete1.call());
1983 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1984 >        checkIncomplete(h1);
1985 >        checkIncomplete(h2);
1986 >        assertTrue(complete2.call());
1987 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1988 >
1989 >        checkCompletedWithWrappedException(h1, ex);
1990 >        checkCompletedWithWrappedException(h2, ex);
1991 >        checkCompletedWithWrappedException(h3, ex);
1992 >        r1.assertNotInvoked();
1993 >        r2.assertNotInvoked();
1994 >        r3.assertNotInvoked();
1995 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1996 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1997 >    }}
1998  
1999      /**
2000 <     * runAfterBoth result completes exceptionally if action does
2000 >     * runAfterBoth result completes exceptionally if either source cancelled
2001       */
2002 <    public void testRunAfterBoth_actionFailed1() {
1860 <        for (ExecutionMode m : ExecutionMode.values())
1861 <        for (Integer v1 : new Integer[] { 1, null })
1862 <        for (Integer v2 : new Integer[] { 2, null }) {
1863 <
1864 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1865 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final FailingNoop r = new FailingNoop();
1867 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1868 <
1869 <        f.complete(v1);
1870 <        checkIncomplete(h);
1871 <        g.complete(v2);
1872 <
1873 <        checkCompletedWithWrappedCFException(h);
1874 <        checkCompletedNormally(f, v1);
1875 <        checkCompletedNormally(g, v2);
1876 <        }
1877 <    }
1878 <
1879 <    public void testRunAfterBoth_actionFailed2() {
2002 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2003          for (ExecutionMode m : ExecutionMode.values())
2004 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2005 +        for (boolean fFirst : new boolean[] { true, false })
2006 +        for (boolean failFirst : new boolean[] { true, false })
2007          for (Integer v1 : new Integer[] { 1, null })
2008 <        for (Integer v2 : new Integer[] { 2, null }) {
1883 <
2008 >    {
2009          final CompletableFuture<Integer> f = new CompletableFuture<>();
2010          final CompletableFuture<Integer> g = new CompletableFuture<>();
2011 <        final FailingNoop r = new FailingNoop();
2012 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2013 <
2014 <        g.complete(v2);
2015 <        checkIncomplete(h);
2016 <        f.complete(v1);
2017 <
2018 <        checkCompletedWithWrappedCFException(h);
2019 <        checkCompletedNormally(f, v1);
2020 <        checkCompletedNormally(g, v2);
2021 <        }
2022 <    }
2011 >        final Noop r1 = new Noop(m);
2012 >        final Noop r2 = new Noop(m);
2013 >        final Noop r3 = new Noop(m);
2014 >
2015 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2016 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2017 >        final Callable<Boolean> complete1 = failFirst ?
2018 >            () -> fst.cancel(mayInterruptIfRunning) :
2019 >            () -> fst.complete(v1);
2020 >        final Callable<Boolean> complete2 = failFirst ?
2021 >            () -> snd.complete(v1) :
2022 >            () -> snd.cancel(mayInterruptIfRunning);
2023 >
2024 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2025 >        assertTrue(complete1.call());
2026 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2027 >        checkIncomplete(h1);
2028 >        checkIncomplete(h2);
2029 >        assertTrue(complete2.call());
2030 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2031 >
2032 >        checkCompletedWithWrappedCancellationException(h1);
2033 >        checkCompletedWithWrappedCancellationException(h2);
2034 >        checkCompletedWithWrappedCancellationException(h3);
2035 >        r1.assertNotInvoked();
2036 >        r2.assertNotInvoked();
2037 >        r3.assertNotInvoked();
2038 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2039 >        checkCancelled(failFirst ? fst : snd);
2040 >    }}
2041  
2042      /**
2043 <     * runAfterBoth result completes exceptionally if either source cancelled
2043 >     * runAfterBoth result completes exceptionally if action does
2044       */
2045 <    public void testRunAfterBoth_sourceCancelled1() {
2045 >    public void testRunAfterBoth_actionFailed() {
2046          for (ExecutionMode m : ExecutionMode.values())
2047 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2048 <        for (Integer v1 : new Integer[] { 1, null }) {
2049 <
2050 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1908 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1909 <        final Noop r = new Noop();
1910 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1911 <
1912 <        assertTrue(f.cancel(mayInterruptIfRunning));
1913 <        checkIncomplete(h);
1914 <        g.complete(v1);
1915 <
1916 <        checkCompletedWithWrappedCancellationException(h);
1917 <        checkCancelled(f);
1918 <        assertEquals(0, r.invocationCount);
1919 <        checkCompletedNormally(g, v1);
1920 <        }
1921 <    }
1922 <
1923 <    public void testRunAfterBoth_sourceCancelled2() {
1924 <        for (ExecutionMode m : ExecutionMode.values())
1925 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1926 <        for (Integer v1 : new Integer[] { 1, null }) {
1927 <
1928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1929 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1930 <        final Noop r = new Noop();
1931 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1932 <
1933 <        assertTrue(g.cancel(mayInterruptIfRunning));
1934 <        checkIncomplete(h);
1935 <        f.complete(v1);
1936 <
1937 <        checkCompletedWithWrappedCancellationException(h);
1938 <        checkCancelled(g);
1939 <        assertEquals(0, r.invocationCount);
1940 <        checkCompletedNormally(f, v1);
1941 <        }
1942 <    }
1943 <
1944 <    public void testRunAfterBoth_sourceCancelled3() {
1945 <        for (ExecutionMode m : ExecutionMode.values())
1946 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1947 <        for (Integer v1 : new Integer[] { 1, null }) {
1948 <
2047 >        for (boolean fFirst : new boolean[] { true, false })
2048 >        for (Integer v1 : new Integer[] { 1, null })
2049 >        for (Integer v2 : new Integer[] { 2, null })
2050 >    {
2051          final CompletableFuture<Integer> f = new CompletableFuture<>();
2052          final CompletableFuture<Integer> g = new CompletableFuture<>();
2053 <        final Noop r = new Noop();
2054 <
2055 <        assertTrue(g.cancel(mayInterruptIfRunning));
2056 <        f.complete(v1);
2057 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2058 <
2059 <        checkCompletedWithWrappedCancellationException(h);
2060 <        checkCancelled(g);
2061 <        assertEquals(0, r.invocationCount);
2053 >        final FailingRunnable r1 = new FailingRunnable(m);
2054 >        final FailingRunnable r2 = new FailingRunnable(m);
2055 >        final FailingRunnable r3 = new FailingRunnable(m);
2056 >
2057 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2058 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2059 >        final Integer w1 =  fFirst ? v1 : v2;
2060 >        final Integer w2 = !fFirst ? v1 : v2;
2061 >
2062 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2063 >        assertTrue(fst.complete(w1));
2064 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2065 >        assertTrue(snd.complete(w2));
2066 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2067 >
2068 >        checkCompletedWithWrappedCFException(h1);
2069 >        checkCompletedWithWrappedCFException(h2);
2070 >        checkCompletedWithWrappedCFException(h3);
2071 >        r1.assertInvoked();
2072 >        r2.assertInvoked();
2073 >        r3.assertInvoked();
2074          checkCompletedNormally(f, v1);
2075 <        }
2076 <    }
1963 <
1964 <    public void testRunAfterBoth_sourceCancelled4() {
1965 <        for (ExecutionMode m : ExecutionMode.values())
1966 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1967 <        for (Integer v1 : new Integer[] { 1, null }) {
1968 <
1969 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1970 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1971 <        final Noop r = new Noop();
1972 <
1973 <        assertTrue(f.cancel(mayInterruptIfRunning));
1974 <        g.complete(v1);
1975 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1976 <
1977 <        checkCompletedWithWrappedCancellationException(h);
1978 <        checkCancelled(f);
1979 <        assertEquals(0, r.invocationCount);
1980 <        checkCompletedNormally(g, v1);
1981 <        }
1982 <    }
2075 >        checkCompletedNormally(g, v2);
2076 >    }}
2077  
2078      /**
2079       * applyToEither result completes normally after normal completion
2080       * of either source
2081       */
2082 <    public void testApplyToEither_normalCompletion1() {
1989 <        for (ExecutionMode m : ExecutionMode.values())
1990 <        for (Integer v1 : new Integer[] { 1, null })
1991 <        for (Integer v2 : new Integer[] { 2, null }) {
1992 <
1993 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1994 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1995 <        final IncFunction r = new IncFunction();
1996 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1997 <
1998 <        f.complete(v1);
1999 <        checkCompletedNormally(h, inc(v1));
2000 <        g.complete(v2);
2001 <
2002 <        checkCompletedNormally(f, v1);
2003 <        checkCompletedNormally(g, v2);
2004 <        checkCompletedNormally(h, inc(v1));
2005 <        }
2006 <    }
2007 <
2008 <    public void testApplyToEither_normalCompletion2() {
2082 >    public void testApplyToEither_normalCompletion() {
2083          for (ExecutionMode m : ExecutionMode.values())
2084          for (Integer v1 : new Integer[] { 1, null })
2085 <        for (Integer v2 : new Integer[] { 2, null }) {
2086 <
2013 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2015 <        final IncFunction r = new IncFunction();
2016 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2017 <
2018 <        g.complete(v2);
2019 <        checkCompletedNormally(h, inc(v2));
2020 <        f.complete(v1);
2021 <
2022 <        checkCompletedNormally(f, v1);
2023 <        checkCompletedNormally(g, v2);
2024 <        checkCompletedNormally(h, inc(v2));
2025 <        }
2026 <    }
2027 <    public void testApplyToEither_normalCompletion3() {
2028 <        for (ExecutionMode m : ExecutionMode.values())
2029 <        for (Integer v1 : new Integer[] { 1, null })
2030 <        for (Integer v2 : new Integer[] { 2, null }) {
2031 <
2085 >        for (Integer v2 : new Integer[] { 2, null })
2086 >    {
2087          final CompletableFuture<Integer> f = new CompletableFuture<>();
2088          final CompletableFuture<Integer> g = new CompletableFuture<>();
2089 <        final IncFunction r = new IncFunction();
2089 >        final IncFunction[] rs = new IncFunction[6];
2090 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2091  
2092 <        f.complete(v1);
2093 <        g.complete(v2);
2094 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2092 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2093 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2094 >        checkIncomplete(h0);
2095 >        checkIncomplete(h1);
2096 >        rs[0].assertNotInvoked();
2097 >        rs[1].assertNotInvoked();
2098 >        f.complete(v1);
2099 >        checkCompletedNormally(h0, inc(v1));
2100 >        checkCompletedNormally(h1, inc(v1));
2101 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2102 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2103 >        checkCompletedNormally(h2, inc(v1));
2104 >        checkCompletedNormally(h3, inc(v1));
2105 >        g.complete(v2);
2106 >
2107 >        // unspecified behavior - both source completions available
2108 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2109 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2110 >        rs[4].assertValue(h4.join());
2111 >        rs[5].assertValue(h5.join());
2112 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2113 >                   Objects.equals(inc(v2), h4.join()));
2114 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2115 >                   Objects.equals(inc(v2), h5.join()));
2116  
2117          checkCompletedNormally(f, v1);
2118          checkCompletedNormally(g, v2);
2119 <
2120 <        // unspecified behavior
2121 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2122 <                   Objects.equals(h.join(), inc(v2)));
2123 <        assertEquals(1, r.invocationCount);
2124 <        }
2048 <    }
2119 >        checkCompletedNormally(h0, inc(v1));
2120 >        checkCompletedNormally(h1, inc(v1));
2121 >        checkCompletedNormally(h2, inc(v1));
2122 >        checkCompletedNormally(h3, inc(v1));
2123 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2124 >    }}
2125  
2126      /**
2127       * applyToEither result completes exceptionally after exceptional
2128       * completion of either source
2129       */
2130 <    public void testApplyToEither_exceptionalCompletion1() {
2130 >    public void testApplyToEither_exceptionalCompletion() {
2131          for (ExecutionMode m : ExecutionMode.values())
2132 <        for (Integer v1 : new Integer[] { 1, null }) {
2133 <
2132 >        for (Integer v1 : new Integer[] { 1, null })
2133 >    {
2134          final CompletableFuture<Integer> f = new CompletableFuture<>();
2135          final CompletableFuture<Integer> g = new CompletableFuture<>();
2060        final IncFunction r = new IncFunction();
2061        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2136          final CFException ex = new CFException();
2137 +        final IncFunction[] rs = new IncFunction[6];
2138 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2139  
2140 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2141 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2142 +        checkIncomplete(h0);
2143 +        checkIncomplete(h1);
2144 +        rs[0].assertNotInvoked();
2145 +        rs[1].assertNotInvoked();
2146          f.completeExceptionally(ex);
2147 <        checkCompletedWithWrappedCFException(h, ex);
2147 >        checkCompletedWithWrappedException(h0, ex);
2148 >        checkCompletedWithWrappedException(h1, ex);
2149 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2150 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2151 >        checkCompletedWithWrappedException(h2, ex);
2152 >        checkCompletedWithWrappedException(h3, ex);
2153          g.complete(v1);
2154  
2155 <        assertEquals(0, r.invocationCount);
2156 <        checkCompletedNormally(g, v1);
2157 <        checkCompletedWithWrappedCFException(f, ex);
2158 <        checkCompletedWithWrappedCFException(h, ex);
2159 <        }
2160 <    }
2161 <
2162 <    public void testApplyToEither_exceptionalCompletion2() {
2163 <        for (ExecutionMode m : ExecutionMode.values())
2077 <        for (Integer v1 : new Integer[] { 1, null }) {
2078 <
2079 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2080 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction();
2082 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2083 <        final CFException ex = new CFException();
2084 <
2085 <        g.completeExceptionally(ex);
2086 <        checkCompletedWithWrappedCFException(h, ex);
2087 <        f.complete(v1);
2088 <
2089 <        assertEquals(0, r.invocationCount);
2090 <        checkCompletedNormally(f, v1);
2091 <        checkCompletedWithWrappedCFException(g, ex);
2092 <        checkCompletedWithWrappedCFException(h, ex);
2155 >        // unspecified behavior - both source completions available
2156 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2157 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2158 >        try {
2159 >            assertEquals(inc(v1), h4.join());
2160 >            rs[4].assertValue(inc(v1));
2161 >        } catch (CompletionException ok) {
2162 >            checkCompletedWithWrappedException(h4, ex);
2163 >            rs[4].assertNotInvoked();
2164          }
2094    }
2095
2096    public void testApplyToEither_exceptionalCompletion3() {
2097        for (ExecutionMode m : ExecutionMode.values())
2098        for (Integer v1 : new Integer[] { 1, null }) {
2099
2100        final CompletableFuture<Integer> f = new CompletableFuture<>();
2101        final CompletableFuture<Integer> g = new CompletableFuture<>();
2102        final IncFunction r = new IncFunction();
2103        final CFException ex = new CFException();
2104
2105        g.completeExceptionally(ex);
2106        f.complete(v1);
2107        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2108
2109        // unspecified behavior
2110        Integer v;
2165          try {
2166 <            assertEquals(inc(v1), h.join());
2167 <            assertEquals(1, r.invocationCount);
2166 >            assertEquals(inc(v1), h5.join());
2167 >            rs[5].assertValue(inc(v1));
2168          } catch (CompletionException ok) {
2169 <            checkCompletedWithWrappedCFException(h, ex);
2170 <            assertEquals(0, r.invocationCount);
2169 >            checkCompletedWithWrappedException(h5, ex);
2170 >            rs[5].assertNotInvoked();
2171          }
2172  
2173 <        checkCompletedWithWrappedCFException(g, ex);
2174 <        checkCompletedNormally(f, v1);
2175 <        }
2176 <    }
2173 >        checkCompletedExceptionally(f, ex);
2174 >        checkCompletedNormally(g, v1);
2175 >        checkCompletedWithWrappedException(h0, ex);
2176 >        checkCompletedWithWrappedException(h1, ex);
2177 >        checkCompletedWithWrappedException(h2, ex);
2178 >        checkCompletedWithWrappedException(h3, ex);
2179 >        checkCompletedWithWrappedException(h4, ex);
2180 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2181 >    }}
2182  
2183 <    public void testApplyToEither_exceptionalCompletion4() {
2183 >    public void testApplyToEither_exceptionalCompletion2() {
2184          for (ExecutionMode m : ExecutionMode.values())
2185 <        for (Integer v1 : new Integer[] { 1, null }) {
2186 <
2185 >        for (boolean fFirst : new boolean[] { true, false })
2186 >        for (Integer v1 : new Integer[] { 1, null })
2187 >    {
2188          final CompletableFuture<Integer> f = new CompletableFuture<>();
2189          final CompletableFuture<Integer> g = new CompletableFuture<>();
2130        final IncFunction r = new IncFunction();
2190          final CFException ex = new CFException();
2191 +        final IncFunction[] rs = new IncFunction[6];
2192 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2193  
2194 <        f.completeExceptionally(ex);
2195 <        g.complete(v1);
2196 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2194 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2195 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2196 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2197 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2198 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2199 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2200  
2201 <        // unspecified behavior
2138 <        Integer v;
2201 >        // unspecified behavior - both source completions available
2202          try {
2203 <            assertEquals(inc(v1), h.join());
2204 <            assertEquals(1, r.invocationCount);
2203 >            assertEquals(inc(v1), h0.join());
2204 >            rs[0].assertValue(inc(v1));
2205          } catch (CompletionException ok) {
2206 <            checkCompletedWithWrappedCFException(h, ex);
2207 <            assertEquals(0, r.invocationCount);
2206 >            checkCompletedWithWrappedException(h0, ex);
2207 >            rs[0].assertNotInvoked();
2208          }
2209 <
2210 <        checkCompletedWithWrappedCFException(f, ex);
2211 <        checkCompletedNormally(g, v1);
2209 >        try {
2210 >            assertEquals(inc(v1), h1.join());
2211 >            rs[1].assertValue(inc(v1));
2212 >        } catch (CompletionException ok) {
2213 >            checkCompletedWithWrappedException(h1, ex);
2214 >            rs[1].assertNotInvoked();
2215          }
2216 <    }
2217 <
2218 <    /**
2219 <     * applyToEither result completes exceptionally if action does
2220 <     */
2221 <    public void testApplyToEither_actionFailed1() {
2222 <        for (ExecutionMode m : ExecutionMode.values())
2223 <        for (Integer v1 : new Integer[] { 1, null })
2224 <        for (Integer v2 : new Integer[] { 2, null }) {
2225 <
2226 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2227 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2228 <        final FailingFunction r = new FailingFunction();
2163 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2164 <
2165 <        f.complete(v1);
2166 <        checkCompletedWithWrappedCFException(h);
2167 <        g.complete(v2);
2168 <        checkCompletedNormally(f, v1);
2169 <        checkCompletedNormally(g, v2);
2216 >        try {
2217 >            assertEquals(inc(v1), h2.join());
2218 >            rs[2].assertValue(inc(v1));
2219 >        } catch (CompletionException ok) {
2220 >            checkCompletedWithWrappedException(h2, ex);
2221 >            rs[2].assertNotInvoked();
2222 >        }
2223 >        try {
2224 >            assertEquals(inc(v1), h3.join());
2225 >            rs[3].assertValue(inc(v1));
2226 >        } catch (CompletionException ok) {
2227 >            checkCompletedWithWrappedException(h3, ex);
2228 >            rs[3].assertNotInvoked();
2229          }
2171    }
2172
2173    public void testApplyToEither_actionFailed2() {
2174        for (ExecutionMode m : ExecutionMode.values())
2175        for (Integer v1 : new Integer[] { 1, null })
2176        for (Integer v2 : new Integer[] { 2, null }) {
2177
2178        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180        final FailingFunction r = new FailingFunction();
2181        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2230  
2183        g.complete(v2);
2184        checkCompletedWithWrappedCFException(h);
2185        f.complete(v1);
2231          checkCompletedNormally(f, v1);
2232 <        checkCompletedNormally(g, v2);
2233 <        }
2189 <    }
2232 >        checkCompletedExceptionally(g, ex);
2233 >    }}
2234  
2235      /**
2236       * applyToEither result completes exceptionally if either source cancelled
2237       */
2238 <    public void testApplyToEither_sourceCancelled1() {
2238 >    public void testApplyToEither_sourceCancelled() {
2239          for (ExecutionMode m : ExecutionMode.values())
2240          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2241 <        for (Integer v1 : new Integer[] { 1, null }) {
2242 <
2241 >        for (Integer v1 : new Integer[] { 1, null })
2242 >    {
2243          final CompletableFuture<Integer> f = new CompletableFuture<>();
2244          final CompletableFuture<Integer> g = new CompletableFuture<>();
2245 <        final IncFunction r = new IncFunction();
2246 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2245 >        final IncFunction[] rs = new IncFunction[6];
2246 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2247  
2248 <        assertTrue(f.cancel(mayInterruptIfRunning));
2249 <        checkCompletedWithWrappedCancellationException(h);
2250 <        g.complete(v1);
2248 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2249 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2250 >        checkIncomplete(h0);
2251 >        checkIncomplete(h1);
2252 >        rs[0].assertNotInvoked();
2253 >        rs[1].assertNotInvoked();
2254 >        f.cancel(mayInterruptIfRunning);
2255 >        checkCompletedWithWrappedCancellationException(h0);
2256 >        checkCompletedWithWrappedCancellationException(h1);
2257 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2258 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2259 >        checkCompletedWithWrappedCancellationException(h2);
2260 >        checkCompletedWithWrappedCancellationException(h3);
2261 >        g.complete(v1);
2262 >
2263 >        // unspecified behavior - both source completions available
2264 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2265 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2266 >        try {
2267 >            assertEquals(inc(v1), h4.join());
2268 >            rs[4].assertValue(inc(v1));
2269 >        } catch (CompletionException ok) {
2270 >            checkCompletedWithWrappedCancellationException(h4);
2271 >            rs[4].assertNotInvoked();
2272 >        }
2273 >        try {
2274 >            assertEquals(inc(v1), h5.join());
2275 >            rs[5].assertValue(inc(v1));
2276 >        } catch (CompletionException ok) {
2277 >            checkCompletedWithWrappedCancellationException(h5);
2278 >            rs[5].assertNotInvoked();
2279 >        }
2280  
2281          checkCancelled(f);
2209        assertEquals(0, r.invocationCount);
2282          checkCompletedNormally(g, v1);
2283 <        checkCompletedWithWrappedCancellationException(h);
2284 <        }
2285 <    }
2283 >        checkCompletedWithWrappedCancellationException(h0);
2284 >        checkCompletedWithWrappedCancellationException(h1);
2285 >        checkCompletedWithWrappedCancellationException(h2);
2286 >        checkCompletedWithWrappedCancellationException(h3);
2287 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2288 >    }}
2289  
2290      public void testApplyToEither_sourceCancelled2() {
2291          for (ExecutionMode m : ExecutionMode.values())
2292          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2293 <        for (Integer v1 : new Integer[] { 1, null }) {
2294 <
2293 >        for (boolean fFirst : new boolean[] { true, false })
2294 >        for (Integer v1 : new Integer[] { 1, null })
2295 >    {
2296          final CompletableFuture<Integer> f = new CompletableFuture<>();
2297          final CompletableFuture<Integer> g = new CompletableFuture<>();
2298 <        final IncFunction r = new IncFunction();
2299 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2298 >        final IncFunction[] rs = new IncFunction[6];
2299 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2300  
2301 <        assertTrue(g.cancel(mayInterruptIfRunning));
2302 <        checkCompletedWithWrappedCancellationException(h);
2303 <        f.complete(v1);
2301 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2302 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2303 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2304 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2305 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2306 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2307  
2308 <        checkCancelled(g);
2309 <        assertEquals(0, r.invocationCount);
2310 <        checkCompletedNormally(f, v1);
2311 <        checkCompletedWithWrappedCancellationException(h);
2308 >        // unspecified behavior - both source completions available
2309 >        try {
2310 >            assertEquals(inc(v1), h0.join());
2311 >            rs[0].assertValue(inc(v1));
2312 >        } catch (CompletionException ok) {
2313 >            checkCompletedWithWrappedCancellationException(h0);
2314 >            rs[0].assertNotInvoked();
2315          }
2234    }
2235
2236    public void testApplyToEither_sourceCancelled3() {
2237        for (ExecutionMode m : ExecutionMode.values())
2238        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2239        for (Integer v1 : new Integer[] { 1, null }) {
2240
2241        final CompletableFuture<Integer> f = new CompletableFuture<>();
2242        final CompletableFuture<Integer> g = new CompletableFuture<>();
2243        final IncFunction r = new IncFunction();
2244
2245        assertTrue(g.cancel(mayInterruptIfRunning));
2246        f.complete(v1);
2247        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2248
2249        // unspecified behavior
2250        Integer v;
2316          try {
2317 <            assertEquals(inc(v1), h.join());
2318 <            assertEquals(1, r.invocationCount);
2317 >            assertEquals(inc(v1), h1.join());
2318 >            rs[1].assertValue(inc(v1));
2319          } catch (CompletionException ok) {
2320 <            checkCompletedWithWrappedCancellationException(h);
2321 <            assertEquals(0, r.invocationCount);
2320 >            checkCompletedWithWrappedCancellationException(h1);
2321 >            rs[1].assertNotInvoked();
2322          }
2323 <
2324 <        checkCancelled(g);
2325 <        checkCompletedNormally(f, v1);
2323 >        try {
2324 >            assertEquals(inc(v1), h2.join());
2325 >            rs[2].assertValue(inc(v1));
2326 >        } catch (CompletionException ok) {
2327 >            checkCompletedWithWrappedCancellationException(h2);
2328 >            rs[2].assertNotInvoked();
2329          }
2262    }
2263
2264    public void testApplyToEither_sourceCancelled4() {
2265        for (ExecutionMode m : ExecutionMode.values())
2266        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2267        for (Integer v1 : new Integer[] { 1, null }) {
2268
2269        final CompletableFuture<Integer> f = new CompletableFuture<>();
2270        final CompletableFuture<Integer> g = new CompletableFuture<>();
2271        final IncFunction r = new IncFunction();
2272
2273        assertTrue(f.cancel(mayInterruptIfRunning));
2274        g.complete(v1);
2275        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2276
2277        // unspecified behavior
2278        Integer v;
2330          try {
2331 <            assertEquals(inc(v1), h.join());
2332 <            assertEquals(1, r.invocationCount);
2331 >            assertEquals(inc(v1), h3.join());
2332 >            rs[3].assertValue(inc(v1));
2333          } catch (CompletionException ok) {
2334 <            checkCompletedWithWrappedCancellationException(h);
2335 <            assertEquals(0, r.invocationCount);
2334 >            checkCompletedWithWrappedCancellationException(h3);
2335 >            rs[3].assertNotInvoked();
2336          }
2337  
2338 <        checkCancelled(f);
2339 <        checkCompletedNormally(g, v1);
2340 <        }
2290 <    }
2338 >        checkCompletedNormally(f, v1);
2339 >        checkCancelled(g);
2340 >    }}
2341  
2342      /**
2343 <     * acceptEither result completes normally after normal completion
2294 <     * of either source
2343 >     * applyToEither result completes exceptionally if action does
2344       */
2345 <    public void testAcceptEither_normalCompletion1() {
2345 >    public void testApplyToEither_actionFailed() {
2346          for (ExecutionMode m : ExecutionMode.values())
2347          for (Integer v1 : new Integer[] { 1, null })
2348 <        for (Integer v2 : new Integer[] { 2, null }) {
2349 <
2348 >        for (Integer v2 : new Integer[] { 2, null })
2349 >    {
2350          final CompletableFuture<Integer> f = new CompletableFuture<>();
2351          final CompletableFuture<Integer> g = new CompletableFuture<>();
2352 <        final IncAction r = new IncAction();
2353 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2352 >        final FailingFunction[] rs = new FailingFunction[6];
2353 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2354  
2355 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2356 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2357          f.complete(v1);
2358 <        checkCompletedNormally(h, null);
2359 <        assertEquals(inc(v1), r.value);
2360 <        g.complete(v2);
2361 <
2362 <        checkCompletedNormally(f, v1);
2363 <        checkCompletedNormally(g, v2);
2364 <        checkCompletedNormally(h, null);
2314 <        }
2315 <    }
2316 <
2317 <    public void testAcceptEither_normalCompletion2() {
2318 <        for (ExecutionMode m : ExecutionMode.values())
2319 <        for (Integer v1 : new Integer[] { 1, null })
2320 <        for (Integer v2 : new Integer[] { 2, null }) {
2321 <
2322 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2323 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2324 <        final IncAction r = new IncAction();
2325 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2358 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2359 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2360 >        checkCompletedWithWrappedCFException(h0);
2361 >        checkCompletedWithWrappedCFException(h1);
2362 >        checkCompletedWithWrappedCFException(h2);
2363 >        checkCompletedWithWrappedCFException(h3);
2364 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2365  
2366          g.complete(v2);
2367 <        checkCompletedNormally(h, null);
2368 <        assertEquals(inc(v2), r.value);
2369 <        f.complete(v1);
2367 >
2368 >        // unspecified behavior - both source completions available
2369 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2370 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2371 >
2372 >        checkCompletedWithWrappedCFException(h4);
2373 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2374 >                   Objects.equals(v2, rs[4].value));
2375 >        checkCompletedWithWrappedCFException(h5);
2376 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2377 >                   Objects.equals(v2, rs[5].value));
2378  
2379          checkCompletedNormally(f, v1);
2380          checkCompletedNormally(g, v2);
2381 <        checkCompletedNormally(h, null);
2382 <        }
2383 <    }
2384 <    public void testAcceptEither_normalCompletion3() {
2381 >    }}
2382 >
2383 >    /**
2384 >     * acceptEither result completes normally after normal completion
2385 >     * of either source
2386 >     */
2387 >    public void testAcceptEither_normalCompletion() {
2388          for (ExecutionMode m : ExecutionMode.values())
2389          for (Integer v1 : new Integer[] { 1, null })
2390 <        for (Integer v2 : new Integer[] { 2, null }) {
2391 <
2390 >        for (Integer v2 : new Integer[] { 2, null })
2391 >    {
2392          final CompletableFuture<Integer> f = new CompletableFuture<>();
2393          final CompletableFuture<Integer> g = new CompletableFuture<>();
2394 <        final IncAction r = new IncAction();
2394 >        final NoopConsumer[] rs = new NoopConsumer[6];
2395 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2396  
2397 <        f.complete(v1);
2398 <        g.complete(v2);
2399 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2397 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2398 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2399 >        checkIncomplete(h0);
2400 >        checkIncomplete(h1);
2401 >        rs[0].assertNotInvoked();
2402 >        rs[1].assertNotInvoked();
2403 >        f.complete(v1);
2404 >        checkCompletedNormally(h0, null);
2405 >        checkCompletedNormally(h1, null);
2406 >        rs[0].assertValue(v1);
2407 >        rs[1].assertValue(v1);
2408 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2409 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2410 >        checkCompletedNormally(h2, null);
2411 >        checkCompletedNormally(h3, null);
2412 >        rs[2].assertValue(v1);
2413 >        rs[3].assertValue(v1);
2414 >        g.complete(v2);
2415 >
2416 >        // unspecified behavior - both source completions available
2417 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2418 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2419 >        checkCompletedNormally(h4, null);
2420 >        checkCompletedNormally(h5, null);
2421 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2422 >                   Objects.equals(v2, rs[4].value));
2423 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2424 >                   Objects.equals(v2, rs[5].value));
2425  
2350        checkCompletedNormally(h, null);
2426          checkCompletedNormally(f, v1);
2427          checkCompletedNormally(g, v2);
2428 <
2429 <        // unspecified behavior
2430 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2431 <                   Objects.equals(r.value, inc(v2)));
2432 <        }
2433 <    }
2428 >        checkCompletedNormally(h0, null);
2429 >        checkCompletedNormally(h1, null);
2430 >        checkCompletedNormally(h2, null);
2431 >        checkCompletedNormally(h3, null);
2432 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2433 >    }}
2434  
2435      /**
2436       * acceptEither result completes exceptionally after exceptional
2437       * completion of either source
2438       */
2439 <    public void testAcceptEither_exceptionalCompletion1() {
2439 >    public void testAcceptEither_exceptionalCompletion() {
2440          for (ExecutionMode m : ExecutionMode.values())
2441 <        for (Integer v1 : new Integer[] { 1, null }) {
2442 <
2441 >        for (Integer v1 : new Integer[] { 1, null })
2442 >    {
2443          final CompletableFuture<Integer> f = new CompletableFuture<>();
2444          final CompletableFuture<Integer> g = new CompletableFuture<>();
2370        final IncAction r = new IncAction();
2371        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2445          final CFException ex = new CFException();
2446 +        final NoopConsumer[] rs = new NoopConsumer[6];
2447 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2448  
2449 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2450 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2451 +        checkIncomplete(h0);
2452 +        checkIncomplete(h1);
2453 +        rs[0].assertNotInvoked();
2454 +        rs[1].assertNotInvoked();
2455          f.completeExceptionally(ex);
2456 <        checkCompletedWithWrappedCFException(h, ex);
2457 <        g.complete(v1);
2458 <
2459 <        assertEquals(0, r.invocationCount);
2460 <        checkCompletedNormally(g, v1);
2461 <        checkCompletedWithWrappedCFException(f, ex);
2381 <        checkCompletedWithWrappedCFException(h, ex);
2382 <        }
2383 <    }
2456 >        checkCompletedWithWrappedException(h0, ex);
2457 >        checkCompletedWithWrappedException(h1, ex);
2458 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2459 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2460 >        checkCompletedWithWrappedException(h2, ex);
2461 >        checkCompletedWithWrappedException(h3, ex);
2462  
2463 <    public void testAcceptEither_exceptionalCompletion2() {
2386 <        for (ExecutionMode m : ExecutionMode.values())
2387 <        for (Integer v1 : new Integer[] { 1, null }) {
2388 <
2389 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2390 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2393 <        final CFException ex = new CFException();
2394 <
2395 <        g.completeExceptionally(ex);
2396 <        checkCompletedWithWrappedCFException(h, ex);
2397 <        f.complete(v1);
2463 >        g.complete(v1);
2464  
2465 <        assertEquals(0, r.invocationCount);
2466 <        checkCompletedNormally(f, v1);
2467 <        checkCompletedWithWrappedCFException(g, ex);
2468 <        checkCompletedWithWrappedCFException(h, ex);
2465 >        // unspecified behavior - both source completions available
2466 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2467 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2468 >        try {
2469 >            assertNull(h4.join());
2470 >            rs[4].assertValue(v1);
2471 >        } catch (CompletionException ok) {
2472 >            checkCompletedWithWrappedException(h4, ex);
2473 >            rs[4].assertNotInvoked();
2474          }
2404    }
2405
2406    public void testAcceptEither_exceptionalCompletion3() {
2407        for (ExecutionMode m : ExecutionMode.values())
2408        for (Integer v1 : new Integer[] { 1, null }) {
2409
2410        final CompletableFuture<Integer> f = new CompletableFuture<>();
2411        final CompletableFuture<Integer> g = new CompletableFuture<>();
2412        final IncAction r = new IncAction();
2413        final CFException ex = new CFException();
2414
2415        g.completeExceptionally(ex);
2416        f.complete(v1);
2417        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2418
2419        // unspecified behavior
2420        Integer v;
2475          try {
2476 <            assertNull(h.join());
2477 <            assertEquals(1, r.invocationCount);
2424 <            assertEquals(inc(v1), r.value);
2476 >            assertNull(h5.join());
2477 >            rs[5].assertValue(v1);
2478          } catch (CompletionException ok) {
2479 <            checkCompletedWithWrappedCFException(h, ex);
2480 <            assertEquals(0, r.invocationCount);
2479 >            checkCompletedWithWrappedException(h5, ex);
2480 >            rs[5].assertNotInvoked();
2481          }
2482  
2483 <        checkCompletedWithWrappedCFException(g, ex);
2484 <        checkCompletedNormally(f, v1);
2485 <        }
2486 <    }
2483 >        checkCompletedExceptionally(f, ex);
2484 >        checkCompletedNormally(g, v1);
2485 >        checkCompletedWithWrappedException(h0, ex);
2486 >        checkCompletedWithWrappedException(h1, ex);
2487 >        checkCompletedWithWrappedException(h2, ex);
2488 >        checkCompletedWithWrappedException(h3, ex);
2489 >        checkCompletedWithWrappedException(h4, ex);
2490 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2491 >    }}
2492  
2493 <    public void testAcceptEither_exceptionalCompletion4() {
2493 >    public void testAcceptEither_exceptionalCompletion2() {
2494          for (ExecutionMode m : ExecutionMode.values())
2495 <        for (Integer v1 : new Integer[] { 1, null }) {
2496 <
2495 >        for (boolean fFirst : new boolean[] { true, false })
2496 >        for (Integer v1 : new Integer[] { 1, null })
2497 >    {
2498          final CompletableFuture<Integer> f = new CompletableFuture<>();
2499          final CompletableFuture<Integer> g = new CompletableFuture<>();
2441        final IncAction r = new IncAction();
2500          final CFException ex = new CFException();
2501 +        final NoopConsumer[] rs = new NoopConsumer[6];
2502 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2503  
2504 <        f.completeExceptionally(ex);
2505 <        g.complete(v1);
2506 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2504 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2505 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2506 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2507 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2508 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2509 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2510  
2511 <        // unspecified behavior
2449 <        Integer v;
2511 >        // unspecified behavior - both source completions available
2512          try {
2513 <            assertNull(h.join());
2514 <            assertEquals(1, r.invocationCount);
2453 <            assertEquals(inc(v1), r.value);
2513 >            assertEquals(null, h0.join());
2514 >            rs[0].assertValue(v1);
2515          } catch (CompletionException ok) {
2516 <            checkCompletedWithWrappedCFException(h, ex);
2517 <            assertEquals(0, r.invocationCount);
2516 >            checkCompletedWithWrappedException(h0, ex);
2517 >            rs[0].assertNotInvoked();
2518          }
2519 <
2520 <        checkCompletedWithWrappedCFException(f, ex);
2521 <        checkCompletedNormally(g, v1);
2519 >        try {
2520 >            assertEquals(null, h1.join());
2521 >            rs[1].assertValue(v1);
2522 >        } catch (CompletionException ok) {
2523 >            checkCompletedWithWrappedException(h1, ex);
2524 >            rs[1].assertNotInvoked();
2525          }
2526 <    }
2527 <
2528 <    /**
2529 <     * acceptEither result completes exceptionally if action does
2530 <     */
2531 <    public void testAcceptEither_actionFailed1() {
2532 <        for (ExecutionMode m : ExecutionMode.values())
2533 <        for (Integer v1 : new Integer[] { 1, null })
2534 <        for (Integer v2 : new Integer[] { 2, null }) {
2535 <
2536 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2537 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2538 <        final FailingConsumer r = new FailingConsumer();
2475 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2476 <
2477 <        f.complete(v1);
2478 <        checkCompletedWithWrappedCFException(h);
2479 <        g.complete(v2);
2480 <        checkCompletedNormally(f, v1);
2481 <        checkCompletedNormally(g, v2);
2526 >        try {
2527 >            assertEquals(null, h2.join());
2528 >            rs[2].assertValue(v1);
2529 >        } catch (CompletionException ok) {
2530 >            checkCompletedWithWrappedException(h2, ex);
2531 >            rs[2].assertNotInvoked();
2532 >        }
2533 >        try {
2534 >            assertEquals(null, h3.join());
2535 >            rs[3].assertValue(v1);
2536 >        } catch (CompletionException ok) {
2537 >            checkCompletedWithWrappedException(h3, ex);
2538 >            rs[3].assertNotInvoked();
2539          }
2483    }
2484
2485    public void testAcceptEither_actionFailed2() {
2486        for (ExecutionMode m : ExecutionMode.values())
2487        for (Integer v1 : new Integer[] { 1, null })
2488        for (Integer v2 : new Integer[] { 2, null }) {
2489
2490        final CompletableFuture<Integer> f = new CompletableFuture<>();
2491        final CompletableFuture<Integer> g = new CompletableFuture<>();
2492        final FailingConsumer r = new FailingConsumer();
2493        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2540  
2495        g.complete(v2);
2496        checkCompletedWithWrappedCFException(h);
2497        f.complete(v1);
2541          checkCompletedNormally(f, v1);
2542 <        checkCompletedNormally(g, v2);
2543 <        }
2501 <    }
2542 >        checkCompletedExceptionally(g, ex);
2543 >    }}
2544  
2545      /**
2546       * acceptEither result completes exceptionally if either source cancelled
2547       */
2548 <    public void testAcceptEither_sourceCancelled1() {
2548 >    public void testAcceptEither_sourceCancelled() {
2549          for (ExecutionMode m : ExecutionMode.values())
2550          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2551 <        for (Integer v1 : new Integer[] { 1, null }) {
2552 <
2511 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2512 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2513 <        final IncAction r = new IncAction();
2514 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2515 <
2516 <        assertTrue(f.cancel(mayInterruptIfRunning));
2517 <        checkCompletedWithWrappedCancellationException(h);
2518 <        g.complete(v1);
2519 <
2520 <        checkCancelled(f);
2521 <        assertEquals(0, r.invocationCount);
2522 <        checkCompletedNormally(g, v1);
2523 <        checkCompletedWithWrappedCancellationException(h);
2524 <        }
2525 <    }
2526 <
2527 <    public void testAcceptEither_sourceCancelled2() {
2528 <        for (ExecutionMode m : ExecutionMode.values())
2529 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2530 <        for (Integer v1 : new Integer[] { 1, null }) {
2531 <
2551 >        for (Integer v1 : new Integer[] { 1, null })
2552 >    {
2553          final CompletableFuture<Integer> f = new CompletableFuture<>();
2554          final CompletableFuture<Integer> g = new CompletableFuture<>();
2555 <        final IncAction r = new IncAction();
2556 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2536 <
2537 <        assertTrue(g.cancel(mayInterruptIfRunning));
2538 <        checkCompletedWithWrappedCancellationException(h);
2539 <        f.complete(v1);
2540 <
2541 <        checkCancelled(g);
2542 <        assertEquals(0, r.invocationCount);
2543 <        checkCompletedNormally(f, v1);
2544 <        checkCompletedWithWrappedCancellationException(h);
2545 <        }
2546 <    }
2547 <
2548 <    public void testAcceptEither_sourceCancelled3() {
2549 <        for (ExecutionMode m : ExecutionMode.values())
2550 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2551 <        for (Integer v1 : new Integer[] { 1, null }) {
2555 >        final NoopConsumer[] rs = new NoopConsumer[6];
2556 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2557  
2558 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2559 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2560 <        final IncAction r = new IncAction();
2558 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2559 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2560 >        checkIncomplete(h0);
2561 >        checkIncomplete(h1);
2562 >        rs[0].assertNotInvoked();
2563 >        rs[1].assertNotInvoked();
2564 >        f.cancel(mayInterruptIfRunning);
2565 >        checkCompletedWithWrappedCancellationException(h0);
2566 >        checkCompletedWithWrappedCancellationException(h1);
2567 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2568 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2569 >        checkCompletedWithWrappedCancellationException(h2);
2570 >        checkCompletedWithWrappedCancellationException(h3);
2571  
2572 <        assertTrue(g.cancel(mayInterruptIfRunning));
2558 <        f.complete(v1);
2559 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2572 >        g.complete(v1);
2573  
2574 <        // unspecified behavior
2575 <        Integer v;
2574 >        // unspecified behavior - both source completions available
2575 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2576 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2577          try {
2578 <            assertNull(h.join());
2579 <            assertEquals(1, r.invocationCount);
2566 <            assertEquals(inc(v1), r.value);
2578 >            assertNull(h4.join());
2579 >            rs[4].assertValue(v1);
2580          } catch (CompletionException ok) {
2581 <            checkCompletedWithWrappedCancellationException(h);
2582 <            assertEquals(0, r.invocationCount);
2570 <        }
2571 <
2572 <        checkCancelled(g);
2573 <        checkCompletedNormally(f, v1);
2581 >            checkCompletedWithWrappedCancellationException(h4);
2582 >            rs[4].assertNotInvoked();
2583          }
2575    }
2576
2577    public void testAcceptEither_sourceCancelled4() {
2578        for (ExecutionMode m : ExecutionMode.values())
2579        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2580        for (Integer v1 : new Integer[] { 1, null }) {
2581
2582        final CompletableFuture<Integer> f = new CompletableFuture<>();
2583        final CompletableFuture<Integer> g = new CompletableFuture<>();
2584        final IncAction r = new IncAction();
2585
2586        assertTrue(f.cancel(mayInterruptIfRunning));
2587        g.complete(v1);
2588        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2589
2590        // unspecified behavior
2591        Integer v;
2584          try {
2585 <            assertNull(h.join());
2586 <            assertEquals(1, r.invocationCount);
2595 <            assertEquals(inc(v1), r.value);
2585 >            assertNull(h5.join());
2586 >            rs[5].assertValue(v1);
2587          } catch (CompletionException ok) {
2588 <            checkCompletedWithWrappedCancellationException(h);
2589 <            assertEquals(0, r.invocationCount);
2588 >            checkCompletedWithWrappedCancellationException(h5);
2589 >            rs[5].assertNotInvoked();
2590          }
2591  
2592          checkCancelled(f);
2593          checkCompletedNormally(g, v1);
2594 <        }
2595 <    }
2594 >        checkCompletedWithWrappedCancellationException(h0);
2595 >        checkCompletedWithWrappedCancellationException(h1);
2596 >        checkCompletedWithWrappedCancellationException(h2);
2597 >        checkCompletedWithWrappedCancellationException(h3);
2598 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2599 >    }}
2600  
2601      /**
2602 <     * runAfterEither result completes normally after normal completion
2608 <     * of either source
2602 >     * acceptEither result completes exceptionally if action does
2603       */
2604 <    public void testRunAfterEither_normalCompletion1() {
2604 >    public void testAcceptEither_actionFailed() {
2605          for (ExecutionMode m : ExecutionMode.values())
2606          for (Integer v1 : new Integer[] { 1, null })
2607 <        for (Integer v2 : new Integer[] { 2, null }) {
2608 <
2607 >        for (Integer v2 : new Integer[] { 2, null })
2608 >    {
2609          final CompletableFuture<Integer> f = new CompletableFuture<>();
2610          final CompletableFuture<Integer> g = new CompletableFuture<>();
2611 <        final Noop r = new Noop();
2612 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2611 >        final FailingConsumer[] rs = new FailingConsumer[6];
2612 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2613  
2614 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2615 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2616          f.complete(v1);
2617 <        checkCompletedNormally(h, null);
2618 <        assertEquals(1, r.invocationCount);
2617 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2618 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2619 >        checkCompletedWithWrappedCFException(h0);
2620 >        checkCompletedWithWrappedCFException(h1);
2621 >        checkCompletedWithWrappedCFException(h2);
2622 >        checkCompletedWithWrappedCFException(h3);
2623 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2624 >
2625          g.complete(v2);
2626  
2627 +        // unspecified behavior - both source completions available
2628 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2629 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2630 +
2631 +        checkCompletedWithWrappedCFException(h4);
2632 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2633 +                   Objects.equals(v2, rs[4].value));
2634 +        checkCompletedWithWrappedCFException(h5);
2635 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2636 +                   Objects.equals(v2, rs[5].value));
2637 +
2638          checkCompletedNormally(f, v1);
2639          checkCompletedNormally(g, v2);
2640 <        checkCompletedNormally(h, null);
2628 <        assertEquals(1, r.invocationCount);
2629 <        }
2630 <    }
2640 >    }}
2641  
2642 <    public void testRunAfterEither_normalCompletion2() {
2642 >    /**
2643 >     * runAfterEither result completes normally after normal completion
2644 >     * of either source
2645 >     */
2646 >    public void testRunAfterEither_normalCompletion() {
2647          for (ExecutionMode m : ExecutionMode.values())
2648          for (Integer v1 : new Integer[] { 1, null })
2649 <        for (Integer v2 : new Integer[] { 2, null }) {
2650 <
2649 >        for (Integer v2 : new Integer[] { 2, null })
2650 >    {
2651          final CompletableFuture<Integer> f = new CompletableFuture<>();
2652          final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 <        final Noop r = new Noop();
2654 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2653 >        final Noop[] rs = new Noop[6];
2654 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2655  
2656 <        g.complete(v2);
2657 <        checkCompletedNormally(h, null);
2658 <        assertEquals(1, r.invocationCount);
2659 <        f.complete(v1);
2656 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2657 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2658 >        checkIncomplete(h0);
2659 >        checkIncomplete(h1);
2660 >        rs[0].assertNotInvoked();
2661 >        rs[1].assertNotInvoked();
2662 >        f.complete(v1);
2663 >        checkCompletedNormally(h0, null);
2664 >        checkCompletedNormally(h1, null);
2665 >        rs[0].assertInvoked();
2666 >        rs[1].assertInvoked();
2667 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2668 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2669 >        checkCompletedNormally(h2, null);
2670 >        checkCompletedNormally(h3, null);
2671 >        rs[2].assertInvoked();
2672 >        rs[3].assertInvoked();
2673  
2647        checkCompletedNormally(f, v1);
2648        checkCompletedNormally(g, v2);
2649        checkCompletedNormally(h, null);
2650        assertEquals(1, r.invocationCount);
2651        }
2652    }
2653    public void testRunAfterEither_normalCompletion3() {
2654        for (ExecutionMode m : ExecutionMode.values())
2655        for (Integer v1 : new Integer[] { 1, null })
2656        for (Integer v2 : new Integer[] { 2, null }) {
2657
2658        final CompletableFuture<Integer> f = new CompletableFuture<>();
2659        final CompletableFuture<Integer> g = new CompletableFuture<>();
2660        final Noop r = new Noop();
2661
2662        f.complete(v1);
2674          g.complete(v2);
2664        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2675  
2676 <        checkCompletedNormally(h, null);
2676 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2677 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2678 >
2679          checkCompletedNormally(f, v1);
2680          checkCompletedNormally(g, v2);
2681 <        assertEquals(1, r.invocationCount);
2682 <        }
2683 <    }
2681 >        checkCompletedNormally(h0, null);
2682 >        checkCompletedNormally(h1, null);
2683 >        checkCompletedNormally(h2, null);
2684 >        checkCompletedNormally(h3, null);
2685 >        checkCompletedNormally(h4, null);
2686 >        checkCompletedNormally(h5, null);
2687 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2688 >    }}
2689  
2690      /**
2691       * runAfterEither result completes exceptionally after exceptional
2692       * completion of either source
2693       */
2694 <    public void testRunAfterEither_exceptionalCompletion1() {
2694 >    public void testRunAfterEither_exceptionalCompletion() {
2695          for (ExecutionMode m : ExecutionMode.values())
2696 <        for (Integer v1 : new Integer[] { 1, null }) {
2697 <
2696 >        for (Integer v1 : new Integer[] { 1, null })
2697 >    {
2698          final CompletableFuture<Integer> f = new CompletableFuture<>();
2699          final CompletableFuture<Integer> g = new CompletableFuture<>();
2683        final Noop r = new Noop();
2684        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2700          final CFException ex = new CFException();
2701 +        final Noop[] rs = new Noop[6];
2702 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2703  
2704 <        f.completeExceptionally(ex);
2705 <        checkCompletedWithWrappedCFException(h, ex);
2706 <        g.complete(v1);
2704 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2705 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2706 >        checkIncomplete(h0);
2707 >        checkIncomplete(h1);
2708 >        rs[0].assertNotInvoked();
2709 >        rs[1].assertNotInvoked();
2710 >        assertTrue(f.completeExceptionally(ex));
2711 >        checkCompletedWithWrappedException(h0, ex);
2712 >        checkCompletedWithWrappedException(h1, ex);
2713 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2714 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2715 >        checkCompletedWithWrappedException(h2, ex);
2716 >        checkCompletedWithWrappedException(h3, ex);
2717 >
2718 >        assertTrue(g.complete(v1));
2719 >
2720 >        // unspecified behavior - both source completions available
2721 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2722 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2723 >        try {
2724 >            assertNull(h4.join());
2725 >            rs[4].assertInvoked();
2726 >        } catch (CompletionException ok) {
2727 >            checkCompletedWithWrappedException(h4, ex);
2728 >            rs[4].assertNotInvoked();
2729 >        }
2730 >        try {
2731 >            assertNull(h5.join());
2732 >            rs[5].assertInvoked();
2733 >        } catch (CompletionException ok) {
2734 >            checkCompletedWithWrappedException(h5, ex);
2735 >            rs[5].assertNotInvoked();
2736 >        }
2737  
2738 <        assertEquals(0, r.invocationCount);
2738 >        checkCompletedExceptionally(f, ex);
2739          checkCompletedNormally(g, v1);
2740 <        checkCompletedWithWrappedCFException(f, ex);
2741 <        checkCompletedWithWrappedCFException(h, ex);
2742 <        }
2743 <    }
2740 >        checkCompletedWithWrappedException(h0, ex);
2741 >        checkCompletedWithWrappedException(h1, ex);
2742 >        checkCompletedWithWrappedException(h2, ex);
2743 >        checkCompletedWithWrappedException(h3, ex);
2744 >        checkCompletedWithWrappedException(h4, ex);
2745 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2746 >    }}
2747  
2748      public void testRunAfterEither_exceptionalCompletion2() {
2749          for (ExecutionMode m : ExecutionMode.values())
2750 <        for (Integer v1 : new Integer[] { 1, null }) {
2751 <
2752 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2703 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2704 <        final Noop r = new Noop();
2705 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2706 <        final CFException ex = new CFException();
2707 <
2708 <        g.completeExceptionally(ex);
2709 <        checkCompletedWithWrappedCFException(h, ex);
2710 <        f.complete(v1);
2711 <
2712 <        assertEquals(0, r.invocationCount);
2713 <        checkCompletedNormally(f, v1);
2714 <        checkCompletedWithWrappedCFException(g, ex);
2715 <        checkCompletedWithWrappedCFException(h, ex);
2716 <        }
2717 <    }
2718 <
2719 <    public void testRunAfterEither_exceptionalCompletion3() {
2720 <        for (ExecutionMode m : ExecutionMode.values())
2721 <        for (Integer v1 : new Integer[] { 1, null }) {
2722 <
2750 >        for (boolean fFirst : new boolean[] { true, false })
2751 >        for (Integer v1 : new Integer[] { 1, null })
2752 >    {
2753          final CompletableFuture<Integer> f = new CompletableFuture<>();
2754          final CompletableFuture<Integer> g = new CompletableFuture<>();
2725        final Noop r = new Noop();
2755          final CFException ex = new CFException();
2756 +        final Noop[] rs = new Noop[6];
2757 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2758  
2759 <        g.completeExceptionally(ex);
2760 <        f.complete(v1);
2761 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2759 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2760 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2761 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2762 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2763 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2764 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2765  
2766 <        // unspecified behavior
2733 <        Integer v;
2766 >        // unspecified behavior - both source completions available
2767          try {
2768 <            assertNull(h.join());
2769 <            assertEquals(1, r.invocationCount);
2768 >            assertEquals(null, h0.join());
2769 >            rs[0].assertInvoked();
2770          } catch (CompletionException ok) {
2771 <            checkCompletedWithWrappedCFException(h, ex);
2772 <            assertEquals(0, r.invocationCount);
2740 <        }
2741 <
2742 <        checkCompletedWithWrappedCFException(g, ex);
2743 <        checkCompletedNormally(f, v1);
2771 >            checkCompletedWithWrappedException(h0, ex);
2772 >            rs[0].assertNotInvoked();
2773          }
2745    }
2746
2747    public void testRunAfterEither_exceptionalCompletion4() {
2748        for (ExecutionMode m : ExecutionMode.values())
2749        for (Integer v1 : new Integer[] { 1, null }) {
2750
2751        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752        final CompletableFuture<Integer> g = new CompletableFuture<>();
2753        final Noop r = new Noop();
2754        final CFException ex = new CFException();
2755
2756        f.completeExceptionally(ex);
2757        g.complete(v1);
2758        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2759
2760        // unspecified behavior
2761        Integer v;
2774          try {
2775 <            assertNull(h.join());
2776 <            assertEquals(1, r.invocationCount);
2775 >            assertEquals(null, h1.join());
2776 >            rs[1].assertInvoked();
2777          } catch (CompletionException ok) {
2778 <            checkCompletedWithWrappedCFException(h, ex);
2779 <            assertEquals(0, r.invocationCount);
2778 >            checkCompletedWithWrappedException(h1, ex);
2779 >            rs[1].assertNotInvoked();
2780          }
2781 <
2782 <        checkCompletedWithWrappedCFException(f, ex);
2783 <        checkCompletedNormally(g, v1);
2781 >        try {
2782 >            assertEquals(null, h2.join());
2783 >            rs[2].assertInvoked();
2784 >        } catch (CompletionException ok) {
2785 >            checkCompletedWithWrappedException(h2, ex);
2786 >            rs[2].assertNotInvoked();
2787          }
2788 <    }
2789 <
2790 <    /**
2791 <     * runAfterEither result completes exceptionally if action does
2792 <     */
2793 <    public void testRunAfterEither_actionFailed1() {
2779 <        for (ExecutionMode m : ExecutionMode.values())
2780 <        for (Integer v1 : new Integer[] { 1, null })
2781 <        for (Integer v2 : new Integer[] { 2, null }) {
2782 <
2783 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2784 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2785 <        final FailingNoop r = new FailingNoop();
2786 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2787 <
2788 <        f.complete(v1);
2789 <        checkCompletedWithWrappedCFException(h);
2790 <        g.complete(v2);
2791 <        checkCompletedNormally(f, v1);
2792 <        checkCompletedNormally(g, v2);
2788 >        try {
2789 >            assertEquals(null, h3.join());
2790 >            rs[3].assertInvoked();
2791 >        } catch (CompletionException ok) {
2792 >            checkCompletedWithWrappedException(h3, ex);
2793 >            rs[3].assertNotInvoked();
2794          }
2794    }
2795
2796    public void testRunAfterEither_actionFailed2() {
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();
2804        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2795  
2806        g.complete(v2);
2807        checkCompletedWithWrappedCFException(h);
2808        f.complete(v1);
2796          checkCompletedNormally(f, v1);
2797 <        checkCompletedNormally(g, v2);
2798 <        }
2812 <    }
2797 >        checkCompletedExceptionally(g, ex);
2798 >    }}
2799  
2800      /**
2801       * runAfterEither result completes exceptionally if either source cancelled
2802       */
2803 <    public void testRunAfterEither_sourceCancelled1() {
2818 <        for (ExecutionMode m : ExecutionMode.values())
2819 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2820 <        for (Integer v1 : new Integer[] { 1, null }) {
2821 <
2822 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2823 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2824 <        final Noop r = new Noop();
2825 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2826 <
2827 <        assertTrue(f.cancel(mayInterruptIfRunning));
2828 <        checkCompletedWithWrappedCancellationException(h);
2829 <        g.complete(v1);
2830 <
2831 <        checkCancelled(f);
2832 <        assertEquals(0, r.invocationCount);
2833 <        checkCompletedNormally(g, v1);
2834 <        checkCompletedWithWrappedCancellationException(h);
2835 <        }
2836 <    }
2837 <
2838 <    public void testRunAfterEither_sourceCancelled2() {
2803 >    public void testRunAfterEither_sourceCancelled() {
2804          for (ExecutionMode m : ExecutionMode.values())
2805          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2806 <        for (Integer v1 : new Integer[] { 1, null }) {
2807 <
2843 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2844 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2845 <        final Noop r = new Noop();
2846 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2847 <
2848 <        assertTrue(g.cancel(mayInterruptIfRunning));
2849 <        checkCompletedWithWrappedCancellationException(h);
2850 <        f.complete(v1);
2851 <
2852 <        checkCancelled(g);
2853 <        assertEquals(0, r.invocationCount);
2854 <        checkCompletedNormally(f, v1);
2855 <        checkCompletedWithWrappedCancellationException(h);
2856 <        }
2857 <    }
2858 <
2859 <    public void testRunAfterEither_sourceCancelled3() {
2860 <        for (ExecutionMode m : ExecutionMode.values())
2861 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2862 <        for (Integer v1 : new Integer[] { 1, null }) {
2863 <
2806 >        for (Integer v1 : new Integer[] { 1, null })
2807 >    {
2808          final CompletableFuture<Integer> f = new CompletableFuture<>();
2809          final CompletableFuture<Integer> g = new CompletableFuture<>();
2810 <        final Noop r = new Noop();
2811 <
2868 <        assertTrue(g.cancel(mayInterruptIfRunning));
2869 <        f.complete(v1);
2870 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2810 >        final Noop[] rs = new Noop[6];
2811 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2812  
2813 <        // unspecified behavior
2814 <        Integer v;
2813 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2814 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2815 >        checkIncomplete(h0);
2816 >        checkIncomplete(h1);
2817 >        rs[0].assertNotInvoked();
2818 >        rs[1].assertNotInvoked();
2819 >        f.cancel(mayInterruptIfRunning);
2820 >        checkCompletedWithWrappedCancellationException(h0);
2821 >        checkCompletedWithWrappedCancellationException(h1);
2822 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2823 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2824 >        checkCompletedWithWrappedCancellationException(h2);
2825 >        checkCompletedWithWrappedCancellationException(h3);
2826 >
2827 >        assertTrue(g.complete(v1));
2828 >
2829 >        // unspecified behavior - both source completions available
2830 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2831 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2832          try {
2833 <            assertNull(h.join());
2834 <            assertEquals(1, r.invocationCount);
2833 >            assertNull(h4.join());
2834 >            rs[4].assertInvoked();
2835          } catch (CompletionException ok) {
2836 <            checkCompletedWithWrappedCancellationException(h);
2837 <            assertEquals(0, r.invocationCount);
2880 <        }
2881 <
2882 <        checkCancelled(g);
2883 <        checkCompletedNormally(f, v1);
2836 >            checkCompletedWithWrappedCancellationException(h4);
2837 >            rs[4].assertNotInvoked();
2838          }
2885    }
2886
2887    public void testRunAfterEither_sourceCancelled4() {
2888        for (ExecutionMode m : ExecutionMode.values())
2889        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2890        for (Integer v1 : new Integer[] { 1, null }) {
2891
2892        final CompletableFuture<Integer> f = new CompletableFuture<>();
2893        final CompletableFuture<Integer> g = new CompletableFuture<>();
2894        final Noop r = new Noop();
2895
2896        assertTrue(f.cancel(mayInterruptIfRunning));
2897        g.complete(v1);
2898        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2899
2900        // unspecified behavior
2901        Integer v;
2839          try {
2840 <            assertNull(h.join());
2841 <            assertEquals(1, r.invocationCount);
2840 >            assertNull(h5.join());
2841 >            rs[5].assertInvoked();
2842          } catch (CompletionException ok) {
2843 <            checkCompletedWithWrappedCancellationException(h);
2844 <            assertEquals(0, r.invocationCount);
2843 >            checkCompletedWithWrappedCancellationException(h5);
2844 >            rs[5].assertNotInvoked();
2845          }
2846  
2847          checkCancelled(f);
2848          checkCompletedNormally(g, v1);
2849 <        }
2850 <    }
2849 >        checkCompletedWithWrappedCancellationException(h0);
2850 >        checkCompletedWithWrappedCancellationException(h1);
2851 >        checkCompletedWithWrappedCancellationException(h2);
2852 >        checkCompletedWithWrappedCancellationException(h3);
2853 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2854 >    }}
2855  
2856      /**
2857 <     * thenCompose result completes normally after normal completion of source
2857 >     * runAfterEither result completes exceptionally if action does
2858       */
2859 <    public void testThenCompose_normalCompletion1() {
2859 >    public void testRunAfterEither_actionFailed() {
2860          for (ExecutionMode m : ExecutionMode.values())
2861 <        for (Integer v1 : new Integer[] { 1, null }) {
2862 <
2861 >        for (Integer v1 : new Integer[] { 1, null })
2862 >        for (Integer v2 : new Integer[] { 2, null })
2863 >    {
2864          final CompletableFuture<Integer> f = new CompletableFuture<>();
2865 <        final CompletableFutureInc r = new CompletableFutureInc();
2866 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2867 <        f.complete(v1);
2868 <        checkCompletedNormally(g, inc(v1));
2865 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2866 >        final FailingRunnable[] rs = new FailingRunnable[6];
2867 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2868 >
2869 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2870 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2871 >        assertTrue(f.complete(v1));
2872 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2873 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2874 >        checkCompletedWithWrappedCFException(h0);
2875 >        checkCompletedWithWrappedCFException(h1);
2876 >        checkCompletedWithWrappedCFException(h2);
2877 >        checkCompletedWithWrappedCFException(h3);
2878 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2879 >        assertTrue(g.complete(v2));
2880 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2881 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2882 >        checkCompletedWithWrappedCFException(h4);
2883 >        checkCompletedWithWrappedCFException(h5);
2884 >
2885          checkCompletedNormally(f, v1);
2886 <        assertEquals(1, r.invocationCount);
2887 <        }
2888 <    }
2886 >        checkCompletedNormally(g, v2);
2887 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2888 >    }}
2889  
2890 <    public void testThenCompose_normalCompletion2() {
2890 >    /**
2891 >     * thenCompose result completes normally after normal completion of source
2892 >     */
2893 >    public void testThenCompose_normalCompletion() {
2894          for (ExecutionMode m : ExecutionMode.values())
2895 <        for (Integer v1 : new Integer[] { 1, null }) {
2896 <
2895 >        for (boolean createIncomplete : new boolean[] { true, false })
2896 >        for (Integer v1 : new Integer[] { 1, null })
2897 >    {
2898          final CompletableFuture<Integer> f = new CompletableFuture<>();
2899 <        final CompletableFutureInc r = new CompletableFutureInc();
2900 <        f.complete(v1);
2901 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2899 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2900 >        if (!createIncomplete) assertTrue(f.complete(v1));
2901 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2902 >        if (createIncomplete) assertTrue(f.complete(v1));
2903 >
2904          checkCompletedNormally(g, inc(v1));
2905          checkCompletedNormally(f, v1);
2906 <        assertEquals(1, r.invocationCount);
2907 <        }
2944 <    }
2906 >        r.assertValue(v1);
2907 >    }}
2908  
2909      /**
2910       * thenCompose result completes exceptionally after exceptional
2911       * completion of source
2912       */
2913 <    public void testThenCompose_exceptionalCompletion1() {
2914 <        for (ExecutionMode m : ExecutionMode.values()) {
2915 <
2913 >    public void testThenCompose_exceptionalCompletion() {
2914 >        for (ExecutionMode m : ExecutionMode.values())
2915 >        for (boolean createIncomplete : new boolean[] { true, false })
2916 >    {
2917          final CFException ex = new CFException();
2918 <        final CompletableFutureInc r = new CompletableFutureInc();
2918 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2919          final CompletableFuture<Integer> f = new CompletableFuture<>();
2920 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2921 <        f.completeExceptionally(ex);
2922 <        checkCompletedWithWrappedCFException(g, ex);
2959 <        checkCompletedWithWrappedCFException(f, ex);
2960 <        }
2961 <    }
2962 <
2963 <    public void testThenCompose_exceptionalCompletion2() {
2964 <        for (ExecutionMode m : ExecutionMode.values()) {
2920 >        if (!createIncomplete) f.completeExceptionally(ex);
2921 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2922 >        if (createIncomplete) f.completeExceptionally(ex);
2923  
2924 <        final CFException ex = new CFException();
2925 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2926 <        f.completeExceptionally(ex);
2927 <        final CompletableFutureInc r = new CompletableFutureInc();
2970 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2971 <        checkCompletedWithWrappedCFException(g, ex);
2972 <        checkCompletedWithWrappedCFException(f, ex);
2973 <        }
2974 <    }
2924 >        checkCompletedWithWrappedException(g, ex);
2925 >        checkCompletedExceptionally(f, ex);
2926 >        r.assertNotInvoked();
2927 >    }}
2928  
2929      /**
2930       * thenCompose result completes exceptionally if action does
2931       */
2932 <    public void testThenCompose_actionFailed1() {
2932 >    public void testThenCompose_actionFailed() {
2933          for (ExecutionMode m : ExecutionMode.values())
2934 <        for (Integer v1 : new Integer[] { 1, null }) {
2935 <
2934 >        for (boolean createIncomplete : new boolean[] { true, false })
2935 >        for (Integer v1 : new Integer[] { 1, null })
2936 >    {
2937          final CompletableFuture<Integer> f = new CompletableFuture<>();
2938          final FailingCompletableFutureFunction r
2939 <            = new FailingCompletableFutureFunction();
2940 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2941 <        f.complete(v1);
2942 <        checkCompletedWithWrappedCFException(g);
2989 <        checkCompletedNormally(f, v1);
2990 <        }
2991 <    }
2992 <
2993 <    public void testThenCompose_actionFailed2() {
2994 <        for (ExecutionMode m : ExecutionMode.values())
2995 <        for (Integer v1 : new Integer[] { 1, null }) {
2939 >            = new FailingCompletableFutureFunction(m);
2940 >        if (!createIncomplete) assertTrue(f.complete(v1));
2941 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2942 >        if (createIncomplete) assertTrue(f.complete(v1));
2943  
2997        final CompletableFuture<Integer> f = new CompletableFuture<>();
2998        f.complete(v1);
2999        final FailingCompletableFutureFunction r
3000            = new FailingCompletableFutureFunction();
3001        final CompletableFuture<Integer> g = f.thenCompose(r);
2944          checkCompletedWithWrappedCFException(g);
2945          checkCompletedNormally(f, v1);
2946 <        }
3005 <    }
2946 >    }}
2947  
2948      /**
2949       * thenCompose result completes exceptionally if source cancelled
2950       */
2951 <    public void testThenCompose_sourceCancelled1() {
2951 >    public void testThenCompose_sourceCancelled() {
2952          for (ExecutionMode m : ExecutionMode.values())
2953 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2954 <
2953 >        for (boolean createIncomplete : new boolean[] { true, false })
2954 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2955 >    {
2956          final CompletableFuture<Integer> f = new CompletableFuture<>();
2957 <        final CompletableFutureInc r = new CompletableFutureInc();
2958 <        final CompletableFuture<Integer> g = f.thenCompose(r);
2959 <        assertTrue(f.cancel(mayInterruptIfRunning));
2960 <        checkCompletedWithWrappedCancellationException(g);
2961 <        checkCancelled(f);
2957 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2958 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2959 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2960 >        if (createIncomplete) {
2961 >            checkIncomplete(g);
2962 >            assertTrue(f.cancel(mayInterruptIfRunning));
2963          }
3021    }
3022
3023    public void testThenCompose_sourceCancelled2() {
3024        for (ExecutionMode m : ExecutionMode.values())
3025        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2964  
3027        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028        assertTrue(f.cancel(mayInterruptIfRunning));
3029        final CompletableFutureInc r = new CompletableFutureInc();
3030        final CompletableFuture<Integer> g = f.thenCompose(r);
2965          checkCompletedWithWrappedCancellationException(g);
2966          checkCancelled(f);
2967 <        }
3034 <    }
3035 <
3036 <    // asyncs
3037 <
3038 <    /**
3039 <     * thenRunAsync result completes normally after normal completion of source
3040 <     */
3041 <    public void testThenRunAsync() {
3042 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3043 <        Noop r = new Noop();
3044 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3045 <        f.complete(null);
3046 <        checkCompletedNormally(g, null);
3047 <
3048 <        // reordered version
3049 <        f = new CompletableFuture<>();
3050 <        f.complete(null);
3051 <        r = new Noop();
3052 <        g = f.thenRunAsync(r);
3053 <        checkCompletedNormally(g, null);
3054 <    }
3055 <
3056 <    /**
3057 <     * thenRunAsync result completes exceptionally after exceptional
3058 <     * completion of source
3059 <     */
3060 <    public void testThenRunAsync2() {
3061 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3062 <        Noop r = new Noop();
3063 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3064 <        f.completeExceptionally(new CFException());
3065 <        try {
3066 <            g.join();
3067 <            shouldThrow();
3068 <        } catch (CompletionException success) {}
3069 <        checkCompletedWithWrappedCFException(g);
3070 <    }
3071 <
3072 <    /**
3073 <     * thenRunAsync result completes exceptionally if action does
3074 <     */
3075 <    public void testThenRunAsync3() {
3076 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3077 <        FailingNoop r = new FailingNoop();
3078 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3079 <        f.complete(null);
3080 <        checkCompletedWithWrappedCFException(g);
3081 <    }
3082 <
3083 <    /**
3084 <     * thenRunAsync result completes exceptionally if source cancelled
3085 <     */
3086 <    public void testThenRunAsync4() {
3087 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3088 <        Noop r = new Noop();
3089 <        CompletableFuture<Void> g = f.thenRunAsync(r);
3090 <        assertTrue(f.cancel(true));
3091 <        checkCompletedWithWrappedCancellationException(g);
3092 <    }
3093 <
3094 <    /**
3095 <     * thenApplyAsync result completes normally after normal completion of source
3096 <     */
3097 <    public void testThenApplyAsync() {
3098 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3099 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3100 <        f.complete(one);
3101 <        checkCompletedNormally(g, two);
3102 <    }
3103 <
3104 <    /**
3105 <     * thenApplyAsync result completes exceptionally after exceptional
3106 <     * completion of source
3107 <     */
3108 <    public void testThenApplyAsync2() {
3109 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3110 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3111 <        f.completeExceptionally(new CFException());
3112 <        checkCompletedWithWrappedCFException(g);
3113 <    }
3114 <
3115 <    /**
3116 <     * thenApplyAsync result completes exceptionally if action does
3117 <     */
3118 <    public void testThenApplyAsync3() {
3119 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3120 <        FailingFunction r = new FailingFunction();
3121 <        CompletableFuture<Integer> g = f.thenApplyAsync(r);
3122 <        f.complete(null);
3123 <        checkCompletedWithWrappedCFException(g);
3124 <    }
3125 <
3126 <    /**
3127 <     * thenApplyAsync result completes exceptionally if source cancelled
3128 <     */
3129 <    public void testThenApplyAsync4() {
3130 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3131 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
3132 <        assertTrue(f.cancel(true));
3133 <        checkCompletedWithWrappedCancellationException(g);
3134 <    }
3135 <
3136 <    /**
3137 <     * thenAcceptAsync result completes normally after normal
3138 <     * completion of source
3139 <     */
3140 <    public void testThenAcceptAsync() {
3141 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3142 <        IncAction r = new IncAction();
3143 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3144 <        f.complete(one);
3145 <        checkCompletedNormally(g, null);
3146 <        assertEquals(r.value, (Integer) 2);
3147 <    }
3148 <
3149 <    /**
3150 <     * thenAcceptAsync result completes exceptionally after exceptional
3151 <     * completion of source
3152 <     */
3153 <    public void testThenAcceptAsync2() {
3154 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3155 <        IncAction r = new IncAction();
3156 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3157 <        f.completeExceptionally(new CFException());
3158 <        checkCompletedWithWrappedCFException(g);
3159 <    }
3160 <
3161 <    /**
3162 <     * thenAcceptAsync result completes exceptionally if action does
3163 <     */
3164 <    public void testThenAcceptAsync3() {
3165 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3166 <        FailingConsumer r = new FailingConsumer();
3167 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3168 <        f.complete(null);
3169 <        checkCompletedWithWrappedCFException(g);
3170 <    }
3171 <
3172 <    /**
3173 <     * thenAcceptAsync result completes exceptionally if source cancelled
3174 <     */
3175 <    public void testThenAcceptAsync4() {
3176 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3177 <        IncAction r = new IncAction();
3178 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
3179 <        assertTrue(f.cancel(true));
3180 <        checkCompletedWithWrappedCancellationException(g);
3181 <    }
3182 <
3183 <    // async with explicit executors
3184 <
3185 <    /**
3186 <     * thenRunAsync result completes normally after normal completion of source
3187 <     */
3188 <    public void testThenRunAsyncE() {
3189 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3190 <        Noop r = new Noop();
3191 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3192 <        f.complete(null);
3193 <        checkCompletedNormally(g, null);
3194 <
3195 <        // reordered version
3196 <        f = new CompletableFuture<>();
3197 <        f.complete(null);
3198 <        r = new Noop();
3199 <        g = f.thenRunAsync(r, new ThreadExecutor());
3200 <        checkCompletedNormally(g, null);
3201 <    }
3202 <
3203 <    /**
3204 <     * thenRunAsync result completes exceptionally after exceptional
3205 <     * completion of source
3206 <     */
3207 <    public void testThenRunAsync2E() {
3208 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3209 <        Noop r = new Noop();
3210 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3211 <        f.completeExceptionally(new CFException());
3212 <        try {
3213 <            g.join();
3214 <            shouldThrow();
3215 <        } catch (CompletionException success) {}
3216 <        checkCompletedWithWrappedCFException(g);
3217 <    }
3218 <
3219 <    /**
3220 <     * thenRunAsync result completes exceptionally if action does
3221 <     */
3222 <    public void testThenRunAsync3E() {
3223 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3224 <        FailingNoop r = new FailingNoop();
3225 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3226 <        f.complete(null);
3227 <        checkCompletedWithWrappedCFException(g);
3228 <    }
3229 <
3230 <    /**
3231 <     * thenRunAsync result completes exceptionally if source cancelled
3232 <     */
3233 <    public void testThenRunAsync4E() {
3234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3235 <        Noop r = new Noop();
3236 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
3237 <        assertTrue(f.cancel(true));
3238 <        checkCompletedWithWrappedCancellationException(g);
3239 <    }
3240 <
3241 <    /**
3242 <     * thenApplyAsync result completes normally after normal completion of source
3243 <     */
3244 <    public void testThenApplyAsyncE() {
3245 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3246 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3247 <        f.complete(one);
3248 <        checkCompletedNormally(g, two);
3249 <    }
3250 <
3251 <    /**
3252 <     * thenApplyAsync result completes exceptionally after exceptional
3253 <     * completion of source
3254 <     */
3255 <    public void testThenApplyAsync2E() {
3256 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3257 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3258 <        f.completeExceptionally(new CFException());
3259 <        checkCompletedWithWrappedCFException(g);
3260 <    }
3261 <
3262 <    /**
3263 <     * thenApplyAsync result completes exceptionally if action does
3264 <     */
3265 <    public void testThenApplyAsync3E() {
3266 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3267 <        FailingFunction r = new FailingFunction();
3268 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
3269 <        f.complete(null);
3270 <        checkCompletedWithWrappedCFException(g);
3271 <    }
3272 <
3273 <    /**
3274 <     * thenApplyAsync result completes exceptionally if source cancelled
3275 <     */
3276 <    public void testThenApplyAsync4E() {
3277 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3278 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
3279 <        assertTrue(f.cancel(true));
3280 <        checkCompletedWithWrappedCancellationException(g);
3281 <    }
3282 <
3283 <    /**
3284 <     * thenAcceptAsync result completes normally after normal
3285 <     * completion of source
3286 <     */
3287 <    public void testThenAcceptAsyncE() {
3288 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3289 <        IncAction r = new IncAction();
3290 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3291 <        f.complete(one);
3292 <        checkCompletedNormally(g, null);
3293 <        assertEquals(r.value, (Integer) 2);
3294 <    }
3295 <
3296 <    /**
3297 <     * thenAcceptAsync result completes exceptionally after exceptional
3298 <     * completion of source
3299 <     */
3300 <    public void testThenAcceptAsync2E() {
3301 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3302 <        IncAction r = new IncAction();
3303 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3304 <        f.completeExceptionally(new CFException());
3305 <        checkCompletedWithWrappedCFException(g);
3306 <    }
2967 >    }}
2968  
2969      /**
2970 <     * thenAcceptAsync result completes exceptionally if action does
2970 >     * thenCompose result completes exceptionally if the result of the action does
2971       */
2972 <    public void testThenAcceptAsync3E() {
2973 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2974 <        FailingConsumer r = new FailingConsumer();
2975 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
2976 <        f.complete(null);
2977 <        checkCompletedWithWrappedCFException(g);
2978 <    }
2972 >    public void testThenCompose_actionReturnsFailingFuture() {
2973 >        for (ExecutionMode m : ExecutionMode.values())
2974 >        for (int order = 0; order < 6; order++)
2975 >        for (Integer v1 : new Integer[] { 1, null })
2976 >    {
2977 >        final CFException ex = new CFException();
2978 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2979 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2980 >        final CompletableFuture<Integer> h;
2981 >        // Test all permutations of orders
2982 >        switch (order) {
2983 >        case 0:
2984 >            assertTrue(f.complete(v1));
2985 >            assertTrue(g.completeExceptionally(ex));
2986 >            h = m.thenCompose(f, (x -> g));
2987 >            break;
2988 >        case 1:
2989 >            assertTrue(f.complete(v1));
2990 >            h = m.thenCompose(f, (x -> g));
2991 >            assertTrue(g.completeExceptionally(ex));
2992 >            break;
2993 >        case 2:
2994 >            assertTrue(g.completeExceptionally(ex));
2995 >            assertTrue(f.complete(v1));
2996 >            h = m.thenCompose(f, (x -> g));
2997 >            break;
2998 >        case 3:
2999 >            assertTrue(g.completeExceptionally(ex));
3000 >            h = m.thenCompose(f, (x -> g));
3001 >            assertTrue(f.complete(v1));
3002 >            break;
3003 >        case 4:
3004 >            h = m.thenCompose(f, (x -> g));
3005 >            assertTrue(f.complete(v1));
3006 >            assertTrue(g.completeExceptionally(ex));
3007 >            break;
3008 >        case 5:
3009 >            h = m.thenCompose(f, (x -> g));
3010 >            assertTrue(f.complete(v1));
3011 >            assertTrue(g.completeExceptionally(ex));
3012 >            break;
3013 >        default: throw new AssertionError();
3014 >        }
3015  
3016 <    /**
3017 <     * thenAcceptAsync result completes exceptionally if source cancelled
3018 <     */
3019 <    public void testThenAcceptAsync4E() {
3323 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3324 <        IncAction r = new IncAction();
3325 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
3326 <        assertTrue(f.cancel(true));
3327 <        checkCompletedWithWrappedCancellationException(g);
3328 <    }
3016 >        checkCompletedExceptionally(g, ex);
3017 >        checkCompletedWithWrappedException(h, ex);
3018 >        checkCompletedNormally(f, v1);
3019 >    }}
3020  
3021      // other static methods
3022  
# Line 3343 | Line 3034 | public class CompletableFutureTest exten
3034       * when all components complete normally
3035       */
3036      public void testAllOf_normal() throws Exception {
3037 <        for (int k = 1; k < 20; ++k) {
3038 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3039 <            for (int i = 0; i < k; ++i)
3037 >        for (int k = 1; k < 10; k++) {
3038 >            CompletableFuture<Integer>[] fs
3039 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3040 >            for (int i = 0; i < k; i++)
3041 >                fs[i] = new CompletableFuture<>();
3042 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3043 >            for (int i = 0; i < k; i++) {
3044 >                checkIncomplete(f);
3045 >                checkIncomplete(CompletableFuture.allOf(fs));
3046 >                fs[i].complete(one);
3047 >            }
3048 >            checkCompletedNormally(f, null);
3049 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3050 >        }
3051 >    }
3052 >
3053 >    public void testAllOf_backwards() throws Exception {
3054 >        for (int k = 1; k < 10; k++) {
3055 >            CompletableFuture<Integer>[] fs
3056 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3057 >            for (int i = 0; i < k; i++)
3058                  fs[i] = new CompletableFuture<>();
3059              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3060 <            for (int i = 0; i < k; ++i) {
3060 >            for (int i = k - 1; i >= 0; i--) {
3061                  checkIncomplete(f);
3062                  checkIncomplete(CompletableFuture.allOf(fs));
3063                  fs[i].complete(one);
# Line 3358 | Line 3067 | public class CompletableFutureTest exten
3067          }
3068      }
3069  
3070 +    public void testAllOf_exceptional() throws Exception {
3071 +        for (int k = 1; k < 10; k++) {
3072 +            CompletableFuture<Integer>[] fs
3073 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3074 +            CFException ex = new CFException();
3075 +            for (int i = 0; i < k; i++)
3076 +                fs[i] = new CompletableFuture<>();
3077 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3078 +            for (int i = 0; i < k; i++) {
3079 +                checkIncomplete(f);
3080 +                checkIncomplete(CompletableFuture.allOf(fs));
3081 +                if (i != k / 2) {
3082 +                    fs[i].complete(i);
3083 +                    checkCompletedNormally(fs[i], i);
3084 +                } else {
3085 +                    fs[i].completeExceptionally(ex);
3086 +                    checkCompletedExceptionally(fs[i], ex);
3087 +                }
3088 +            }
3089 +            checkCompletedWithWrappedException(f, ex);
3090 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3091 +        }
3092 +    }
3093 +
3094      /**
3095       * anyOf(no component futures) returns an incomplete future
3096       */
3097      public void testAnyOf_empty() throws Exception {
3098 +        for (Integer v1 : new Integer[] { 1, null })
3099 +    {
3100          CompletableFuture<Object> f = CompletableFuture.anyOf();
3101          checkIncomplete(f);
3102 <    }
3102 >
3103 >        f.complete(v1);
3104 >        checkCompletedNormally(f, v1);
3105 >    }}
3106  
3107      /**
3108       * anyOf returns a future completed normally with a value when
3109       * a component future does
3110       */
3111      public void testAnyOf_normal() throws Exception {
3112 <        for (int k = 0; k < 10; ++k) {
3112 >        for (int k = 0; k < 10; k++) {
3113              CompletableFuture[] fs = new CompletableFuture[k];
3114 <            for (int i = 0; i < k; ++i)
3114 >            for (int i = 0; i < k; i++)
3115                  fs[i] = new CompletableFuture<>();
3116              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3117              checkIncomplete(f);
3118 <            for (int i = 0; i < k; ++i) {
3119 <                fs[i].complete(one);
3120 <                checkCompletedNormally(f, one);
3121 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3118 >            for (int i = 0; i < k; i++) {
3119 >                fs[i].complete(i);
3120 >                checkCompletedNormally(f, 0);
3121 >                int x = (int) CompletableFuture.anyOf(fs).join();
3122 >                assertTrue(0 <= x && x <= i);
3123 >            }
3124 >        }
3125 >    }
3126 >    public void testAnyOf_normal_backwards() throws Exception {
3127 >        for (int k = 0; k < 10; k++) {
3128 >            CompletableFuture[] fs = new CompletableFuture[k];
3129 >            for (int i = 0; i < k; i++)
3130 >                fs[i] = new CompletableFuture<>();
3131 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3132 >            checkIncomplete(f);
3133 >            for (int i = k - 1; i >= 0; i--) {
3134 >                fs[i].complete(i);
3135 >                checkCompletedNormally(f, k - 1);
3136 >                int x = (int) CompletableFuture.anyOf(fs).join();
3137 >                assertTrue(i <= x && x <= k - 1);
3138              }
3139          }
3140      }
# Line 3389 | Line 3143 | public class CompletableFutureTest exten
3143       * anyOf result completes exceptionally when any component does.
3144       */
3145      public void testAnyOf_exceptional() throws Exception {
3146 <        for (int k = 0; k < 10; ++k) {
3146 >        for (int k = 0; k < 10; k++) {
3147              CompletableFuture[] fs = new CompletableFuture[k];
3148 <            for (int i = 0; i < k; ++i)
3148 >            CFException[] exs = new CFException[k];
3149 >            for (int i = 0; i < k; i++) {
3150                  fs[i] = new CompletableFuture<>();
3151 +                exs[i] = new CFException();
3152 +            }
3153              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3154              checkIncomplete(f);
3155 <            for (int i = 0; i < k; ++i) {
3156 <                fs[i].completeExceptionally(new CFException());
3157 <                checkCompletedWithWrappedCFException(f);
3155 >            for (int i = 0; i < k; i++) {
3156 >                fs[i].completeExceptionally(exs[i]);
3157 >                checkCompletedWithWrappedException(f, exs[0]);
3158 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3159 >            }
3160 >        }
3161 >    }
3162 >
3163 >    public void testAnyOf_exceptional_backwards() throws Exception {
3164 >        for (int k = 0; k < 10; k++) {
3165 >            CompletableFuture[] fs = new CompletableFuture[k];
3166 >            CFException[] exs = new CFException[k];
3167 >            for (int i = 0; i < k; i++) {
3168 >                fs[i] = new CompletableFuture<>();
3169 >                exs[i] = new CFException();
3170 >            }
3171 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3172 >            checkIncomplete(f);
3173 >            for (int i = k - 1; i >= 0; i--) {
3174 >                fs[i].completeExceptionally(exs[i]);
3175 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3176                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3177              }
3178          }
# Line 3410 | Line 3185 | public class CompletableFutureTest exten
3185          CompletableFuture<Integer> f = new CompletableFuture<>();
3186          CompletableFuture<Integer> g = new CompletableFuture<>();
3187          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3413        CompletableFuture<?> h;
3188          ThreadExecutor exec = new ThreadExecutor();
3189  
3190          Runnable[] throwingActions = {
3191              () -> CompletableFuture.supplyAsync(null),
3192              () -> CompletableFuture.supplyAsync(null, exec),
3193 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
3193 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3194  
3195              () -> CompletableFuture.runAsync(null),
3196              () -> CompletableFuture.runAsync(null, exec),
# Line 3489 | Line 3263 | public class CompletableFutureTest exten
3263  
3264              () -> f.thenCompose(null),
3265              () -> f.thenComposeAsync(null),
3266 <            () -> f.thenComposeAsync(new CompletableFutureInc(), null),
3266 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
3267              () -> f.thenComposeAsync(null, exec),
3268  
3269              () -> f.exceptionally(null),
# Line 3507 | Line 3281 | public class CompletableFutureTest exten
3281              () -> CompletableFuture.anyOf(null, f),
3282  
3283              () -> f.obtrudeException(null),
3284 +
3285 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3286 +            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3287 +            () -> CompletableFuture.delayedExecutor(1L, null),
3288 +
3289 +            () -> f.orTimeout(1L, null),
3290 +            () -> f.completeOnTimeout(42, 1L, null),
3291 +
3292 +            () -> CompletableFuture.failedFuture(null),
3293 +            () -> CompletableFuture.failedStage(null),
3294          };
3295  
3296          assertThrows(NullPointerException.class, throwingActions);
# Line 3521 | Line 3305 | public class CompletableFutureTest exten
3305          assertSame(f, f.toCompletableFuture());
3306      }
3307  
3308 +    // jdk9
3309 +
3310      /**
3311 <     * whenComplete action executes on normal completion, propagating
3526 <     * source result.
3311 >     * newIncompleteFuture returns an incomplete CompletableFuture
3312       */
3313 <    public void testWhenComplete_normalCompletion1() {
3529 <        for (ExecutionMode m : ExecutionMode.values())
3530 <        for (boolean createIncomplete : new boolean[] { true, false })
3313 >    public void testNewIncompleteFuture() {
3314          for (Integer v1 : new Integer[] { 1, null })
3315      {
3316 <        final AtomicInteger a = new AtomicInteger(0);
3317 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3318 <        if (!createIncomplete) f.complete(v1);
3319 <        final CompletableFuture<Integer> g = m.whenComplete
3320 <            (f,
3538 <             (Integer x, Throwable t) -> {
3539 <                threadAssertSame(x, v1);
3540 <                threadAssertNull(t);
3541 <                a.getAndIncrement();
3542 <            });
3543 <        if (createIncomplete) f.complete(v1);
3544 <
3545 <        checkCompletedNormally(g, v1);
3316 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3317 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3318 >        checkIncomplete(f);
3319 >        checkIncomplete(g);
3320 >        f.complete(v1);
3321          checkCompletedNormally(f, v1);
3322 <        assertEquals(1, a.get());
3322 >        checkIncomplete(g);
3323 >        g.complete(v1);
3324 >        checkCompletedNormally(g, v1);
3325 >        assertSame(g.getClass(), CompletableFuture.class);
3326      }}
3327  
3328      /**
3329 <     * whenComplete action executes on exceptional completion, propagating
3552 <     * source result.
3329 >     * completedStage returns a completed CompletionStage
3330       */
3331 <    public void testWhenComplete_exceptionalCompletion() {
3332 <        for (ExecutionMode m : ExecutionMode.values())
3333 <        for (boolean createIncomplete : new boolean[] { true, false })
3331 >    public void testCompletedStage() {
3332 >        AtomicInteger x = new AtomicInteger(0);
3333 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3334 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3335 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3336 >        assertEquals(x.get(), 1);
3337 >        assertNull(r.get());
3338 >    }
3339 >
3340 >    /**
3341 >     * defaultExecutor by default returns the commonPool if
3342 >     * it supports more than one thread.
3343 >     */
3344 >    public void testDefaultExecutor() {
3345 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3346 >        Executor e = f.defaultExecutor();
3347 >        Executor c = ForkJoinPool.commonPool();
3348 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3349 >            assertSame(e, c);
3350 >        else
3351 >            assertNotSame(e, c);
3352 >    }
3353 >
3354 >    /**
3355 >     * failedFuture returns a CompletableFuture completed
3356 >     * exceptionally with the given Exception
3357 >     */
3358 >    public void testFailedFuture() {
3359 >        CFException ex = new CFException();
3360 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3361 >        checkCompletedExceptionally(f, ex);
3362 >    }
3363 >
3364 >    /**
3365 >     * failedFuture(null) throws NPE
3366 >     */
3367 >    public void testFailedFuture_null() {
3368 >        try {
3369 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3370 >            shouldThrow();
3371 >        } catch (NullPointerException success) {}
3372 >    }
3373 >
3374 >    /**
3375 >     * copy returns a CompletableFuture that is completed normally,
3376 >     * with the same value, when source is.
3377 >     */
3378 >    public void testCopy() {
3379 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3380 >        CompletableFuture<Integer> g = f.copy();
3381 >        checkIncomplete(f);
3382 >        checkIncomplete(g);
3383 >        f.complete(1);
3384 >        checkCompletedNormally(f, 1);
3385 >        checkCompletedNormally(g, 1);
3386 >    }
3387 >
3388 >    /**
3389 >     * copy returns a CompletableFuture that is completed exceptionally
3390 >     * when source is.
3391 >     */
3392 >    public void testCopy2() {
3393 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3394 >        CompletableFuture<Integer> g = f.copy();
3395 >        checkIncomplete(f);
3396 >        checkIncomplete(g);
3397 >        CFException ex = new CFException();
3398 >        f.completeExceptionally(ex);
3399 >        checkCompletedExceptionally(f, ex);
3400 >        checkCompletedWithWrappedException(g, ex);
3401 >    }
3402 >
3403 >    /**
3404 >     * minimalCompletionStage returns a CompletableFuture that is
3405 >     * completed normally, with the same value, when source is.
3406 >     */
3407 >    public void testMinimalCompletionStage() {
3408 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3409 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3410 >        AtomicInteger x = new AtomicInteger(0);
3411 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3412 >        checkIncomplete(f);
3413 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3414 >        f.complete(1);
3415 >        checkCompletedNormally(f, 1);
3416 >        assertEquals(x.get(), 1);
3417 >        assertNull(r.get());
3418 >    }
3419 >
3420 >    /**
3421 >     * minimalCompletionStage returns a CompletableFuture that is
3422 >     * completed exceptionally when source is.
3423 >     */
3424 >    public void testMinimalCompletionStage2() {
3425 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3426 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3427 >        AtomicInteger x = new AtomicInteger(0);
3428 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3429 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3430 >        checkIncomplete(f);
3431 >        CFException ex = new CFException();
3432 >        f.completeExceptionally(ex);
3433 >        checkCompletedExceptionally(f, ex);
3434 >        assertEquals(x.get(), 0);
3435 >        assertEquals(r.get().getCause(), ex);
3436 >    }
3437 >
3438 >    /**
3439 >     * failedStage returns a CompletionStage completed
3440 >     * exceptionally with the given Exception
3441 >     */
3442 >    public void testFailedStage() {
3443 >        CFException ex = new CFException();
3444 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3445 >        AtomicInteger x = new AtomicInteger(0);
3446 >        AtomicReference<Throwable> r = new AtomicReference<Throwable>();
3447 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3448 >        assertEquals(x.get(), 0);
3449 >        assertEquals(r.get(), ex);
3450 >    }
3451 >
3452 >    /**
3453 >     * completeAsync completes with value of given supplier
3454 >     */
3455 >    public void testCompleteAsync() {
3456          for (Integer v1 : new Integer[] { 1, null })
3457      {
3458 <        final AtomicInteger a = new AtomicInteger(0);
3459 <        final CFException ex = new CFException();
3460 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3461 <        if (!createIncomplete) f.completeExceptionally(ex);
3563 <        final CompletableFuture<Integer> g = m.whenComplete
3564 <            (f,
3565 <             (Integer x, Throwable t) -> {
3566 <                threadAssertNull(x);
3567 <                threadAssertSame(t, ex);
3568 <                a.getAndIncrement();
3569 <            });
3570 <        if (createIncomplete) f.completeExceptionally(ex);
3571 <        checkCompletedWithWrappedCFException(f, ex);
3572 <        checkCompletedWithWrappedCFException(g, ex);
3573 <        assertEquals(1, a.get());
3458 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3459 >        f.completeAsync(() -> v1);
3460 >        f.join();
3461 >        checkCompletedNormally(f, v1);
3462      }}
3463  
3464      /**
3465 <     * whenComplete action executes on cancelled source, propagating
3578 <     * CancellationException.
3465 >     * completeAsync completes exceptionally if given supplier throws
3466       */
3467 <    public void testWhenComplete_sourceCancelled() {
3468 <        for (ExecutionMode m : ExecutionMode.values())
3469 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3470 <        for (boolean createIncomplete : new boolean[] { true, false })
3471 <    {
3472 <        final AtomicInteger a = new AtomicInteger(0);
3473 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3474 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3475 <        final CompletableFuture<Integer> g = m.whenComplete
3476 <            (f,
3590 <             (Integer x, Throwable t) -> {
3591 <                threadAssertNull(x);
3592 <                threadAssertTrue(t instanceof CancellationException);
3593 <                a.getAndIncrement();
3594 <            });
3595 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3467 >    public void testCompleteAsync2() {
3468 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3469 >        CFException ex = new CFException();
3470 >        f.completeAsync(() -> {if (true) throw ex; return 1;});
3471 >        try {
3472 >            f.join();
3473 >            shouldThrow();
3474 >        } catch (CompletionException success) {}
3475 >        checkCompletedWithWrappedException(f, ex);
3476 >    }
3477  
3478 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3479 <        checkCompletedWithWrappedCancellationException(g);
3480 <        checkCancelled(f);
3481 <        assertEquals(1, a.get());
3478 >    /**
3479 >     * completeAsync with given executor completes with value of given supplier
3480 >     */
3481 >    public void testCompleteAsync3() {
3482 >        for (Integer v1 : new Integer[] { 1, null })
3483 >    {
3484 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3485 >        ThreadExecutor executor = new ThreadExecutor();
3486 >        f.completeAsync(() -> v1, executor);
3487 >        assertSame(v1, f.join());
3488 >        checkCompletedNormally(f, v1);
3489 >        assertEquals(1, executor.count.get());
3490      }}
3491  
3492      /**
3493 <     * If a whenComplete action throws an exception when triggered by
3494 <     * a normal completion, it completes exceptionally
3493 >     * completeAsync with given executor completes exceptionally if
3494 >     * given supplier throws
3495       */
3496 <    public void testWhenComplete_actionFailed() {
3497 <        for (boolean createIncomplete : new boolean[] { true, false })
3498 <        for (ExecutionMode m : ExecutionMode.values())
3499 <        for (Integer v1 : new Integer[] { 1, null }) {
3496 >    public void testCompleteAsync4() {
3497 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3498 >        CFException ex = new CFException();
3499 >        ThreadExecutor executor = new ThreadExecutor();
3500 >        f.completeAsync(() -> {if (true) throw ex; return 1;}, executor);
3501 >        try {
3502 >            f.join();
3503 >            shouldThrow();
3504 >        } catch (CompletionException success) {}
3505 >        checkCompletedWithWrappedException(f, ex);
3506 >        assertEquals(1, executor.count.get());
3507 >    }
3508  
3509 <        final AtomicInteger a = new AtomicInteger(0);
3510 <        final CFException ex = new CFException();
3511 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3512 <        if (!createIncomplete) f.complete(v1);
3513 <        final CompletableFuture<Integer> g = m.whenComplete
3514 <            (f,
3515 <             (Integer x, Throwable t) -> {
3516 <                threadAssertSame(x, v1);
3517 <                threadAssertNull(t);
3518 <                a.getAndIncrement();
3519 <                throw ex;
3520 <            });
3521 <        if (createIncomplete) f.complete(v1);
3509 >    /**
3510 >     * orTimeout completes with TimeoutException if not complete
3511 >     */
3512 >    public void testOrTimeout_timesOut() {
3513 >        long timeoutMillis = timeoutMillis();
3514 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3515 >        long startTime = System.nanoTime();
3516 >        f.orTimeout(timeoutMillis, MILLISECONDS);
3517 >        checkCompletedWithTimeoutException(f);
3518 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3519 >    }
3520 >
3521 >    /**
3522 >     * orTimeout completes normally if completed before timeout
3523 >     */
3524 >    public void testOrTimeout_completed() {
3525 >        for (Integer v1 : new Integer[] { 1, null })
3526 >    {
3527 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3528 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3529 >        long startTime = System.nanoTime();
3530 >        f.complete(v1);
3531 >        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3532 >        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3533 >        g.complete(v1);
3534          checkCompletedNormally(f, v1);
3535 <        checkCompletedWithWrappedCFException(g, ex);
3536 <        assertEquals(1, a.get());
3537 <        }
3535 >        checkCompletedNormally(g, v1);
3536 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3537 >    }}
3538 >
3539 >    /**
3540 >     * completeOnTimeout completes with given value if not complete
3541 >     */
3542 >    public void testCompleteOnTimeout_timesOut() {
3543 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3544 >                       () -> testCompleteOnTimeout_timesOut(null));
3545 >    }
3546 >
3547 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3548 >        long timeoutMillis = timeoutMillis();
3549 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3550 >        long startTime = System.nanoTime();
3551 >        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3552 >        assertSame(v, f.join());
3553 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3554 >        f.complete(99);         // should have no effect
3555 >        checkCompletedNormally(f, v);
3556      }
3557  
3558      /**
3559 <     * If a whenComplete action throws an exception when triggered by
3633 <     * a source completion that also throws an exception, the source
3634 <     * exception takes precedence.
3559 >     * completeOnTimeout has no effect if completed within timeout
3560       */
3561 <    public void testWhenComplete_actionFailedSourceFailed() {
3562 <        for (boolean createIncomplete : new boolean[] { true, false })
3561 >    public void testCompleteOnTimeout_completed() {
3562 >        for (Integer v1 : new Integer[] { 1, null })
3563 >    {
3564 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3565 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3566 >        long startTime = System.nanoTime();
3567 >        f.complete(v1);
3568 >        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3569 >        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3570 >        g.complete(v1);
3571 >        checkCompletedNormally(f, v1);
3572 >        checkCompletedNormally(g, v1);
3573 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3574 >    }}
3575 >
3576 >    /**
3577 >     * delayedExecutor returns an executor that delays submission
3578 >     */
3579 >    public void testDelayedExecutor() {
3580 >        testInParallel(() -> testDelayedExecutor(null, null),
3581 >                       () -> testDelayedExecutor(null, 1),
3582 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3583 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3584 >    }
3585 >
3586 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3587 >        long timeoutMillis = timeoutMillis();
3588 >        // Use an "unreasonably long" long timeout to catch lingering threads
3589 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3590 >        final Executor delayer, longDelayer;
3591 >        if (executor == null) {
3592 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3593 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3594 >        } else {
3595 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3596 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3597 >        }
3598 >        long startTime = System.nanoTime();
3599 >        CompletableFuture<Integer> f =
3600 >            CompletableFuture.supplyAsync(() -> v, delayer);
3601 >        CompletableFuture<Integer> g =
3602 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3603 >
3604 >        assertNull(g.getNow(null));
3605 >
3606 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3607 >        long millisElapsed = millisElapsedSince(startTime);
3608 >        assertTrue(millisElapsed >= timeoutMillis);
3609 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3610 >
3611 >        checkCompletedNormally(f, v);
3612 >
3613 >        checkIncomplete(g);
3614 >        assertTrue(g.cancel(true));
3615 >    }
3616 >
3617 >    //--- tests of implementation details; not part of official tck ---
3618 >
3619 >    Object resultOf(CompletableFuture<?> f) {
3620 >        try {
3621 >            java.lang.reflect.Field resultField
3622 >                = CompletableFuture.class.getDeclaredField("result");
3623 >            resultField.setAccessible(true);
3624 >            return resultField.get(f);
3625 >        } catch (Throwable t) { throw new AssertionError(t); }
3626 >    }
3627 >
3628 >    public void testExceptionPropagationReusesResultObject() {
3629 >        if (!testImplementationDetails) return;
3630          for (ExecutionMode m : ExecutionMode.values())
3631 <        for (Integer v1 : new Integer[] { 1, null }) {
3631 >    {
3632 >        final CFException ex = new CFException();
3633 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3634 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3635  
3636 <        final AtomicInteger a = new AtomicInteger(0);
3637 <        final CFException ex1 = new CFException();
3643 <        final CFException ex2 = new CFException();
3644 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3636 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3637 >            = new ArrayList<>();
3638  
3639 <        if (!createIncomplete) f.completeExceptionally(ex1);
3640 <        final CompletableFuture<Integer> g = m.whenComplete
3641 <            (f,
3649 <             (Integer x, Throwable t) -> {
3650 <                threadAssertSame(t, ex1);
3651 <                threadAssertNull(x);
3652 <                a.getAndIncrement();
3653 <                throw ex2;
3654 <            });
3655 <        if (createIncomplete) f.completeExceptionally(ex1);
3639 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3640 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3641 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3642  
3643 <        checkCompletedWithWrappedCFException(f, ex1);
3644 <        checkCompletedWithWrappedCFException(g, ex1);
3645 <        assertEquals(1, a.get());
3643 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3644 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3645 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3646 >
3647 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3648 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3649 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3650 >
3651 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3652 >
3653 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3654 >
3655 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3656 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3657 >
3658 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3659 >                 fun : funs) {
3660 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3661 >            f.completeExceptionally(ex);
3662 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3663 >            checkCompletedWithWrappedException(src, ex);
3664 >            CompletableFuture<?> dep = fun.apply(src);
3665 >            checkCompletedWithWrappedException(dep, ex);
3666 >            assertSame(resultOf(src), resultOf(dep));
3667          }
3668 <    }
3668 >
3669 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3670 >                 fun : funs) {
3671 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3672 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3673 >            CompletableFuture<?> dep = fun.apply(src);
3674 >            f.completeExceptionally(ex);
3675 >            checkCompletedWithWrappedException(src, ex);
3676 >            checkCompletedWithWrappedException(dep, ex);
3677 >            assertSame(resultOf(src), resultOf(dep));
3678 >        }
3679 >
3680 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3681 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3682 >                 fun : funs) {
3683 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3684 >            f.cancel(mayInterruptIfRunning);
3685 >            checkCancelled(f);
3686 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3687 >            checkCompletedWithWrappedCancellationException(src);
3688 >            CompletableFuture<?> dep = fun.apply(src);
3689 >            checkCompletedWithWrappedCancellationException(dep);
3690 >            assertSame(resultOf(src), resultOf(dep));
3691 >        }
3692 >
3693 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3694 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3695 >                 fun : funs) {
3696 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3697 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3698 >            CompletableFuture<?> dep = fun.apply(src);
3699 >            f.cancel(mayInterruptIfRunning);
3700 >            checkCancelled(f);
3701 >            checkCompletedWithWrappedCancellationException(src);
3702 >            checkCompletedWithWrappedCancellationException(dep);
3703 >            assertSame(resultOf(src), resultOf(dep));
3704 >        }
3705 >    }}
3706 >
3707 >    /**
3708 >     * Minimal completion stages throw UOE for all non-CompletionStage methods
3709 >     */
3710 >    public void testMinimalCompletionStage_minimality() {
3711 >        if (!testImplementationDetails) return;
3712 >        Function<Method, String> toSignature =
3713 >            (method) -> method.getName() + Arrays.toString(method.getParameterTypes());
3714 >        Predicate<Method> isNotStatic =
3715 >            (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
3716 >        List<Method> minimalMethods =
3717 >            Stream.of(Object.class, CompletionStage.class)
3718 >            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
3719 >            .filter(isNotStatic)
3720 >            .collect(Collectors.toList());
3721 >        // Methods from CompletableFuture permitted NOT to throw UOE
3722 >        String[] signatureWhitelist = {
3723 >            "newIncompleteFuture[]",
3724 >            "defaultExecutor[]",
3725 >            "minimalCompletionStage[]",
3726 >            "copy[]",
3727 >        };
3728 >        Set<String> permittedMethodSignatures =
3729 >            Stream.concat(minimalMethods.stream().map(toSignature),
3730 >                          Stream.of(signatureWhitelist))
3731 >            .collect(Collectors.toSet());
3732 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
3733 >            .filter(isNotStatic)
3734 >            .filter((method) -> !permittedMethodSignatures.contains(toSignature.apply(method)))
3735 >            .collect(Collectors.toList());
3736 >
3737 >        CompletionStage<Integer> minimalStage =
3738 >            new CompletableFuture<Integer>().minimalCompletionStage();
3739 >
3740 >        List<Method> bugs = new ArrayList<>();
3741 >        for (Method method : allMethods) {
3742 >            Class<?>[] parameterTypes = method.getParameterTypes();
3743 >            Object[] args = new Object[parameterTypes.length];
3744 >            // Manufacture boxed primitives for primitive params
3745 >            for (int i = 0; i < args.length; i++) {
3746 >                Class<?> type = parameterTypes[i];
3747 >                if (parameterTypes[i] == boolean.class)
3748 >                    args[i] = false;
3749 >                else if (parameterTypes[i] == int.class)
3750 >                    args[i] = 0;
3751 >                else if (parameterTypes[i] == long.class)
3752 >                    args[i] = 0L;
3753 >            }
3754 >            try {
3755 >                method.invoke(minimalStage, args);
3756 >                bugs.add(method);
3757 >            }
3758 >            catch (java.lang.reflect.InvocationTargetException expected) {
3759 >                if (! (expected.getCause() instanceof UnsupportedOperationException)) {
3760 >                    bugs.add(method);
3761 >                    // expected.getCause().printStackTrace();
3762 >                }
3763 >            }
3764 >            catch (ReflectiveOperationException bad) { throw new Error(bad); }
3765 >        }
3766 >        if (!bugs.isEmpty())
3767 >            throw new Error("Methods did not throw UOE: " + bugs.toString());
3768 >    }
3769 >
3770 >    static class Monad {
3771 >        static class ZeroException extends RuntimeException {
3772 >            public ZeroException() { super("monadic zero"); }
3773 >        }
3774 >        // "return", "unit"
3775 >        static <T> CompletableFuture<T> unit(T value) {
3776 >            return completedFuture(value);
3777 >        }
3778 >        // monadic zero ?
3779 >        static <T> CompletableFuture<T> zero() {
3780 >            return failedFuture(new ZeroException());
3781 >        }
3782 >        // >=>
3783 >        static <T,U,V> Function<T, CompletableFuture<V>> compose
3784 >            (Function<T, CompletableFuture<U>> f,
3785 >             Function<U, CompletableFuture<V>> g) {
3786 >            return (x) -> f.apply(x).thenCompose(g);
3787 >        }
3788 >
3789 >        static void assertZero(CompletableFuture<?> f) {
3790 >            try {
3791 >                f.getNow(null);
3792 >                throw new AssertionFailedError("should throw");
3793 >            } catch (CompletionException success) {
3794 >                assertTrue(success.getCause() instanceof ZeroException);
3795 >            }
3796 >        }
3797 >
3798 >        static <T> void assertFutureEquals(CompletableFuture<T> f,
3799 >                                           CompletableFuture<T> g) {
3800 >            T fval = null, gval = null;
3801 >            Throwable fex = null, gex = null;
3802 >
3803 >            try { fval = f.get(); }
3804 >            catch (ExecutionException ex) { fex = ex.getCause(); }
3805 >            catch (Throwable ex) { fex = ex; }
3806 >
3807 >            try { gval = g.get(); }
3808 >            catch (ExecutionException ex) { gex = ex.getCause(); }
3809 >            catch (Throwable ex) { gex = ex; }
3810 >
3811 >            if (fex != null || gex != null)
3812 >                assertSame(fex.getClass(), gex.getClass());
3813 >            else
3814 >                assertEquals(fval, gval);
3815 >        }
3816 >
3817 >        static class PlusFuture<T> extends CompletableFuture<T> {
3818 >            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3819 >        }
3820 >
3821 >        // Monadic "plus"
3822 >        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3823 >                                             CompletableFuture<? extends T> g) {
3824 >            PlusFuture<T> plus = new PlusFuture<T>();
3825 >            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3826 >                if (ex == null) {
3827 >                    if (plus.complete(result))
3828 >                        if (plus.firstFailure.get() != null)
3829 >                            plus.firstFailure.set(null);
3830 >                }
3831 >                else if (plus.firstFailure.compareAndSet(null, ex)) {
3832 >                    if (plus.isDone())
3833 >                        plus.firstFailure.set(null);
3834 >                }
3835 >                else {
3836 >                    // first failure has precedence
3837 >                    Throwable first = plus.firstFailure.getAndSet(null);
3838 >
3839 >                    // may fail with "Self-suppression not permitted"
3840 >                    try { first.addSuppressed(ex); }
3841 >                    catch (Exception ignored) {}
3842 >
3843 >                    plus.completeExceptionally(first);
3844 >                }
3845 >            };
3846 >            f.whenComplete(action);
3847 >            g.whenComplete(action);
3848 >            return plus;
3849 >        }
3850 >    }
3851 >
3852 >    /**
3853 >     * CompletableFuture is an additive monad - sort of.
3854 >     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
3855 >     */
3856 >    public void testAdditiveMonad() throws Throwable {
3857 >        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
3858 >        CompletableFuture<Long> zero = Monad.zero();
3859 >
3860 >        // Some mutually non-commutative functions
3861 >        Function<Long, CompletableFuture<Long>> triple
3862 >            = (x) -> Monad.unit(3 * x);
3863 >        Function<Long, CompletableFuture<Long>> inc
3864 >            = (x) -> Monad.unit(x + 1);
3865 >
3866 >        // unit is a right identity: m >>= unit === m
3867 >        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
3868 >                                 inc.apply(5L));
3869 >        // unit is a left identity: (unit x) >>= f === f x
3870 >        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
3871 >                                 inc.apply(5L));
3872 >
3873 >        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
3874 >        Monad.assertFutureEquals(
3875 >            unit.apply(5L).thenCompose(inc).thenCompose(triple),
3876 >            unit.apply(5L).thenCompose((x) -> inc.apply(x).thenCompose(triple)));
3877 >
3878 >        // The case for CompletableFuture as an additive monad is weaker...
3879 >
3880 >        // zero is a monadic zero
3881 >        Monad.assertZero(zero);
3882 >
3883 >        // left zero: zero >>= f === zero
3884 >        Monad.assertZero(zero.thenCompose(inc));
3885 >        // right zero: f >>= (\x -> zero) === zero
3886 >        Monad.assertZero(inc.apply(5L).thenCompose((x) -> zero));
3887 >
3888 >        // f plus zero === f
3889 >        Monad.assertFutureEquals(Monad.unit(5L),
3890 >                                 Monad.plus(Monad.unit(5L), zero));
3891 >        // zero plus f === f
3892 >        Monad.assertFutureEquals(Monad.unit(5L),
3893 >                                 Monad.plus(zero, Monad.unit(5L)));
3894 >        // zero plus zero === zero
3895 >        Monad.assertZero(Monad.plus(zero, zero));
3896 >        {
3897 >            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
3898 >                                                   Monad.unit(8L));
3899 >            // non-determinism
3900 >            assertTrue(f.get() == 5L || f.get() == 8L);
3901 >        }
3902 >
3903 >        CompletableFuture<Long> godot = new CompletableFuture<>();
3904 >        // f plus godot === f (doesn't wait for godot)
3905 >        Monad.assertFutureEquals(Monad.unit(5L),
3906 >                                 Monad.plus(Monad.unit(5L), godot));
3907 >        // godot plus f === f (doesn't wait for godot)
3908 >        Monad.assertFutureEquals(Monad.unit(5L),
3909 >                                 Monad.plus(godot, Monad.unit(5L)));
3910 >    }
3911 >
3912 > //     static <U> U join(CompletionStage<U> stage) {
3913 > //         CompletableFuture<U> f = new CompletableFuture<>();
3914 > //         stage.whenComplete((v, ex) -> {
3915 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3916 > //         });
3917 > //         return f.join();
3918 > //     }
3919 >
3920 > //     static <U> boolean isDone(CompletionStage<U> stage) {
3921 > //         CompletableFuture<U> f = new CompletableFuture<>();
3922 > //         stage.whenComplete((v, ex) -> {
3923 > //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
3924 > //         });
3925 > //         return f.isDone();
3926 > //     }
3927 >
3928 > //     static <U> U join2(CompletionStage<U> stage) {
3929 > //         return stage.toCompletableFuture().copy().join();
3930 > //     }
3931 >
3932 > //     static <U> boolean isDone2(CompletionStage<U> stage) {
3933 > //         return stage.toCompletableFuture().copy().isDone();
3934 > //     }
3935  
3936   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines