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.42 by jsr166, Mon Jun 2 02:19:23 2014 UTC vs.
Revision 1.125 by jsr166, Thu Sep 10 17:59:13 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines