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.51 by jsr166, Mon Jun 2 19:49:28 2014 UTC vs.
Revision 1.216 by jsr166, Wed Nov 21 23:25:17 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines