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.35 by jsr166, Sun Jun 1 22:22:49 2014 UTC vs.
Revision 1.148 by jsr166, Sun Jun 26 15:46:22 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines