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.61 by jsr166, Wed Jun 4 04:34:49 2014 UTC vs.
Revision 1.210 by jsr166, Mon Sep 24 00:20:46 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());
269 <        checkCompletedWithWrappedCFException(f);
283 >        for (Integer v1 : new Integer[] { 1, null })
284 >    {
285 >        CFException ex;
286 >        CompletableFuture<Integer> f;
287 >
288          f = new CompletableFuture<>();
289 <        f.obtrudeException(new CFException());
290 <        checkCompletedWithWrappedCFException(f);
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 >        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(ExecutionMode.DEFAULT));
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(ExecutionMode.DEFAULT));
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 <    static final class IntegerSupplier implements Supplier<Integer> {
324 <        final ExecutionMode m;
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 +    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 <            this.m = m;
410 >            super(m);
411              this.value = value;
412          }
413          public Integer get() {
414 <            m.checkExecutionMode();
333 <            invocationCount++;
414 >            invoked();
415              return value;
416          }
417      }
# Line 340 | Line 421 | public class CompletableFutureTest exten
421          return (x == null) ? null : x + 1;
422      }
423  
424 <    static final class IncAction implements Consumer<Integer> {
425 <        int invocationCount = 0;
426 <        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 <        final ExecutionMode m;
435 <        int invocationCount = 0;
436 <        Integer value;
437 <        IncFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
358 <            invocationCount++;
439 >            invoked();
440              return value = inc(x);
441          }
442      }
# Line 368 | Line 449 | public class CompletableFutureTest exten
449              - ((y == null) ? 99 : y.intValue());
450      }
451  
452 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
453 <        final ExecutionMode m;
454 <        int invocationCount = 0;
455 <        Integer value;
375 <        // Check this action was invoked exactly once when result is computed.
376 <        SubtractAction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
379 <            invocationCount++;
457 >            invoked();
458              value = subtract(x, y);
459          }
460      }
461 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
462 <        final ExecutionMode m;
463 <        int invocationCount = 0;
464 <        Integer value;
465 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
391 <            invocationCount++;
467 >            invoked();
468              return value = subtract(x, y);
469          }
470      }
471  
472 <    static final class Noop implements Runnable {
473 <        final ExecutionMode m;
398 <        int invocationCount = 0;
399 <        Noop(ExecutionMode m) { this.m = m; }
472 >    static class Noop extends CheckedAction implements Runnable {
473 >        Noop(ExecutionMode m) { super(m); }
474          public void run() {
475 <            m.checkExecutionMode();
402 <            invocationCount++;
475 >            invoked();
476          }
477      }
478  
479 <    static final class FailingSupplier implements Supplier<Integer> {
480 <        final ExecutionMode m;
481 <        int invocationCount = 0;
482 <        FailingSupplier(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
486 <            invocationCount++;
413 <            throw new CFException();
485 >            invoked();
486 >            throw ex;
487          }
488      }
489 <    static final class FailingConsumer implements Consumer<Integer> {
490 <        final ExecutionMode m;
491 <        int invocationCount = 0;
492 <        FailingConsumer(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
497 <            invocationCount++;
498 <            throw new CFException();
496 >            invoked();
497 >            value = x;
498 >            throw ex;
499          }
500      }
501 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
502 <        final ExecutionMode m;
503 <        int invocationCount = 0;
504 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
509 <            invocationCount++;
510 <            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 <        final ExecutionMode m;
515 <        int invocationCount = 0;
516 <        FailingFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
521 <            invocationCount++;
522 <            throw new CFException();
520 >            invoked();
521 >            value = x;
522 >            throw ex;
523          }
524      }
525 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
526 <        final ExecutionMode m;
527 <        int invocationCount = 0;
528 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
533 <            invocationCount++;
534 <            throw new CFException();
532 >            invoked();
533 >            value = subtract(x, y);
534 >            throw ex;
535          }
536      }
537 <    static final class FailingRunnable implements Runnable {
538 <        final ExecutionMode m;
539 <        int invocationCount = 0;
540 <        FailingRunnable(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
543 <            invocationCount++;
463 <            throw new CFException();
542 >            invoked();
543 >            throw ex;
544          }
545      }
546  
547 <    static final class CompletableFutureInc
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        final ExecutionMode m;
550 <        int invocationCount = 0;
471 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
553 <            invocationCount++;
554 <            CompletableFuture<Integer> f = new CompletableFuture<>();
476 <            f.complete(inc(x));
477 <            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 <        final ExecutionMode m;
561 <        int invocationCount = 0;
562 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
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 <            m.checkExecutionMode();
586 <            invocationCount++;
587 <            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  
# Line 504 | Line 611 | public class CompletableFutureTest exten
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 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());
# Line 581 | 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          },
585
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);
# Line 655 | 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 {
# Line 728 | 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();
# Line 770 | 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 777 | 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      {
783        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();
790 <                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);
796        assertEquals(0, a.get());
940      }}
941  
799
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 809 | 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) -> {
957 <                ExecutionMode.DEFAULT.checkExecutionMode();
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 822 | 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) -> {
1122 <                ExecutionMode.DEFAULT.checkExecutionMode();
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 855 | 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) -> {
1154 >             (Integer result, Throwable t) -> {
1155                  m.checkExecutionMode();
1156 <                threadAssertSame(x, v1);
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 887 | 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) -> {
1183 >             (Integer result, Throwable t) -> {
1184                  m.checkExecutionMode();
1185 <                threadAssertNull(x);
1185 >                threadAssertNull(result);
1186                  threadAssertSame(t, ex);
1187                  a.getAndIncrement();
1188                  return v1;
# Line 897 | 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 916 | 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) -> {
1212 >             (Integer result, Throwable t) -> {
1213                  m.checkExecutionMode();
1214 <                threadAssertNull(x);
1214 >                threadAssertNull(result);
1215                  threadAssertTrue(t instanceof CancellationException);
1216                  a.getAndIncrement();
1217                  return v1;
# Line 931 | 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();
944 <        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) -> {
1241 >             (Integer result, Throwable t) -> {
1242                  m.checkExecutionMode();
1243 <                threadAssertNull(x);
1244 <                threadAssertSame(ex1, t);
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      {
966        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) -> {
1272 >             (Integer result, Throwable t) -> {
1273                  m.checkExecutionMode();
1274 <                threadAssertSame(x, v1);
1275 <                threadAssertNull(t);
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  
# Line 997 | Line 1297 | public class CompletableFutureTest exten
1297          final CompletableFuture<Void> f = m.runAsync(r);
1298          assertNull(f.join());
1299          checkCompletedNormally(f, null);
1300 <        assertEquals(1, r.invocationCount);
1300 >        r.assertInvoked();
1301      }}
1302  
1303      /**
# Line 1012 | Line 1312 | public class CompletableFutureTest exten
1312      {
1313          final FailingRunnable r = new FailingRunnable(m);
1314          final CompletableFuture<Void> f = m.runAsync(r);
1315 <        checkCompletedWithWrappedCFException(f);
1316 <        assertEquals(1, r.invocationCount);
1315 >        checkCompletedWithWrappedException(f, r.ex);
1316 >        r.assertInvoked();
1317      }}
1318  
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 completes with result of supplier
1334       */
# Line 1031 | Line 1344 | public class CompletableFutureTest exten
1344          final CompletableFuture<Integer> f = m.supplyAsync(r);
1345          assertSame(v1, f.join());
1346          checkCompletedNormally(f, v1);
1347 <        assertEquals(1, r.invocationCount);
1347 >        r.assertInvoked();
1348      }}
1349  
1350      /**
# Line 1046 | Line 1359 | public class CompletableFutureTest exten
1359      {
1360          FailingSupplier r = new FailingSupplier(m);
1361          CompletableFuture<Integer> f = m.supplyAsync(r);
1362 <        checkCompletedWithWrappedCFException(f);
1363 <        assertEquals(1, r.invocationCount);
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
1380  
1381      /**
# Line 1057 | Line 1383 | public class CompletableFutureTest exten
1383       */
1384      public void testThenRun_normalCompletion() {
1385          for (ExecutionMode m : ExecutionMode.values())
1060        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(m);
1390 <        if (!createIncomplete) f.complete(v1);
1066 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1067 <        if (createIncomplete) {
1068 <            checkIncomplete(g);
1069 <            f.complete(v1);
1070 <        }
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 1080 | Line 1416 | public class CompletableFutureTest exten
1416       */
1417      public void testThenRun_exceptionalCompletion() {
1418          for (ExecutionMode m : ExecutionMode.values())
1083        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(m);
1423 <        if (!createIncomplete) f.completeExceptionally(ex);
1089 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1090 <        if (createIncomplete) {
1091 <            checkIncomplete(g);
1092 <            f.completeExceptionally(ex);
1093 <        }
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 1102 | Line 1448 | public class CompletableFutureTest exten
1448       */
1449      public void testThenRun_sourceCancelled() {
1450          for (ExecutionMode m : ExecutionMode.values())
1105        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(m);
1455 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1111 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1112 <        if (createIncomplete) {
1113 <            checkIncomplete(g);
1114 <            assertTrue(f.cancel(mayInterruptIfRunning));
1115 <        }
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 1124 | Line 1480 | public class CompletableFutureTest exten
1480       */
1481      public void testThenRun_actionFailed() {
1482          for (ExecutionMode m : ExecutionMode.values())
1127        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(m);
1487 <        if (!createIncomplete) f.complete(v1);
1133 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1134 <        if (createIncomplete) {
1135 <            checkIncomplete(g);
1136 <            f.complete(v1);
1137 <        }
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 1145 | Line 1508 | public class CompletableFutureTest exten
1508       */
1509      public void testThenApply_normalCompletion() {
1510          for (ExecutionMode m : ExecutionMode.values())
1148        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(m);
1515 <        if (!createIncomplete) f.complete(v1);
1154 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1155 <        if (createIncomplete) {
1156 <            checkIncomplete(g);
1157 <            f.complete(v1);
1158 <        }
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 1168 | Line 1536 | public class CompletableFutureTest exten
1536       */
1537      public void testThenApply_exceptionalCompletion() {
1538          for (ExecutionMode m : ExecutionMode.values())
1171        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(m);
1543 <        if (!createIncomplete) f.completeExceptionally(ex);
1177 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1178 <        if (createIncomplete) {
1179 <            checkIncomplete(g);
1180 <            f.completeExceptionally(ex);
1181 <        }
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 1190 | Line 1561 | public class CompletableFutureTest exten
1561       */
1562      public void testThenApply_sourceCancelled() {
1563          for (ExecutionMode m : ExecutionMode.values())
1193        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(m);
1568 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1199 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1200 <        if (createIncomplete) {
1201 <            checkIncomplete(g);
1202 <            assertTrue(f.cancel(mayInterruptIfRunning));
1203 <        }
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 1212 | Line 1586 | public class CompletableFutureTest exten
1586       */
1587      public void testThenApply_actionFailed() {
1588          for (ExecutionMode m : ExecutionMode.values())
1215        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(m);
1593 <        if (!createIncomplete) f.complete(v1);
1221 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1222 <        if (createIncomplete) {
1223 <            checkIncomplete(g);
1224 <            f.complete(v1);
1225 <        }
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 1233 | Line 1610 | public class CompletableFutureTest exten
1610       */
1611      public void testThenAccept_normalCompletion() {
1612          for (ExecutionMode m : ExecutionMode.values())
1236        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);
1242 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1243 <        if (createIncomplete) {
1244 <            checkIncomplete(g);
1245 <            f.complete(v1);
1246 <        }
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);
1251 <        assertEquals(inc(v1), r.value);
1632 >        for (NoopConsumer r : rs) r.assertValue(v1);
1633      }}
1634  
1635      /**
# Line 1257 | Line 1638 | public class CompletableFutureTest exten
1638       */
1639      public void testThenAccept_exceptionalCompletion() {
1640          for (ExecutionMode m : ExecutionMode.values())
1260        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);
1266 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1267 <        if (createIncomplete) {
1268 <            checkIncomplete(g);
1269 <            f.completeExceptionally(ex);
1270 <        }
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      /**
# Line 1279 | Line 1663 | public class CompletableFutureTest exten
1663       */
1664      public void testThenAccept_sourceCancelled() {
1665          for (ExecutionMode m : ExecutionMode.values())
1282        for (boolean createIncomplete : new boolean[] { true, false })
1666          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1667      {
1668          final CompletableFuture<Integer> f = new CompletableFuture<>();
1669 <        final IncAction r = new IncAction();
1670 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1288 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1289 <        if (createIncomplete) {
1290 <            checkIncomplete(g);
1291 <            assertTrue(f.cancel(mayInterruptIfRunning));
1292 <        }
1669 >        final NoopConsumer[] rs = new NoopConsumer[4];
1670 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1671  
1672 <        checkCompletedWithWrappedCancellationException(g);
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 <        assertEquals(0, r.invocationCount);
1683 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1684      }}
1685  
1686      /**
# Line 1301 | Line 1688 | public class CompletableFutureTest exten
1688       */
1689      public void testThenAccept_actionFailed() {
1690          for (ExecutionMode m : ExecutionMode.values())
1304        for (boolean createIncomplete : new boolean[] { true, false })
1691          for (Integer v1 : new Integer[] { 1, null })
1692      {
1693          final CompletableFuture<Integer> f = new CompletableFuture<>();
1694 <        final FailingConsumer r = new FailingConsumer(m);
1695 <        if (!createIncomplete) f.complete(v1);
1310 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1311 <        if (createIncomplete) {
1312 <            checkIncomplete(g);
1313 <            f.complete(v1);
1314 <        }
1694 >        final FailingConsumer[] rs = new FailingConsumer[4];
1695 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1696  
1697 <        checkCompletedWithWrappedCFException(g);
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  
# Line 1323 | Line 1713 | public class CompletableFutureTest exten
1713       */
1714      public void testThenCombine_normalCompletion() {
1715          for (ExecutionMode m : ExecutionMode.values())
1326        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(m);
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  
1345        checkCompletedNormally(h, subtract(v1, v2));
1751          checkCompletedNormally(f, v1);
1752          checkCompletedNormally(g, v2);
1348        assertEquals(1, r.invocationCount);
1753      }}
1754  
1755      /**
1756       * thenCombine result completes exceptionally after exceptional
1757       * completion of either source
1758       */
1759 <    public void testThenCombine_exceptionalCompletion() {
1759 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1760          for (ExecutionMode m : ExecutionMode.values())
1357        for (boolean createIncomplete : new boolean[] { true, false })
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<>();
1767          final CFException ex = new CFException();
1768 <        final SubtractFunction r = new SubtractFunction(m);
1769 <
1770 <        (fFirst ? f : g).complete(v1);
1771 <        if (!createIncomplete)
1772 <            (!fFirst ? f : g).completeExceptionally(ex);
1773 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1774 <        if (createIncomplete) {
1775 <            checkIncomplete(h);
1776 <            (!fFirst ? f : g).completeExceptionally(ex);
1777 <        }
1778 <
1779 <        checkCompletedWithWrappedCFException(h, ex);
1780 <        assertEquals(0, r.invocationCount);
1781 <        checkCompletedNormally(fFirst ? f : g, v1);
1782 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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      /**
1800       * thenCombine result completes exceptionally if either source cancelled
1801       */
1802 <    public void testThenCombine_sourceCancelled() {
1802 >    public void testThenCombine_sourceCancelled() throws Throwable {
1803          for (ExecutionMode m : ExecutionMode.values())
1804          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1387        for (boolean createIncomplete : 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(m);
1812 <
1813 <        (fFirst ? f : g).complete(v1);
1814 <        if (!createIncomplete)
1815 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1816 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1817 <        if (createIncomplete) {
1818 <            checkIncomplete(h);
1819 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1820 <        }
1821 <
1822 <        checkCompletedWithWrappedCancellationException(h);
1823 <        checkCancelled(!fFirst ? f : g);
1824 <        assertEquals(0, r.invocationCount);
1825 <        checkCompletedNormally(fFirst ? f : 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      /**
# Line 1418 | Line 1850 | public class CompletableFutureTest exten
1850      {
1851          final CompletableFuture<Integer> f = new CompletableFuture<>();
1852          final CompletableFuture<Integer> g = new CompletableFuture<>();
1853 <        final FailingBiFunction r = new FailingBiFunction(m);
1854 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1855 <
1856 <        if (fFirst) {
1857 <            f.complete(v1);
1858 <            g.complete(v2);
1859 <        } else {
1860 <            g.complete(v2);
1861 <            f.complete(v1);
1862 <        }
1863 <
1864 <        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      }}
# Line 1440 | Line 1881 | public class CompletableFutureTest exten
1881       */
1882      public void testThenAcceptBoth_normalCompletion() {
1883          for (ExecutionMode m : ExecutionMode.values())
1443        for (boolean createIncomplete : new boolean[] { true, false })
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(m);
1891 <
1892 <        if (fFirst) f.complete(v1); else g.complete(v2);
1893 <        if (!createIncomplete)
1894 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1895 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1896 <        if (createIncomplete) {
1897 <            checkIncomplete(h);
1898 <            assertEquals(0, r.invocationCount);
1899 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1900 <        }
1901 <
1902 <        checkCompletedNormally(h, null);
1903 <        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 1469 | Line 1920 | public class CompletableFutureTest exten
1920       * thenAcceptBoth result completes exceptionally after exceptional
1921       * completion of either source
1922       */
1923 <    public void testThenAcceptBoth_exceptionalCompletion() {
1923 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1924          for (ExecutionMode m : ExecutionMode.values())
1474        for (boolean createIncomplete : new boolean[] { true, false })
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<>();
1931          final CFException ex = new CFException();
1932 <        final SubtractAction r = new SubtractAction(m);
1933 <
1934 <        (fFirst ? f : g).complete(v1);
1935 <        if (!createIncomplete)
1936 <            (!fFirst ? f : g).completeExceptionally(ex);
1937 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1938 <        if (createIncomplete) {
1939 <            checkIncomplete(h);
1940 <            (!fFirst ? f : g).completeExceptionally(ex);
1941 <        }
1942 <
1943 <        checkCompletedWithWrappedCFException(h, ex);
1944 <        assertEquals(0, r.invocationCount);
1945 <        checkCompletedNormally(fFirst ? f : g, v1);
1946 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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      /**
1964       * thenAcceptBoth result completes exceptionally if either source cancelled
1965       */
1966 <    public void testThenAcceptBoth_sourceCancelled() {
1966 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1967          for (ExecutionMode m : ExecutionMode.values())
1968          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504        for (boolean createIncomplete : 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(m);
1976 <
1977 <        (fFirst ? f : g).complete(v1);
1978 <        if (!createIncomplete)
1979 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1980 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1981 <        if (createIncomplete) {
1982 <            checkIncomplete(h);
1983 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1984 <        }
1985 <
1986 <        checkCompletedWithWrappedCancellationException(h);
1987 <        checkCancelled(!fFirst ? f : g);
1988 <        assertEquals(0, r.invocationCount);
1989 <        checkCompletedNormally(fFirst ? f : 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      /**
# Line 1535 | Line 2014 | public class CompletableFutureTest exten
2014      {
2015          final CompletableFuture<Integer> f = new CompletableFuture<>();
2016          final CompletableFuture<Integer> g = new CompletableFuture<>();
2017 <        final FailingBiConsumer r = new FailingBiConsumer(m);
2018 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
2019 <
2020 <        if (fFirst) {
2021 <            f.complete(v1);
2022 <            g.complete(v2);
2023 <        } else {
2024 <            g.complete(v2);
2025 <            f.complete(v1);
2026 <        }
2027 <
2028 <        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      }}
# Line 1557 | Line 2045 | public class CompletableFutureTest exten
2045       */
2046      public void testRunAfterBoth_normalCompletion() {
2047          for (ExecutionMode m : ExecutionMode.values())
1560        for (boolean createIncomplete : new boolean[] { true, false })
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(m);
2055 <
2056 <        if (fFirst) f.complete(v1); else g.complete(v2);
2057 <        if (!createIncomplete)
2058 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2059 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2060 <        if (createIncomplete) {
2061 <            checkIncomplete(h);
2062 <            assertEquals(0, r.invocationCount);
2063 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2064 <        }
2065 <
2066 <        checkCompletedNormally(h, null);
2067 <        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 1586 | Line 2084 | public class CompletableFutureTest exten
2084       * runAfterBoth result completes exceptionally after exceptional
2085       * completion of either source
2086       */
2087 <    public void testRunAfterBoth_exceptionalCompletion() {
2087 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2088          for (ExecutionMode m : ExecutionMode.values())
1591        for (boolean createIncomplete : new boolean[] { true, false })
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<>();
2095          final CFException ex = new CFException();
2096 <        final Noop r = new Noop(m);
2097 <
2098 <        (fFirst ? f : g).complete(v1);
2099 <        if (!createIncomplete)
2100 <            (!fFirst ? f : g).completeExceptionally(ex);
2101 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2102 <        if (createIncomplete) {
2103 <            checkIncomplete(h);
2104 <            (!fFirst ? f : g).completeExceptionally(ex);
2105 <        }
2106 <
2107 <        checkCompletedWithWrappedCFException(h, ex);
2108 <        assertEquals(0, r.invocationCount);
2109 <        checkCompletedNormally(fFirst ? f : g, v1);
2110 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
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      /**
2128       * runAfterBoth result completes exceptionally if either source cancelled
2129       */
2130 <    public void testRunAfterBoth_sourceCancelled() {
2130 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2131          for (ExecutionMode m : ExecutionMode.values())
2132          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1621        for (boolean createIncomplete : 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(m);
2140 <
2141 <
2142 <        (fFirst ? f : g).complete(v1);
2143 <        if (!createIncomplete)
2144 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2145 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2146 <        if (createIncomplete) {
2147 <            checkIncomplete(h);
2148 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2149 <        }
2150 <
2151 <        checkCompletedWithWrappedCancellationException(h);
2152 <        checkCancelled(!fFirst ? f : g);
2153 <        assertEquals(0, r.invocationCount);
2154 <        checkCompletedNormally(fFirst ? f : 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      /**
# Line 1653 | Line 2178 | public class CompletableFutureTest exten
2178      {
2179          final CompletableFuture<Integer> f = new CompletableFuture<>();
2180          final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 <        final FailingRunnable r = new FailingRunnable(m);
2182 <
2183 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
2184 <        if (fFirst) {
2185 <            f.complete(v1);
2186 <            g.complete(v2);
2187 <        } else {
2188 <            g.complete(v2);
2189 <            f.complete(v1);
2190 <        }
2191 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
2192 <
2193 <        checkCompletedWithWrappedCFException(h1);
2194 <        checkCompletedWithWrappedCFException(h2);
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      }}
# Line 1677 | Line 2209 | public class CompletableFutureTest exten
2209       */
2210      public void testApplyToEither_normalCompletion() {
2211          for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean createIncomplete : new boolean[] { true, false })
1681        for (boolean fFirst : new boolean[] { true, false })
1682        for (Integer v1 : new Integer[] { 1, null })
1683        for (Integer v2 : new Integer[] { 2, null })
1684    {
1685        final CompletableFuture<Integer> f = new CompletableFuture<>();
1686        final CompletableFuture<Integer> g = new CompletableFuture<>();
1687        final IncFunction r = new IncFunction(m);
1688
1689        if (!createIncomplete)
1690            if (fFirst) f.complete(v1); else g.complete(v2);
1691        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1692        if (createIncomplete) {
1693            checkIncomplete(h);
1694            assertEquals(0, r.invocationCount);
1695            if (fFirst) f.complete(v1); else g.complete(v2);
1696        }
1697        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1698        if (!fFirst) f.complete(v1); else g.complete(v2);
1699
1700        checkCompletedNormally(f, v1);
1701        checkCompletedNormally(g, v2);
1702        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1703    }}
1704
1705    public void testApplyToEither_normalCompletionBothAvailable() {
1706        for (ExecutionMode m : ExecutionMode.values())
1707        for (boolean fFirst : new boolean[] { true, false })
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(m);
2217 >        final IncFunction[] rs = new IncFunction[6];
2218 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2219  
2220 <        if (fFirst) {
2221 <            f.complete(v1);
2222 <            g.complete(v2);
2223 <        } else {
2224 <            g.complete(v2);
2225 <            f.complete(v1);
2226 <        }
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 <        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())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
2260          for (Integer v1 : new Integer[] { 1, null })
2261      {
2262          final CompletableFuture<Integer> f = new CompletableFuture<>();
2263          final CompletableFuture<Integer> g = new CompletableFuture<>();
2264          final CFException ex = new CFException();
2265 <        final IncFunction r = new IncFunction(m);
2265 >        final IncFunction[] rs = new IncFunction[6];
2266 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2267  
2268 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2269 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2270 <        if (createIncomplete) {
2271 <            checkIncomplete(h);
2272 <            assertEquals(0, r.invocationCount);
2273 <            (fFirst ? f : g).completeExceptionally(ex);
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 >        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 >        // 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 <        checkCompletedWithWrappedCFException(h, ex);
2302 <        (!fFirst ? f : g).complete(v1);
2303 <
2304 <        assertEquals(0, r.invocationCount);
2305 <        checkCompletedNormally(!fFirst ? f : g, v1);
2306 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2307 <        checkCompletedWithWrappedCFException(h, ex);
2301 >        checkCompletedExceptionally(f, ex);
2302 >        checkCompletedNormally(g, v1);
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())
1768        for (boolean reverseArgs : new boolean[] { true, false })
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<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
2318          final CFException ex = new CFException();
2319 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2320 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2321 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2322 <        if (fFirst) {
2323 <            f.complete(v1);
2324 <            g.completeExceptionally(ex);
2325 <        } else {
2326 <            g.completeExceptionally(ex);
2327 <            f.complete(v1);
1786 <        }
1787 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2319 >        final IncFunction[] rs = new IncFunction[6];
2320 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2321 >
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 <        // unspecified behavior
2329 >        // unspecified behavior - both source completions available
2330 >        try {
2331 >            assertEquals(inc(v1), h0.join());
2332 >            rs[0].assertValue(inc(v1));
2333 >        } catch (CompletionException ok) {
2334 >            checkCompletedWithWrappedException(h0, ex);
2335 >            rs[0].assertNotInvoked();
2336 >        }
2337          try {
2338              assertEquals(inc(v1), h1.join());
2339 <            assertEquals(1, r1.invocationCount);
2339 >            rs[1].assertValue(inc(v1));
2340          } catch (CompletionException ok) {
2341 <            checkCompletedWithWrappedCFException(h1, ex);
2342 <            assertEquals(0, r1.invocationCount);
2341 >            checkCompletedWithWrappedException(h1, ex);
2342 >            rs[1].assertNotInvoked();
2343          }
1797
2344          try {
2345              assertEquals(inc(v1), h2.join());
2346 <            assertEquals(1, r2.invocationCount);
2346 >            rs[2].assertValue(inc(v1));
2347          } catch (CompletionException ok) {
2348 <            checkCompletedWithWrappedCFException(h2, ex);
2349 <            assertEquals(0, r2.invocationCount);
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  
1806        checkCompletedWithWrappedCFException(g, ex);
1807        checkCompletedNormally(f, v1);
1808    }}
1809
1810    /**
1811     * applyToEither result completes exceptionally if action does
1812     */
1813    public void testApplyToEither_actionFailed1() {
1814        for (ExecutionMode m : ExecutionMode.values())
1815        for (Integer v1 : new Integer[] { 1, null })
1816        for (Integer v2 : new Integer[] { 2, null })
1817    {
1818        final CompletableFuture<Integer> f = new CompletableFuture<>();
1819        final CompletableFuture<Integer> g = new CompletableFuture<>();
1820        final FailingFunction r = new FailingFunction(m);
1821        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822
1823        f.complete(v1);
1824        checkCompletedWithWrappedCFException(h);
1825        g.complete(v2);
2359          checkCompletedNormally(f, v1);
2360 <        checkCompletedNormally(g, v2);
1828 <    }}
1829 <
1830 <    public void testApplyToEither_actionFailed2() {
1831 <        for (ExecutionMode m : ExecutionMode.values())
1832 <        for (Integer v1 : new Integer[] { 1, null })
1833 <        for (Integer v2 : new Integer[] { 2, null })
1834 <    {
1835 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1836 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1837 <        final FailingFunction r = new FailingFunction(m);
1838 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1839 <
1840 <        g.complete(v2);
1841 <        checkCompletedWithWrappedCFException(h);
1842 <        f.complete(v1);
1843 <        checkCompletedNormally(f, v1);
1844 <        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 })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : 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(m);
2373 >        final IncFunction[] rs = new IncFunction[6];
2374 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2375  
2376 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2377 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2378 <        if (createIncomplete) {
2379 <            checkIncomplete(h);
2380 <            assertEquals(0, r.invocationCount);
2381 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
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 <        checkCompletedWithWrappedCancellationException(h);
2410 <        (!fFirst ? f : g).complete(v1);
2411 <
2412 <        assertEquals(0, r.invocationCount);
2413 <        checkCompletedNormally(!fFirst ? f : g, v1);
2414 <        checkCancelled(fFirst ? f : g);
2415 <        checkCompletedWithWrappedCancellationException(h);
2409 >        checkCancelled(f);
2410 >        checkCompletedNormally(g, v1);
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 })
1881        for (boolean reverseArgs : 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 r1 = new IncFunction(m);
2427 <        final IncFunction r2 = new IncFunction(m);
1889 <        final CFException ex = new CFException();
1890 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1891 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2426 >        final IncFunction[] rs = new IncFunction[6];
2427 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2428  
2429 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2430 <        if (fFirst) {
2431 <            f.complete(v1);
2432 <            assertTrue(g.cancel(mayInterruptIfRunning));
2433 <        } else {
2434 <            assertTrue(g.cancel(mayInterruptIfRunning));
1899 <            f.complete(v1);
1900 <        }
1901 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
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
2436 >        // unspecified behavior - both source completions available
2437 >        try {
2438 >            assertEquals(inc(v1), h0.join());
2439 >            rs[0].assertValue(inc(v1));
2440 >        } catch (CompletionException ok) {
2441 >            checkCompletedWithWrappedCancellationException(h0);
2442 >            rs[0].assertNotInvoked();
2443 >        }
2444          try {
2445              assertEquals(inc(v1), h1.join());
2446 <            assertEquals(1, r1.invocationCount);
2446 >            rs[1].assertValue(inc(v1));
2447          } catch (CompletionException ok) {
2448              checkCompletedWithWrappedCancellationException(h1);
2449 <            assertEquals(0, r1.invocationCount);
2449 >            rs[1].assertNotInvoked();
2450          }
1911
2451          try {
2452              assertEquals(inc(v1), h2.join());
2453 <            assertEquals(1, r2.invocationCount);
2453 >            rs[2].assertValue(inc(v1));
2454          } catch (CompletionException ok) {
2455              checkCompletedWithWrappedCancellationException(h2);
2456 <            assertEquals(0, r2.invocationCount);
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  
1920        checkCancelled(g);
2466          checkCompletedNormally(f, v1);
2467 +        checkCancelled(g);
2468      }}
2469  
2470      /**
2471 <     * acceptEither result completes normally after normal completion
1926 <     * 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);
1946 <    }}
1947 <
1948 <    public void testAcceptEither_normalCompletion2() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        for (Integer v2 : new Integer[] { 2, null })
1952 <    {
1953 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1954 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1956 <        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);
1965        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 +        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);
1979        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<>();
2000        final IncAction r = new IncAction();
2001        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<>();
2020        final IncAction r = new IncAction();
2021        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2022        final CFException ex = new CFException();
2023
2024        g.completeExceptionally(ex);
2025        checkCompletedWithWrappedCFException(h, ex);
2026        f.complete(v1);
2027
2028        assertEquals(0, r.invocationCount);
2029        checkCompletedNormally(f, v1);
2030        checkCompletedWithWrappedCFException(g, ex);
2031        checkCompletedWithWrappedCFException(h, ex);
2032    }}
2033
2034    public void testAcceptEither_exceptionalCompletion3() {
2035        for (ExecutionMode m : ExecutionMode.values())
2036        for (Integer v1 : new Integer[] { 1, null })
2037    {
2038        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040        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
2048 <        Integer v;
2639 >        // unspecified behavior - both source completions available
2640          try {
2641 <            assertNull(h.join());
2642 <            assertEquals(1, r.invocationCount);
2052 <            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          }
2057
2058        checkCompletedWithWrappedCFException(g, ex);
2059        checkCompletedNormally(f, v1);
2060    }}
2061
2062    public void testAcceptEither_exceptionalCompletion4() {
2063        for (ExecutionMode m : ExecutionMode.values())
2064        for (Integer v1 : new Integer[] { 1, null })
2065    {
2066        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068        final IncAction r = new IncAction();
2069        final CFException ex = new CFException();
2070
2071        f.completeExceptionally(ex);
2072        g.complete(v1);
2073        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2074
2075        // unspecified behavior
2076        Integer v;
2647          try {
2648 <            assertNull(h.join());
2649 <            assertEquals(1, r.invocationCount);
2080 <            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  
2086        checkCompletedWithWrappedCFException(f, ex);
2087        checkCompletedNormally(g, v1);
2088    }}
2089
2090    /**
2091     * acceptEither result completes exceptionally if action does
2092     */
2093    public void testAcceptEither_actionFailed1() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (Integer v1 : new Integer[] { 1, null })
2096        for (Integer v2 : new Integer[] { 2, null })
2097    {
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final FailingConsumer r = new FailingConsumer(m);
2101        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2102
2103        f.complete(v1);
2104        checkCompletedWithWrappedCFException(h);
2105        g.complete(v2);
2106        checkCompletedNormally(f, v1);
2107        checkCompletedNormally(g, v2);
2108    }}
2109
2110    public void testAcceptEither_actionFailed2() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingConsumer r = new FailingConsumer(m);
2118        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2119
2120        g.complete(v2);
2121        checkCompletedWithWrappedCFException(h);
2122        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() {
2131 <        for (ExecutionMode m : ExecutionMode.values())
2132 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null })
2134 <    {
2135 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2137 <        final IncAction r = new IncAction();
2138 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2139 <
2140 <        assertTrue(f.cancel(mayInterruptIfRunning));
2141 <        checkCompletedWithWrappedCancellationException(h);
2142 <        g.complete(v1);
2143 <
2144 <        checkCancelled(f);
2145 <        assertEquals(0, r.invocationCount);
2146 <        checkCompletedNormally(g, v1);
2147 <        checkCompletedWithWrappedCancellationException(h);
2148 <    }}
2149 <
2150 <    public void testAcceptEither_sourceCancelled2() {
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);
2159 <
2160 <        assertTrue(g.cancel(mayInterruptIfRunning));
2161 <        checkCompletedWithWrappedCancellationException(h);
2162 <        f.complete(v1);
2163 <
2164 <        checkCancelled(g);
2165 <        assertEquals(0, r.invocationCount);
2166 <        checkCompletedNormally(f, v1);
2167 <        checkCompletedWithWrappedCancellationException(h);
2168 <    }}
2683 >        final NoopConsumer[] rs = new NoopConsumer[6];
2684 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2685  
2686 <    public void testAcceptEither_sourceCancelled3() {
2687 <        for (ExecutionMode m : ExecutionMode.values())
2688 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2689 <        for (Integer v1 : new Integer[] { 1, null })
2690 <    {
2691 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2692 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2693 <        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));
2180 <        f.complete(v1);
2181 <        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);
2188 <            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          }
2193
2194        checkCancelled(g);
2195        checkCompletedNormally(f, v1);
2196    }}
2197
2198    public void testAcceptEither_sourceCancelled4() {
2199        for (ExecutionMode m : ExecutionMode.values())
2200        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2201        for (Integer v1 : new Integer[] { 1, null })
2202    {
2203        final CompletableFuture<Integer> f = new CompletableFuture<>();
2204        final CompletableFuture<Integer> g = new CompletableFuture<>();
2205        final IncAction r = new IncAction();
2206
2207        assertTrue(f.cancel(mayInterruptIfRunning));
2208        g.complete(v1);
2209        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2210
2211        // unspecified behavior
2212        Integer v;
2712          try {
2713 <            assertNull(h.join());
2714 <            assertEquals(1, r.invocationCount);
2216 <            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
2228 <     * 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(m);
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);
2247        checkCompletedNormally(h, null);
2248        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(m);
2783 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2782 >        final Noop[] rs = new Noop[6];
2783 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2784  
2785 <        g.complete(v2);
2786 <        checkCompletedNormally(h, null);
2787 <        assertEquals(1, r.invocationCount);
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  
2266        checkCompletedNormally(f, v1);
2267        checkCompletedNormally(g, v2);
2268        checkCompletedNormally(h, null);
2269        assertEquals(1, r.invocationCount);
2270        }}
2271
2272    public void testRunAfterEither_normalCompletion3() {
2273        for (ExecutionMode m : ExecutionMode.values())
2274        for (Integer v1 : new Integer[] { 1, null })
2275        for (Integer v2 : new Integer[] { 2, null })
2276    {
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final Noop r = new Noop(m);
2280
2281        f.complete(v1);
2807          g.complete(v2);
2283        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<>();
2301        final Noop r = new Noop(m);
2302        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<>();
2321        final Noop r = new Noop(m);
2322        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323        final CFException ex = new CFException();
2324
2325        g.completeExceptionally(ex);
2326        checkCompletedWithWrappedCFException(h, ex);
2327        f.complete(v1);
2328
2329        assertEquals(0, r.invocationCount);
2330        checkCompletedNormally(f, v1);
2331        checkCompletedWithWrappedCFException(g, ex);
2332        checkCompletedWithWrappedCFException(h, ex);
2333    }}
2334
2335    public void testRunAfterEither_exceptionalCompletion3() {
2336        for (ExecutionMode m : ExecutionMode.values())
2337        for (Integer v1 : new Integer[] { 1, null })
2338    {
2339        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341        final Noop r = new Noop(m);
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
2900 <        Integer v;
2899 >        // unspecified behavior - both source completions available
2900 >        try {
2901 >            assertNull(h0.join());
2902 >            rs[0].assertInvoked();
2903 >        } catch (CompletionException ok) {
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(h.join());
2923 <            assertEquals(1, r.invocationCount);
2922 >            assertNull(h3.join());
2923 >            rs[3].assertInvoked();
2924          } catch (CompletionException ok) {
2925 <            checkCompletedWithWrappedCFException(h, ex);
2926 <            assertEquals(0, r.invocationCount);
2925 >            checkCompletedWithWrappedException(h3, ex);
2926 >            rs[3].assertNotInvoked();
2927          }
2928  
2358        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(m);
2944 <        final CFException ex = new CFException();
2370 <
2371 <        f.completeExceptionally(ex);
2372 <        g.complete(v1);
2373 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2943 >        final Noop[] rs = new Noop[6];
2944 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2945  
2946 <        // unspecified behavior
2947 <        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(m);
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  
2402        f.complete(v1);
2403        checkCompletedWithWrappedCFException(h);
2404        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 })
2412        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(m);
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);
2420 <        checkCompletedWithWrappedCFException(h);
2421 <        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 })
2432 <        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(m);
3055 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2438 <
2439 <        assertTrue(f.cancel(mayInterruptIfRunning));
2440 <        checkCompletedWithWrappedCancellationException(h);
2441 <        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);
2446 <        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(m);
3073 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
3074 <
3075 <        assertTrue(g.cancel(mayInterruptIfRunning));
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <        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);
2464 <        assertEquals(0, r.invocationCount);
3077 >        checkCompletedWithWrappedException(g, r.ex);
3078          checkCompletedNormally(f, v1);
2466        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 })
2472        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(m);
3092 <
3093 <        assertTrue(g.cancel(mayInterruptIfRunning));
3094 <        f.complete(v1);
3095 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2481 <
2482 <        // unspecified behavior
2483 <        Integer v;
2484 <        try {
2485 <            assertNull(h.join());
2486 <            assertEquals(1, r.invocationCount);
2487 <        } catch (CompletionException ok) {
2488 <            checkCompletedWithWrappedCancellationException(h);
2489 <            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(m);
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(m);
3165 <        if (!createIncomplete) f.complete(v1);
3166 <        final CompletableFuture<Integer> g = m.thenCompose(f, 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  
2537        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(m);
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 = m.thenCompose(f, 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 })
3202          for (Integer v1 : new Integer[] { 1, null })
3203      {
3204 +        final CFException ex = new CFException();
3205          final CompletableFuture<Integer> f = new CompletableFuture<>();
3206 <        final FailingCompletableFutureFunction r
3207 <            = new FailingCompletableFutureFunction(m);
3208 <        if (!createIncomplete) f.complete(v1);
3209 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3210 <        if (createIncomplete) f.complete(v1);
3206 >        final FailingExceptionalCompletableFutureFunction r
3207 >            = new FailingExceptionalCompletableFutureFunction(m);
3208 >        if (!createIncomplete) f.completeExceptionally(ex);
3209 >        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3210 >        if (createIncomplete) f.completeExceptionally(ex);
3211  
3212 <        checkCompletedWithWrappedCFException(g);
3213 <        checkCompletedNormally(f, v1);
3212 >        checkCompletedExceptionally(f, ex);
3213 >        checkCompletedWithWrappedException(g, r.ex);
3214 >        r.assertInvoked();
3215      }}
3216  
3217      /**
3218 <     * thenCompose result completes exceptionally if source cancelled
3218 >     * thenComposeExceptionally result completes exceptionally if the
3219 >     * result of the action does
3220       */
3221 <    public void testThenCompose_sourceCancelled() {
3221 >    public void testExceptionallyCompose_actionReturnsFailingFuture() {
3222          for (ExecutionMode m : ExecutionMode.values())
3223 <        for (boolean createIncomplete : new boolean[] { true, false })
3224 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3223 >        for (int order = 0; order < 6; order++)
3224 >        for (Integer v1 : new Integer[] { 1, null })
3225      {
3226 +        final CFException ex0 = new CFException();
3227 +        final CFException ex = new CFException();
3228          final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 <        final CompletableFutureInc r = new CompletableFutureInc(m);
3230 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3231 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3232 <        if (createIncomplete) {
3233 <            checkIncomplete(g);
3234 <            assertTrue(f.cancel(mayInterruptIfRunning));
3235 <        }
3236 <
3237 <        checkCompletedWithWrappedCancellationException(g);
3238 <        checkCancelled(f);
3229 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
3230 >        final CompletableFuture<Integer> h;
3231 >        // Test all permutations of orders
3232 >        switch (order) {
3233 >        case 0:
3234 >            assertTrue(f.completeExceptionally(ex0));
3235 >            assertTrue(g.completeExceptionally(ex));
3236 >            h = m.exceptionallyCompose(f, (x -> g));
3237 >            break;
3238 >        case 1:
3239 >            assertTrue(f.completeExceptionally(ex0));
3240 >            h = m.exceptionallyCompose(f, (x -> g));
3241 >            assertTrue(g.completeExceptionally(ex));
3242 >            break;
3243 >        case 2:
3244 >            assertTrue(g.completeExceptionally(ex));
3245 >            assertTrue(f.completeExceptionally(ex0));
3246 >            h = m.exceptionallyCompose(f, (x -> g));
3247 >            break;
3248 >        case 3:
3249 >            assertTrue(g.completeExceptionally(ex));
3250 >            h = m.exceptionallyCompose(f, (x -> g));
3251 >            assertTrue(f.completeExceptionally(ex0));
3252 >            break;
3253 >        case 4:
3254 >            h = m.exceptionallyCompose(f, (x -> g));
3255 >            assertTrue(f.completeExceptionally(ex0));
3256 >            assertTrue(g.completeExceptionally(ex));
3257 >            break;
3258 >        case 5:
3259 >            h = m.exceptionallyCompose(f, (x -> g));
3260 >            assertTrue(f.completeExceptionally(ex0));
3261 >            assertTrue(g.completeExceptionally(ex));
3262 >            break;
3263 >        default: throw new AssertionError();
3264 >        }
3265 >
3266 >        checkCompletedExceptionally(g, ex);
3267 >        checkCompletedWithWrappedException(h, ex);
3268 >        checkCompletedExceptionally(f, ex0);
3269      }}
3270  
3271      // other static methods
# Line 2615 | Line 3284 | public class CompletableFutureTest exten
3284       * when all components complete normally
3285       */
3286      public void testAllOf_normal() throws Exception {
3287 <        for (int k = 1; k < 20; ++k) {
3287 >        for (int k = 1; k < 10; k++) {
3288              CompletableFuture<Integer>[] fs
3289                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3290 <            for (int i = 0; i < k; ++i)
3290 >            for (int i = 0; i < k; i++)
3291                  fs[i] = new CompletableFuture<>();
3292              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3293 <            for (int i = 0; i < k; ++i) {
3293 >            for (int i = 0; i < k; i++) {
3294                  checkIncomplete(f);
3295                  checkIncomplete(CompletableFuture.allOf(fs));
3296                  fs[i].complete(one);
# Line 2631 | Line 3300 | public class CompletableFutureTest exten
3300          }
3301      }
3302  
3303 <    public void testAllOf_backwards() throws Exception {
3304 <        for (int k = 1; k < 20; ++k) {
3303 >    public void testAllOf_normal_backwards() throws Exception {
3304 >        for (int k = 1; k < 10; k++) {
3305              CompletableFuture<Integer>[] fs
3306                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3307 <            for (int i = 0; i < k; ++i)
3307 >            for (int i = 0; i < k; i++)
3308                  fs[i] = new CompletableFuture<>();
3309              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3310              for (int i = k - 1; i >= 0; i--) {
# Line 2648 | Line 3317 | public class CompletableFutureTest exten
3317          }
3318      }
3319  
3320 +    public void testAllOf_exceptional() throws Exception {
3321 +        for (int k = 1; k < 10; k++) {
3322 +            CompletableFuture<Integer>[] fs
3323 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3324 +            CFException ex = new CFException();
3325 +            for (int i = 0; i < k; i++)
3326 +                fs[i] = new CompletableFuture<>();
3327 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3328 +            for (int i = 0; i < k; i++) {
3329 +                checkIncomplete(f);
3330 +                checkIncomplete(CompletableFuture.allOf(fs));
3331 +                if (i != k / 2) {
3332 +                    fs[i].complete(i);
3333 +                    checkCompletedNormally(fs[i], i);
3334 +                } else {
3335 +                    fs[i].completeExceptionally(ex);
3336 +                    checkCompletedExceptionally(fs[i], ex);
3337 +                }
3338 +            }
3339 +            checkCompletedWithWrappedException(f, ex);
3340 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3341 +        }
3342 +    }
3343 +
3344      /**
3345       * anyOf(no component futures) returns an incomplete future
3346       */
3347      public void testAnyOf_empty() throws Exception {
3348 +        for (Integer v1 : new Integer[] { 1, null })
3349 +    {
3350          CompletableFuture<Object> f = CompletableFuture.anyOf();
3351          checkIncomplete(f);
3352 <    }
3352 >
3353 >        f.complete(v1);
3354 >        checkCompletedNormally(f, v1);
3355 >    }}
3356  
3357      /**
3358       * anyOf returns a future completed normally with a value when
3359       * a component future does
3360       */
3361      public void testAnyOf_normal() throws Exception {
3362 <        for (int k = 0; k < 10; ++k) {
3362 >        for (int k = 0; k < 10; k++) {
3363              CompletableFuture[] fs = new CompletableFuture[k];
3364 <            for (int i = 0; i < k; ++i)
3364 >            for (int i = 0; i < k; i++)
3365                  fs[i] = new CompletableFuture<>();
3366              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3367              checkIncomplete(f);
3368 <            for (int i = 0; i < k; ++i) {
3369 <                fs[i].complete(one);
3370 <                checkCompletedNormally(f, one);
3371 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3368 >            for (int i = 0; i < k; i++) {
3369 >                fs[i].complete(i);
3370 >                checkCompletedNormally(f, 0);
3371 >                int x = (int) CompletableFuture.anyOf(fs).join();
3372 >                assertTrue(0 <= x && x <= i);
3373 >            }
3374 >        }
3375 >    }
3376 >    public void testAnyOf_normal_backwards() throws Exception {
3377 >        for (int k = 0; k < 10; k++) {
3378 >            CompletableFuture[] fs = new CompletableFuture[k];
3379 >            for (int i = 0; i < k; i++)
3380 >                fs[i] = new CompletableFuture<>();
3381 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3382 >            checkIncomplete(f);
3383 >            for (int i = k - 1; i >= 0; i--) {
3384 >                fs[i].complete(i);
3385 >                checkCompletedNormally(f, k - 1);
3386 >                int x = (int) CompletableFuture.anyOf(fs).join();
3387 >                assertTrue(i <= x && x <= k - 1);
3388              }
3389          }
3390      }
# Line 2679 | Line 3393 | public class CompletableFutureTest exten
3393       * anyOf result completes exceptionally when any component does.
3394       */
3395      public void testAnyOf_exceptional() throws Exception {
3396 <        for (int k = 0; k < 10; ++k) {
3396 >        for (int k = 0; k < 10; k++) {
3397 >            CompletableFuture[] fs = new CompletableFuture[k];
3398 >            CFException[] exs = new CFException[k];
3399 >            for (int i = 0; i < k; i++) {
3400 >                fs[i] = new CompletableFuture<>();
3401 >                exs[i] = new CFException();
3402 >            }
3403 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3404 >            checkIncomplete(f);
3405 >            for (int i = 0; i < k; i++) {
3406 >                fs[i].completeExceptionally(exs[i]);
3407 >                checkCompletedWithWrappedException(f, exs[0]);
3408 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3409 >            }
3410 >        }
3411 >    }
3412 >
3413 >    public void testAnyOf_exceptional_backwards() throws Exception {
3414 >        for (int k = 0; k < 10; k++) {
3415              CompletableFuture[] fs = new CompletableFuture[k];
3416 <            for (int i = 0; i < k; ++i)
3416 >            CFException[] exs = new CFException[k];
3417 >            for (int i = 0; i < k; i++) {
3418                  fs[i] = new CompletableFuture<>();
3419 +                exs[i] = new CFException();
3420 +            }
3421              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3422              checkIncomplete(f);
3423 <            for (int i = 0; i < k; ++i) {
3424 <                fs[i].completeExceptionally(new CFException());
3425 <                checkCompletedWithWrappedCFException(f);
3423 >            for (int i = k - 1; i >= 0; i--) {
3424 >                fs[i].completeExceptionally(exs[i]);
3425 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3426                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3427              }
3428          }
# Line 2696 | Line 3431 | public class CompletableFutureTest exten
3431      /**
3432       * Completion methods throw NullPointerException with null arguments
3433       */
3434 +    @SuppressWarnings("FutureReturnValueIgnored")
3435      public void testNPE() {
3436          CompletableFuture<Integer> f = new CompletableFuture<>();
3437          CompletableFuture<Integer> g = new CompletableFuture<>();
3438          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2703        CompletableFuture<?> h;
3439          ThreadExecutor exec = new ThreadExecutor();
3440  
3441          Runnable[] throwingActions = {
3442              () -> CompletableFuture.supplyAsync(null),
3443              () -> CompletableFuture.supplyAsync(null, exec),
3444 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3444 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3445  
3446              () -> CompletableFuture.runAsync(null),
3447              () -> CompletableFuture.runAsync(null, exec),
# Line 2716 | Line 3451 | public class CompletableFutureTest exten
3451  
3452              () -> f.thenApply(null),
3453              () -> f.thenApplyAsync(null),
3454 <            () -> f.thenApplyAsync((x) -> x, null),
3454 >            () -> f.thenApplyAsync(x -> x, null),
3455              () -> f.thenApplyAsync(null, exec),
3456  
3457              () -> f.thenAccept(null),
3458              () -> f.thenAcceptAsync(null),
3459 <            () -> f.thenAcceptAsync((x) -> {} , null),
3459 >            () -> f.thenAcceptAsync(x -> {} , null),
3460              () -> f.thenAcceptAsync(null, exec),
3461  
3462              () -> f.thenRun(null),
# Line 2756 | Line 3491 | public class CompletableFutureTest exten
3491              () -> f.applyToEither(g, null),
3492              () -> f.applyToEitherAsync(g, null),
3493              () -> f.applyToEitherAsync(g, null, exec),
3494 <            () -> f.applyToEither(nullFuture, (x) -> x),
3495 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3496 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3497 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3494 >            () -> f.applyToEither(nullFuture, x -> x),
3495 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3496 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3497 >            () -> f.applyToEitherAsync(g, x -> x, null),
3498  
3499              () -> f.acceptEither(g, null),
3500              () -> f.acceptEitherAsync(g, null),
3501              () -> f.acceptEitherAsync(g, null, exec),
3502 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3503 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3504 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3505 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3502 >            () -> f.acceptEither(nullFuture, x -> {}),
3503 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3504 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3505 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3506  
3507              () -> f.runAfterEither(g, null),
3508              () -> f.runAfterEitherAsync(g, null),
# Line 2797 | Line 3532 | public class CompletableFutureTest exten
3532              () -> CompletableFuture.anyOf(null, f),
3533  
3534              () -> f.obtrudeException(null),
3535 +
3536 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3537 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3538 +            () -> CompletableFuture.delayedExecutor(1L, null),
3539 +
3540 +            () -> f.orTimeout(1L, null),
3541 +            () -> f.completeOnTimeout(42, 1L, null),
3542 +
3543 +            () -> CompletableFuture.failedFuture(null),
3544 +            () -> CompletableFuture.failedStage(null),
3545          };
3546  
3547          assertThrows(NullPointerException.class, throwingActions);
# Line 2804 | Line 3549 | public class CompletableFutureTest exten
3549      }
3550  
3551      /**
3552 +     * Test submissions to an executor that rejects all tasks.
3553 +     */
3554 +    public void testRejectingExecutor() {
3555 +        for (Integer v : new Integer[] { 1, null })
3556 +    {
3557 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3558 +
3559 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3560 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3561 +
3562 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3563 +
3564 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3565 +        srcs.add(complete);
3566 +        srcs.add(incomplete);
3567 +
3568 +        for (CompletableFuture<Integer> src : srcs) {
3569 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3570 +            fs.add(src.thenRunAsync(() -> {}, e));
3571 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3572 +            fs.add(src.thenApplyAsync(z -> z, e));
3573 +
3574 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3575 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3576 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3577 +
3578 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3579 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3580 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3581 +
3582 +            fs.add(src.thenComposeAsync(z -> null, e));
3583 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3584 +            fs.add(src.handleAsync((z, t) -> null, e));
3585 +
3586 +            for (CompletableFuture<?> future : fs) {
3587 +                if (src.isDone())
3588 +                    checkCompletedWithWrappedException(future, e.ex);
3589 +                else
3590 +                    checkIncomplete(future);
3591 +            }
3592 +            futures.addAll(fs);
3593 +        }
3594 +
3595 +        {
3596 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3597 +
3598 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3599 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3600 +
3601 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3602 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3603 +
3604 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3605 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3606 +
3607 +            for (CompletableFuture<?> future : fs)
3608 +                checkIncomplete(future);
3609 +            futures.addAll(fs);
3610 +        }
3611 +
3612 +        {
3613 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3614 +
3615 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3616 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3617 +
3618 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3619 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3620 +
3621 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3622 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3623 +
3624 +            for (CompletableFuture<?> future : fs)
3625 +                checkCompletedWithWrappedException(future, e.ex);
3626 +            futures.addAll(fs);
3627 +        }
3628 +
3629 +        incomplete.complete(v);
3630 +
3631 +        for (CompletableFuture<?> future : futures)
3632 +            checkCompletedWithWrappedException(future, e.ex);
3633 +
3634 +        assertEquals(futures.size(), e.count.get());
3635 +    }}
3636 +
3637 +    /**
3638 +     * Test submissions to an executor that rejects all tasks, but
3639 +     * should never be invoked because the dependent future is
3640 +     * explicitly completed.
3641 +     */
3642 +    public void testRejectingExecutorNeverInvoked() {
3643 +        for (Integer v : new Integer[] { 1, null })
3644 +    {
3645 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3646 +
3647 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3648 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3649 +
3650 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3651 +
3652 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3653 +        srcs.add(complete);
3654 +        srcs.add(incomplete);
3655 +
3656 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3657 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3658 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3659 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3660 +
3661 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3662 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3663 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3664 +
3665 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3666 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3667 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3668 +
3669 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3670 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3671 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3672 +
3673 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3674 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3675 +
3676 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3677 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3678 +
3679 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3680 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3681 +
3682 +        for (CompletableFuture<?> future : fs)
3683 +            checkIncomplete(future);
3684 +
3685 +        for (CompletableFuture<?> future : fs)
3686 +            future.complete(null);
3687 +
3688 +        incomplete.complete(v);
3689 +
3690 +        for (CompletableFuture<?> future : fs)
3691 +            checkCompletedNormally(future, null);
3692 +
3693 +        assertEquals(0, e.count.get());
3694 +    }}
3695 +
3696 +    /**
3697       * toCompletableFuture returns this CompletableFuture.
3698       */
3699      public void testToCompletableFuture() {
# Line 2811 | Line 3701 | public class CompletableFutureTest exten
3701          assertSame(f, f.toCompletableFuture());
3702      }
3703  
3704 +    // jdk9
3705 +
3706      /**
3707 <     * whenComplete action executes on normal completion, propagating
2816 <     * source result.
3707 >     * newIncompleteFuture returns an incomplete CompletableFuture
3708       */
3709 <    public void testWhenComplete_normalCompletion1() {
3710 <        for (ExecutionMode m : ExecutionMode.values())
3709 >    public void testNewIncompleteFuture() {
3710 >        for (Integer v1 : new Integer[] { 1, null })
3711 >    {
3712 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3713 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3714 >        checkIncomplete(f);
3715 >        checkIncomplete(g);
3716 >        f.complete(v1);
3717 >        checkCompletedNormally(f, v1);
3718 >        checkIncomplete(g);
3719 >        g.complete(v1);
3720 >        checkCompletedNormally(g, v1);
3721 >        assertSame(g.getClass(), CompletableFuture.class);
3722 >    }}
3723 >
3724 >    /**
3725 >     * completedStage returns a completed CompletionStage
3726 >     */
3727 >    public void testCompletedStage() {
3728 >        AtomicInteger x = new AtomicInteger(0);
3729 >        AtomicReference<Throwable> r = new AtomicReference<>();
3730 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3731 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3732 >        assertEquals(x.get(), 1);
3733 >        assertNull(r.get());
3734 >    }
3735 >
3736 >    /**
3737 >     * defaultExecutor by default returns the commonPool if
3738 >     * it supports more than one thread.
3739 >     */
3740 >    public void testDefaultExecutor() {
3741 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3742 >        Executor e = f.defaultExecutor();
3743 >        Executor c = ForkJoinPool.commonPool();
3744 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3745 >            assertSame(e, c);
3746 >        else
3747 >            assertNotSame(e, c);
3748 >    }
3749 >
3750 >    /**
3751 >     * failedFuture returns a CompletableFuture completed
3752 >     * exceptionally with the given Exception
3753 >     */
3754 >    public void testFailedFuture() {
3755 >        CFException ex = new CFException();
3756 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3757 >        checkCompletedExceptionally(f, ex);
3758 >    }
3759 >
3760 >    /**
3761 >     * failedFuture(null) throws NPE
3762 >     */
3763 >    public void testFailedFuture_null() {
3764 >        try {
3765 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3766 >            shouldThrow();
3767 >        } catch (NullPointerException success) {}
3768 >    }
3769 >
3770 >    /**
3771 >     * copy returns a CompletableFuture that is completed normally,
3772 >     * with the same value, when source is.
3773 >     */
3774 >    public void testCopy_normalCompletion() {
3775          for (boolean createIncomplete : new boolean[] { true, false })
3776          for (Integer v1 : new Integer[] { 1, null })
3777      {
3778 <        final AtomicInteger a = new AtomicInteger(0);
3779 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3780 <        if (!createIncomplete) f.complete(v1);
3781 <        final CompletableFuture<Integer> g = m.whenComplete
3782 <            (f,
3783 <             (Integer x, Throwable t) -> {
3784 <                threadAssertSame(x, v1);
3785 <                threadAssertNull(t);
3786 <                a.getAndIncrement();
3787 <            });
3788 <        if (createIncomplete) f.complete(v1);
3778 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3779 >        if (!createIncomplete) assertTrue(f.complete(v1));
3780 >        CompletableFuture<Integer> g = f.copy();
3781 >        if (createIncomplete) {
3782 >            checkIncomplete(f);
3783 >            checkIncomplete(g);
3784 >            assertTrue(f.complete(v1));
3785 >        }
3786 >        checkCompletedNormally(f, v1);
3787 >        checkCompletedNormally(g, v1);
3788 >    }}
3789 >
3790 >    /**
3791 >     * copy returns a CompletableFuture that is completed exceptionally
3792 >     * when source is.
3793 >     */
3794 >    public void testCopy_exceptionalCompletion() {
3795 >        for (boolean createIncomplete : new boolean[] { true, false })
3796 >    {
3797 >        CFException ex = new CFException();
3798 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3799 >        if (!createIncomplete) f.completeExceptionally(ex);
3800 >        CompletableFuture<Integer> g = f.copy();
3801 >        if (createIncomplete) {
3802 >            checkIncomplete(f);
3803 >            checkIncomplete(g);
3804 >            f.completeExceptionally(ex);
3805 >        }
3806 >        checkCompletedExceptionally(f, ex);
3807 >        checkCompletedWithWrappedException(g, ex);
3808 >    }}
3809 >
3810 >    /**
3811 >     * Completion of a copy does not complete its source.
3812 >     */
3813 >    public void testCopy_oneWayPropagation() {
3814 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3815 >        assertTrue(f.copy().complete(1));
3816 >        assertTrue(f.copy().complete(null));
3817 >        assertTrue(f.copy().cancel(true));
3818 >        assertTrue(f.copy().cancel(false));
3819 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3820 >        checkIncomplete(f);
3821 >    }
3822 >
3823 >    /**
3824 >     * minimalCompletionStage returns a CompletableFuture that is
3825 >     * completed normally, with the same value, when source is.
3826 >     */
3827 >    public void testMinimalCompletionStage() {
3828 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3829 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3830 >        AtomicInteger x = new AtomicInteger(0);
3831 >        AtomicReference<Throwable> r = new AtomicReference<>();
3832 >        checkIncomplete(f);
3833 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3834 >        f.complete(1);
3835 >        checkCompletedNormally(f, 1);
3836 >        assertEquals(x.get(), 1);
3837 >        assertNull(r.get());
3838 >    }
3839  
3840 +    /**
3841 +     * minimalCompletionStage returns a CompletableFuture that is
3842 +     * completed exceptionally when source is.
3843 +     */
3844 +    public void testMinimalCompletionStage2() {
3845 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3846 +        CompletionStage<Integer> g = f.minimalCompletionStage();
3847 +        AtomicInteger x = new AtomicInteger(0);
3848 +        AtomicReference<Throwable> r = new AtomicReference<>();
3849 +        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3850 +        checkIncomplete(f);
3851 +        CFException ex = new CFException();
3852 +        f.completeExceptionally(ex);
3853 +        checkCompletedExceptionally(f, ex);
3854 +        assertEquals(x.get(), 0);
3855 +        assertEquals(r.get().getCause(), ex);
3856 +    }
3857 +
3858 +    /**
3859 +     * failedStage returns a CompletionStage completed
3860 +     * exceptionally with the given Exception
3861 +     */
3862 +    public void testFailedStage() {
3863 +        CFException ex = new CFException();
3864 +        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3865 +        AtomicInteger x = new AtomicInteger(0);
3866 +        AtomicReference<Throwable> r = new AtomicReference<>();
3867 +        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3868 +        assertEquals(x.get(), 0);
3869 +        assertEquals(r.get(), ex);
3870 +    }
3871 +
3872 +    /**
3873 +     * completeAsync completes with value of given supplier
3874 +     */
3875 +    public void testCompleteAsync() {
3876 +        for (Integer v1 : new Integer[] { 1, null })
3877 +    {
3878 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3879 +        f.completeAsync(() -> v1);
3880 +        f.join();
3881 +        checkCompletedNormally(f, v1);
3882 +    }}
3883 +
3884 +    /**
3885 +     * completeAsync completes exceptionally if given supplier throws
3886 +     */
3887 +    public void testCompleteAsync2() {
3888 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3889 +        CFException ex = new CFException();
3890 +        f.completeAsync(() -> { throw ex; });
3891 +        try {
3892 +            f.join();
3893 +            shouldThrow();
3894 +        } catch (CompletionException success) {}
3895 +        checkCompletedWithWrappedException(f, ex);
3896 +    }
3897 +
3898 +    /**
3899 +     * completeAsync with given executor completes with value of given supplier
3900 +     */
3901 +    public void testCompleteAsync3() {
3902 +        for (Integer v1 : new Integer[] { 1, null })
3903 +    {
3904 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3905 +        ThreadExecutor executor = new ThreadExecutor();
3906 +        f.completeAsync(() -> v1, executor);
3907 +        assertSame(v1, f.join());
3908 +        checkCompletedNormally(f, v1);
3909 +        assertEquals(1, executor.count.get());
3910 +    }}
3911 +
3912 +    /**
3913 +     * completeAsync with given executor completes exceptionally if
3914 +     * given supplier throws
3915 +     */
3916 +    public void testCompleteAsync4() {
3917 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3918 +        CFException ex = new CFException();
3919 +        ThreadExecutor executor = new ThreadExecutor();
3920 +        f.completeAsync(() -> { throw ex; }, executor);
3921 +        try {
3922 +            f.join();
3923 +            shouldThrow();
3924 +        } catch (CompletionException success) {}
3925 +        checkCompletedWithWrappedException(f, ex);
3926 +        assertEquals(1, executor.count.get());
3927 +    }
3928 +
3929 +    /**
3930 +     * orTimeout completes with TimeoutException if not complete
3931 +     */
3932 +    public void testOrTimeout_timesOut() {
3933 +        long timeoutMillis = timeoutMillis();
3934 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3935 +        long startTime = System.nanoTime();
3936 +        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3937 +        checkCompletedWithTimeoutException(f);
3938 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3939 +    }
3940 +
3941 +    /**
3942 +     * orTimeout completes normally if completed before timeout
3943 +     */
3944 +    public void testOrTimeout_completed() {
3945 +        for (Integer v1 : new Integer[] { 1, null })
3946 +    {
3947 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3948 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3949 +        long startTime = System.nanoTime();
3950 +        f.complete(v1);
3951 +        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3952 +        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3953 +        g.complete(v1);
3954 +        checkCompletedNormally(f, v1);
3955          checkCompletedNormally(g, v1);
3956 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3957 +    }}
3958 +
3959 +    /**
3960 +     * completeOnTimeout completes with given value if not complete
3961 +     */
3962 +    public void testCompleteOnTimeout_timesOut() {
3963 +        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3964 +                       () -> testCompleteOnTimeout_timesOut(null));
3965 +    }
3966 +
3967 +    /**
3968 +     * completeOnTimeout completes with given value if not complete
3969 +     */
3970 +    public void testCompleteOnTimeout_timesOut(Integer v) {
3971 +        long timeoutMillis = timeoutMillis();
3972 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3973 +        long startTime = System.nanoTime();
3974 +        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3975 +        assertSame(v, f.join());
3976 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3977 +        f.complete(99);         // should have no effect
3978 +        checkCompletedNormally(f, v);
3979 +    }
3980 +
3981 +    /**
3982 +     * completeOnTimeout has no effect if completed within timeout
3983 +     */
3984 +    public void testCompleteOnTimeout_completed() {
3985 +        for (Integer v1 : new Integer[] { 1, null })
3986 +    {
3987 +        CompletableFuture<Integer> f = new CompletableFuture<>();
3988 +        CompletableFuture<Integer> g = new CompletableFuture<>();
3989 +        long startTime = System.nanoTime();
3990 +        f.complete(v1);
3991 +        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3992 +        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3993 +        g.complete(v1);
3994          checkCompletedNormally(f, v1);
3995 <        assertEquals(1, a.get());
3995 >        checkCompletedNormally(g, v1);
3996 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3997      }}
3998  
3999      /**
4000 <     * whenComplete action executes on exceptional completion, propagating
2842 <     * source result.
4000 >     * delayedExecutor returns an executor that delays submission
4001       */
4002 <    public void testWhenComplete_exceptionalCompletion() {
4002 >    public void testDelayedExecutor() {
4003 >        testInParallel(() -> testDelayedExecutor(null, null),
4004 >                       () -> testDelayedExecutor(null, 1),
4005 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4006 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4007 >    }
4008 >
4009 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4010 >        long timeoutMillis = timeoutMillis();
4011 >        // Use an "unreasonably long" long timeout to catch lingering threads
4012 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
4013 >        final Executor delayer, longDelayer;
4014 >        if (executor == null) {
4015 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
4016 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
4017 >        } else {
4018 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
4019 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4020 >        }
4021 >        long startTime = System.nanoTime();
4022 >        CompletableFuture<Integer> f =
4023 >            CompletableFuture.supplyAsync(() -> v, delayer);
4024 >        CompletableFuture<Integer> g =
4025 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
4026 >
4027 >        assertNull(g.getNow(null));
4028 >
4029 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
4030 >        long millisElapsed = millisElapsedSince(startTime);
4031 >        assertTrue(millisElapsed >= timeoutMillis);
4032 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
4033 >
4034 >        checkCompletedNormally(f, v);
4035 >
4036 >        checkIncomplete(g);
4037 >        assertTrue(g.cancel(true));
4038 >    }
4039 >
4040 >    //--- tests of implementation details; not part of official tck ---
4041 >
4042 >    Object resultOf(CompletableFuture<?> f) {
4043 >        SecurityManager sm = System.getSecurityManager();
4044 >        if (sm != null) {
4045 >            try {
4046 >                System.setSecurityManager(null);
4047 >            } catch (SecurityException giveUp) {
4048 >                return "Reflection not available";
4049 >            }
4050 >        }
4051 >
4052 >        try {
4053 >            java.lang.reflect.Field resultField
4054 >                = CompletableFuture.class.getDeclaredField("result");
4055 >            resultField.setAccessible(true);
4056 >            return resultField.get(f);
4057 >        } catch (Throwable t) {
4058 >            throw new AssertionError(t);
4059 >        } finally {
4060 >            if (sm != null) System.setSecurityManager(sm);
4061 >        }
4062 >    }
4063 >
4064 >    public void testExceptionPropagationReusesResultObject() {
4065 >        if (!testImplementationDetails) return;
4066          for (ExecutionMode m : ExecutionMode.values())
4067 +    {
4068 +        final CFException ex = new CFException();
4069 +        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4070 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4071 +
4072 +        final Runnable noopRunnable = new Noop(m);
4073 +        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4074 +        final Function<Integer, Integer> incFunction = new IncFunction(m);
4075 +
4076 +        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4077 +            = new ArrayList<>();
4078 +
4079 +        funs.add(y -> m.thenRun(y, noopRunnable));
4080 +        funs.add(y -> m.thenAccept(y, noopConsumer));
4081 +        funs.add(y -> m.thenApply(y, incFunction));
4082 +
4083 +        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
4084 +        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
4085 +        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
4086 +
4087 +        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
4088 +        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
4089 +        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
4090 +        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
4091 +        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4092 +        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4093 +
4094 +        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4095 +
4096 +        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4097 +
4098 +        funs.add(y -> CompletableFuture.allOf(y));
4099 +        funs.add(y -> CompletableFuture.allOf(y, v42));
4100 +        funs.add(y -> CompletableFuture.allOf(v42, y));
4101 +        funs.add(y -> CompletableFuture.anyOf(y));
4102 +        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4103 +        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4104 +
4105 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4106 +                 fun : funs) {
4107 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4108 +            f.completeExceptionally(ex);
4109 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4110 +            checkCompletedWithWrappedException(src, ex);
4111 +            CompletableFuture<?> dep = fun.apply(src);
4112 +            checkCompletedWithWrappedException(dep, ex);
4113 +            assertSame(resultOf(src), resultOf(dep));
4114 +        }
4115 +
4116 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4117 +                 fun : funs) {
4118 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4119 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4120 +            CompletableFuture<?> dep = fun.apply(src);
4121 +            f.completeExceptionally(ex);
4122 +            checkCompletedWithWrappedException(src, ex);
4123 +            checkCompletedWithWrappedException(dep, ex);
4124 +            assertSame(resultOf(src), resultOf(dep));
4125 +        }
4126 +
4127 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4128 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4129 +                 fun : funs) {
4130 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4131 +            f.cancel(mayInterruptIfRunning);
4132 +            checkCancelled(f);
4133 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4134 +            checkCompletedWithWrappedCancellationException(src);
4135 +            CompletableFuture<?> dep = fun.apply(src);
4136 +            checkCompletedWithWrappedCancellationException(dep);
4137 +            assertSame(resultOf(src), resultOf(dep));
4138 +        }
4139 +
4140 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4141 +        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4142 +                 fun : funs) {
4143 +            CompletableFuture<Integer> f = new CompletableFuture<>();
4144 +            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4145 +            CompletableFuture<?> dep = fun.apply(src);
4146 +            f.cancel(mayInterruptIfRunning);
4147 +            checkCancelled(f);
4148 +            checkCompletedWithWrappedCancellationException(src);
4149 +            checkCompletedWithWrappedCancellationException(dep);
4150 +            assertSame(resultOf(src), resultOf(dep));
4151 +        }
4152 +    }}
4153 +
4154 +    /**
4155 +     * Minimal completion stages throw UOE for most non-CompletionStage methods
4156 +     */
4157 +    public void testMinimalCompletionStage_minimality() {
4158 +        if (!testImplementationDetails) return;
4159 +        Function<Method, String> toSignature =
4160 +            method -> method.getName() + Arrays.toString(method.getParameterTypes());
4161 +        Predicate<Method> isNotStatic =
4162 +            method -> (method.getModifiers() & Modifier.STATIC) == 0;
4163 +        List<Method> minimalMethods =
4164 +            Stream.of(Object.class, CompletionStage.class)
4165 +            .flatMap(klazz -> Stream.of(klazz.getMethods()))
4166 +            .filter(isNotStatic)
4167 +            .collect(Collectors.toList());
4168 +        // Methods from CompletableFuture permitted NOT to throw UOE
4169 +        String[] signatureWhitelist = {
4170 +            "newIncompleteFuture[]",
4171 +            "defaultExecutor[]",
4172 +            "minimalCompletionStage[]",
4173 +            "copy[]",
4174 +        };
4175 +        Set<String> permittedMethodSignatures =
4176 +            Stream.concat(minimalMethods.stream().map(toSignature),
4177 +                          Stream.of(signatureWhitelist))
4178 +            .collect(Collectors.toSet());
4179 +        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4180 +            .filter(isNotStatic)
4181 +            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4182 +            .collect(Collectors.toList());
4183 +
4184 +        List<CompletionStage<Integer>> stages = new ArrayList<>();
4185 +        CompletionStage<Integer> min =
4186 +            new CompletableFuture<Integer>().minimalCompletionStage();
4187 +        stages.add(min);
4188 +        stages.add(min.thenApply(x -> x));
4189 +        stages.add(CompletableFuture.completedStage(1));
4190 +        stages.add(CompletableFuture.failedStage(new CFException()));
4191 +
4192 +        List<Method> bugs = new ArrayList<>();
4193 +        for (Method method : allMethods) {
4194 +            Class<?>[] parameterTypes = method.getParameterTypes();
4195 +            Object[] args = new Object[parameterTypes.length];
4196 +            // Manufacture boxed primitives for primitive params
4197 +            for (int i = 0; i < args.length; i++) {
4198 +                Class<?> type = parameterTypes[i];
4199 +                if (parameterTypes[i] == boolean.class)
4200 +                    args[i] = false;
4201 +                else if (parameterTypes[i] == int.class)
4202 +                    args[i] = 0;
4203 +                else if (parameterTypes[i] == long.class)
4204 +                    args[i] = 0L;
4205 +            }
4206 +            for (CompletionStage<Integer> stage : stages) {
4207 +                try {
4208 +                    method.invoke(stage, args);
4209 +                    bugs.add(method);
4210 +                }
4211 +                catch (java.lang.reflect.InvocationTargetException expected) {
4212 +                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4213 +                        bugs.add(method);
4214 +                        // expected.getCause().printStackTrace();
4215 +                    }
4216 +                }
4217 +                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4218 +            }
4219 +        }
4220 +        if (!bugs.isEmpty())
4221 +            throw new Error("Methods did not throw UOE: " + bugs);
4222 +    }
4223 +
4224 +    /**
4225 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4226 +     * is completed normally, with the same value, when source is.
4227 +     */
4228 +    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4229 +        for (boolean createIncomplete : new boolean[] { true, false })
4230 +        for (Integer v1 : new Integer[] { 1, null })
4231 +    {
4232 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4233 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4234 +        if (!createIncomplete) assertTrue(f.complete(v1));
4235 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4236 +        if (createIncomplete) {
4237 +            checkIncomplete(f);
4238 +            checkIncomplete(g);
4239 +            assertTrue(f.complete(v1));
4240 +        }
4241 +        checkCompletedNormally(f, v1);
4242 +        checkCompletedNormally(g, v1);
4243 +    }}
4244 +
4245 +    /**
4246 +     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4247 +     * is completed exceptionally when source is.
4248 +     */
4249 +    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4250 +        for (boolean createIncomplete : new boolean[] { true, false })
4251 +    {
4252 +        CFException ex = new CFException();
4253 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4254 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4255 +        if (!createIncomplete) f.completeExceptionally(ex);
4256 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4257 +        if (createIncomplete) {
4258 +            checkIncomplete(f);
4259 +            checkIncomplete(g);
4260 +            f.completeExceptionally(ex);
4261 +        }
4262 +        checkCompletedExceptionally(f, ex);
4263 +        checkCompletedWithWrappedException(g, ex);
4264 +    }}
4265 +
4266 +    /**
4267 +     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4268 +     */
4269 +    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4270 +        for (Integer v1 : new Integer[] { 1, null })
4271 +    {
4272 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4273 +        CompletionStage minimal = f.minimalCompletionStage();
4274 +        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4275 +        assertTrue(g.complete(v1));
4276 +        checkCompletedNormally(g, v1);
4277 +        checkIncomplete(f);
4278 +        checkIncomplete(minimal.toCompletableFuture());
4279 +    }}
4280 +
4281 +    /**
4282 +     * minimalStage.toCompletableFuture().join() awaits completion
4283 +     */
4284 +    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4285 +        for (boolean createIncomplete : new boolean[] { true, false })
4286 +        for (Integer v1 : new Integer[] { 1, null })
4287 +    {
4288 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4289 +        if (!createIncomplete) assertTrue(f.complete(v1));
4290 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4291 +        if (createIncomplete) assertTrue(f.complete(v1));
4292 +        assertEquals(v1, minimal.toCompletableFuture().join());
4293 +        assertEquals(v1, minimal.toCompletableFuture().get());
4294 +        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4295 +    }}
4296 +
4297 +    /**
4298 +     * Completion of a toCompletableFuture copy of a minimal stage
4299 +     * does not complete its source.
4300 +     */
4301 +    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4302 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4303 +        CompletionStage<Integer> g = f.minimalCompletionStage();
4304 +        assertTrue(g.toCompletableFuture().complete(1));
4305 +        assertTrue(g.toCompletableFuture().complete(null));
4306 +        assertTrue(g.toCompletableFuture().cancel(true));
4307 +        assertTrue(g.toCompletableFuture().cancel(false));
4308 +        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4309 +        checkIncomplete(g.toCompletableFuture());
4310 +        f.complete(1);
4311 +        checkCompletedNormally(g.toCompletableFuture(), 1);
4312 +    }
4313 +
4314 +    /** Demo utility method for external reliable toCompletableFuture */
4315 +    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4316 +        CompletableFuture<T> f = new CompletableFuture<>();
4317 +        stage.handle((T t, Throwable ex) -> {
4318 +                         if (ex != null) f.completeExceptionally(ex);
4319 +                         else f.complete(t);
4320 +                         return null;
4321 +                     });
4322 +        return f;
4323 +    }
4324 +
4325 +    /** Demo utility method to join a CompletionStage */
4326 +    static <T> T join(CompletionStage<T> stage) {
4327 +        return toCompletableFuture(stage).join();
4328 +    }
4329 +
4330 +    /**
4331 +     * Joining a minimal stage "by hand" works
4332 +     */
4333 +    public void testMinimalCompletionStage_join_by_hand() {
4334 +        for (boolean createIncomplete : new boolean[] { true, false })
4335 +        for (Integer v1 : new Integer[] { 1, null })
4336 +    {
4337 +        CompletableFuture<Integer> f = new CompletableFuture<>();
4338 +        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4339 +        CompletableFuture<Integer> g = new CompletableFuture<>();
4340 +        if (!createIncomplete) assertTrue(f.complete(v1));
4341 +        minimal.thenAccept(x -> g.complete(x));
4342 +        if (createIncomplete) assertTrue(f.complete(v1));
4343 +        g.join();
4344 +        checkCompletedNormally(g, v1);
4345 +        checkCompletedNormally(f, v1);
4346 +        assertEquals(v1, join(minimal));
4347 +    }}
4348 +
4349 +    static class Monad {
4350 +        static class ZeroException extends RuntimeException {
4351 +            public ZeroException() { super("monadic zero"); }
4352 +        }
4353 +        // "return", "unit"
4354 +        static <T> CompletableFuture<T> unit(T value) {
4355 +            return completedFuture(value);
4356 +        }
4357 +        // monadic zero ?
4358 +        static <T> CompletableFuture<T> zero() {
4359 +            return failedFuture(new ZeroException());
4360 +        }
4361 +        // >=>
4362 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4363 +            (Function<T, CompletableFuture<U>> f,
4364 +             Function<U, CompletableFuture<V>> g) {
4365 +            return x -> f.apply(x).thenCompose(g);
4366 +        }
4367 +
4368 +        static void assertZero(CompletableFuture<?> f) {
4369 +            try {
4370 +                f.getNow(null);
4371 +                throw new AssertionError("should throw");
4372 +            } catch (CompletionException success) {
4373 +                assertTrue(success.getCause() instanceof ZeroException);
4374 +            }
4375 +        }
4376 +
4377 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4378 +                                           CompletableFuture<T> g) {
4379 +            T fval = null, gval = null;
4380 +            Throwable fex = null, gex = null;
4381 +
4382 +            try { fval = f.get(); }
4383 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4384 +            catch (Throwable ex) { fex = ex; }
4385 +
4386 +            try { gval = g.get(); }
4387 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4388 +            catch (Throwable ex) { gex = ex; }
4389 +
4390 +            if (fex != null || gex != null)
4391 +                assertSame(fex.getClass(), gex.getClass());
4392 +            else
4393 +                assertEquals(fval, gval);
4394 +        }
4395 +
4396 +        static class PlusFuture<T> extends CompletableFuture<T> {
4397 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4398 +        }
4399 +
4400 +        /** Implements "monadic plus". */
4401 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4402 +                                             CompletableFuture<? extends T> g) {
4403 +            PlusFuture<T> plus = new PlusFuture<T>();
4404 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4405 +                try {
4406 +                    if (ex == null) {
4407 +                        if (plus.complete(result))
4408 +                            if (plus.firstFailure.get() != null)
4409 +                                plus.firstFailure.set(null);
4410 +                    }
4411 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4412 +                        if (plus.isDone())
4413 +                            plus.firstFailure.set(null);
4414 +                    }
4415 +                    else {
4416 +                        // first failure has precedence
4417 +                        Throwable first = plus.firstFailure.getAndSet(null);
4418 +
4419 +                        // may fail with "Self-suppression not permitted"
4420 +                        try { first.addSuppressed(ex); }
4421 +                        catch (Exception ignored) {}
4422 +
4423 +                        plus.completeExceptionally(first);
4424 +                    }
4425 +                } catch (Throwable unexpected) {
4426 +                    plus.completeExceptionally(unexpected);
4427 +                }
4428 +            };
4429 +            f.whenComplete(action);
4430 +            g.whenComplete(action);
4431 +            return plus;
4432 +        }
4433 +    }
4434 +
4435 +    /**
4436 +     * CompletableFuture is an additive monad - sort of.
4437 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4438 +     */
4439 +    public void testAdditiveMonad() throws Throwable {
4440 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4441 +        CompletableFuture<Long> zero = Monad.zero();
4442 +
4443 +        // Some mutually non-commutative functions
4444 +        Function<Long, CompletableFuture<Long>> triple
4445 +            = x -> Monad.unit(3 * x);
4446 +        Function<Long, CompletableFuture<Long>> inc
4447 +            = x -> Monad.unit(x + 1);
4448 +
4449 +        // unit is a right identity: m >>= unit === m
4450 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4451 +                                 inc.apply(5L));
4452 +        // unit is a left identity: (unit x) >>= f === f x
4453 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4454 +                                 inc.apply(5L));
4455 +
4456 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4457 +        Monad.assertFutureEquals(
4458 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4459 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4460 +
4461 +        // The case for CompletableFuture as an additive monad is weaker...
4462 +
4463 +        // zero is a monadic zero
4464 +        Monad.assertZero(zero);
4465 +
4466 +        // left zero: zero >>= f === zero
4467 +        Monad.assertZero(zero.thenCompose(inc));
4468 +        // right zero: f >>= (\x -> zero) === zero
4469 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4470 +
4471 +        // f plus zero === f
4472 +        Monad.assertFutureEquals(Monad.unit(5L),
4473 +                                 Monad.plus(Monad.unit(5L), zero));
4474 +        // zero plus f === f
4475 +        Monad.assertFutureEquals(Monad.unit(5L),
4476 +                                 Monad.plus(zero, Monad.unit(5L)));
4477 +        // zero plus zero === zero
4478 +        Monad.assertZero(Monad.plus(zero, zero));
4479 +        {
4480 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4481 +                                                   Monad.unit(8L));
4482 +            // non-determinism
4483 +            assertTrue(f.get() == 5L || f.get() == 8L);
4484 +        }
4485 +
4486 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4487 +        // f plus godot === f (doesn't wait for godot)
4488 +        Monad.assertFutureEquals(Monad.unit(5L),
4489 +                                 Monad.plus(Monad.unit(5L), godot));
4490 +        // godot plus f === f (doesn't wait for godot)
4491 +        Monad.assertFutureEquals(Monad.unit(5L),
4492 +                                 Monad.plus(godot, Monad.unit(5L)));
4493 +    }
4494 +
4495 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4496 +    @SuppressWarnings("FutureReturnValueIgnored")
4497 +    public void testRecursiveChains() throws Throwable {
4498 +        for (ExecutionMode m : ExecutionMode.values())
4499 +        for (boolean addDeadEnds : new boolean[] { true, false })
4500 +    {
4501 +        final int val = 42;
4502 +        final int n = expensiveTests ? 1_000 : 2;
4503 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4504 +        CompletableFuture<Integer> tail = head;
4505 +        for (int i = 0; i < n; i++) {
4506 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4507 +            tail = m.thenApply(tail, v -> v + 1);
4508 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4509 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4510 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4511 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4512 +        }
4513 +        head.complete(val);
4514 +        assertEquals(val + 3 * n, (int) tail.join());
4515 +    }}
4516 +
4517 +    /**
4518 +     * A single CompletableFuture with many dependents.
4519 +     * A demo of scalability - runtime is O(n).
4520 +     */
4521 +    @SuppressWarnings("FutureReturnValueIgnored")
4522 +    public void testManyDependents() throws Throwable {
4523 +        final int n = expensiveTests ? 1_000_000 : 10;
4524 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4525 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4526 +        final AtomicInteger count = new AtomicInteger(0);
4527 +        for (int i = 0; i < n; i++) {
4528 +            head.thenRun(() -> count.getAndIncrement());
4529 +            head.thenAccept(x -> count.getAndIncrement());
4530 +            head.thenApply(x -> count.getAndIncrement());
4531 +
4532 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4533 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4534 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4535 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4536 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4537 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4538 +
4539 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4540 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4541 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4542 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4543 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4544 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4545 +        }
4546 +        head.complete(null);
4547 +        assertEquals(5 * 3 * n, count.get());
4548 +    }
4549 +
4550 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4551 +    @SuppressWarnings("FutureReturnValueIgnored")
4552 +    public void testCoCompletionGarbageRetention() throws Throwable {
4553 +        final int n = expensiveTests ? 1_000_000 : 10;
4554 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4555 +        CompletableFuture<Integer> f;
4556 +        for (int i = 0; i < n; i++) {
4557 +            f = new CompletableFuture<>();
4558 +            f.runAfterEither(incomplete, () -> {});
4559 +            f.complete(null);
4560 +
4561 +            f = new CompletableFuture<>();
4562 +            f.acceptEither(incomplete, x -> {});
4563 +            f.complete(null);
4564 +
4565 +            f = new CompletableFuture<>();
4566 +            f.applyToEither(incomplete, x -> x);
4567 +            f.complete(null);
4568 +
4569 +            f = new CompletableFuture<>();
4570 +            CompletableFuture.anyOf(f, incomplete);
4571 +            f.complete(null);
4572 +        }
4573 +
4574 +        for (int i = 0; i < n; i++) {
4575 +            f = new CompletableFuture<>();
4576 +            incomplete.runAfterEither(f, () -> {});
4577 +            f.complete(null);
4578 +
4579 +            f = new CompletableFuture<>();
4580 +            incomplete.acceptEither(f, x -> {});
4581 +            f.complete(null);
4582 +
4583 +            f = new CompletableFuture<>();
4584 +            incomplete.applyToEither(f, x -> x);
4585 +            f.complete(null);
4586 +
4587 +            f = new CompletableFuture<>();
4588 +            CompletableFuture.anyOf(incomplete, f);
4589 +            f.complete(null);
4590 +        }
4591 +    }
4592 +
4593 +    /**
4594 +     * Reproduction recipe for:
4595 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4596 +     * 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
4597 +     */
4598 +    public void testAnyOfGarbageRetention() throws Throwable {
4599 +        for (Integer v : new Integer[] { 1, null })
4600 +    {
4601 +        final int n = expensiveTests ? 100_000 : 10;
4602 +        CompletableFuture<Integer>[] fs
4603 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4604 +        for (int i = 0; i < fs.length; i++)
4605 +            fs[i] = new CompletableFuture<>();
4606 +        fs[fs.length - 1].complete(v);
4607 +        for (int i = 0; i < n; i++)
4608 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4609 +    }}
4610 +
4611 +    /**
4612 +     * Checks for garbage retention with allOf.
4613 +     *
4614 +     * As of 2016-07, fails with OOME:
4615 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4616 +     */
4617 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4618 +        final int n = expensiveTests ? 100_000 : 10;
4619 +        CompletableFuture<Integer>[] fs
4620 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4621 +        for (int i = 0; i < fs.length; i++)
4622 +            fs[i] = new CompletableFuture<>();
4623 +        for (int i = 0; i < n; i++)
4624 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4625 +    }
4626 +
4627 +    /**
4628 +     * Checks for garbage retention when a dependent future is
4629 +     * cancelled and garbage-collected.
4630 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4631 +     *
4632 +     * As of 2016-07, fails with OOME:
4633 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4634 +     */
4635 +    public void testCancelledGarbageRetention() throws Throwable {
4636 +        final int n = expensiveTests ? 100_000 : 10;
4637 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4638 +        for (int i = 0; i < n; i++)
4639 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4640 +    }
4641 +
4642 +    /**
4643 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4644 +     * is invoked many times.
4645 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4646 +     *
4647 +     * As of 2016-07, fails with OOME:
4648 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4649 +     */
4650 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4651 +        final int n = expensiveTests ? 900_000 : 10;
4652 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4653 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4654 +        for (int i = 0; i < n; i++)
4655 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4656 +    }
4657 +
4658 + //     static <U> U join(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.join();
4664 + //     }
4665 +
4666 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4667 + //         CompletableFuture<U> f = new CompletableFuture<>();
4668 + //         stage.whenComplete((v, ex) -> {
4669 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4670 + //         });
4671 + //         return f.isDone();
4672 + //     }
4673 +
4674 + //     static <U> U join2(CompletionStage<U> stage) {
4675 + //         return stage.toCompletableFuture().copy().join();
4676 + //     }
4677 +
4678 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4679 + //         return stage.toCompletableFuture().copy().isDone();
4680 + //     }
4681 +
4682 +    // For testing default implementations
4683 +    // Only non-default interface methods defined.
4684 +    static final class DelegatedCompletionStage<T> implements CompletionStage<T> {
4685 +        final CompletableFuture<T> cf;
4686 +        DelegatedCompletionStage(CompletableFuture<T> cf) { this.cf = cf; }
4687 +        public CompletableFuture<T> toCompletableFuture() {
4688 +            return cf; }
4689 +        public CompletionStage<Void> thenRun
4690 +            (Runnable action) {
4691 +            return cf.thenRun(action); }
4692 +        public CompletionStage<Void> thenRunAsync
4693 +            (Runnable action) {
4694 +            return cf.thenRunAsync(action); }
4695 +        public CompletionStage<Void> thenRunAsync
4696 +            (Runnable action,
4697 +             Executor executor) {
4698 +            return cf.thenRunAsync(action, executor); }
4699 +        public CompletionStage<Void> thenAccept
4700 +            (Consumer<? super T> action) {
4701 +            return cf.thenAccept(action); }
4702 +        public CompletionStage<Void> thenAcceptAsync
4703 +            (Consumer<? super T> action) {
4704 +            return cf.thenAcceptAsync(action); }
4705 +        public CompletionStage<Void> thenAcceptAsync
4706 +            (Consumer<? super T> action,
4707 +             Executor executor) {
4708 +            return cf.thenAcceptAsync(action, executor); }
4709 +        public <U> CompletionStage<U> thenApply
4710 +            (Function<? super T,? extends U> a) {
4711 +            return cf.thenApply(a); }
4712 +        public <U> CompletionStage<U> thenApplyAsync
4713 +            (Function<? super T,? extends U> fn) {
4714 +            return cf.thenApplyAsync(fn); }
4715 +        public <U> CompletionStage<U> thenApplyAsync
4716 +            (Function<? super T,? extends U> fn,
4717 +             Executor executor) {
4718 +            return cf.thenApplyAsync(fn, executor); }
4719 +        public <U,V> CompletionStage<V> thenCombine
4720 +            (CompletionStage<? extends U> other,
4721 +             BiFunction<? super T,? super U,? extends V> fn) {
4722 +            return cf.thenCombine(other, fn); }
4723 +        public <U,V> CompletionStage<V> thenCombineAsync
4724 +            (CompletionStage<? extends U> other,
4725 +             BiFunction<? super T,? super U,? extends V> fn) {
4726 +            return cf.thenCombineAsync(other, fn); }
4727 +        public <U,V> CompletionStage<V> thenCombineAsync
4728 +            (CompletionStage<? extends U> other,
4729 +             BiFunction<? super T,? super U,? extends V> fn,
4730 +             Executor executor) {
4731 +            return cf.thenCombineAsync(other, fn, executor); }
4732 +        public <U> CompletionStage<Void> thenAcceptBoth
4733 +            (CompletionStage<? extends U> other,
4734 +             BiConsumer<? super T, ? super U> action) {
4735 +            return cf.thenAcceptBoth(other, action); }
4736 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4737 +            (CompletionStage<? extends U> other,
4738 +             BiConsumer<? super T, ? super U> action) {
4739 +            return cf.thenAcceptBothAsync(other, action); }
4740 +        public <U> CompletionStage<Void> thenAcceptBothAsync
4741 +            (CompletionStage<? extends U> other,
4742 +             BiConsumer<? super T, ? super U> action,
4743 +             Executor executor) {
4744 +            return cf.thenAcceptBothAsync(other, action, executor); }
4745 +        public CompletionStage<Void> runAfterBoth
4746 +            (CompletionStage<?> other,
4747 +             Runnable action) {
4748 +            return cf.runAfterBoth(other, action); }
4749 +        public CompletionStage<Void> runAfterBothAsync
4750 +            (CompletionStage<?> other,
4751 +             Runnable action) {
4752 +            return cf.runAfterBothAsync(other, action); }
4753 +        public CompletionStage<Void> runAfterBothAsync
4754 +            (CompletionStage<?> other,
4755 +             Runnable action,
4756 +             Executor executor) {
4757 +            return cf.runAfterBothAsync(other, action, executor); }
4758 +        public <U> CompletionStage<U> applyToEither
4759 +            (CompletionStage<? extends T> other,
4760 +             Function<? super T, U> fn) {
4761 +            return cf.applyToEither(other, fn); }
4762 +        public <U> CompletionStage<U> applyToEitherAsync
4763 +            (CompletionStage<? extends T> other,
4764 +             Function<? super T, U> fn) {
4765 +            return cf.applyToEitherAsync(other, fn); }
4766 +        public <U> CompletionStage<U> applyToEitherAsync
4767 +            (CompletionStage<? extends T> other,
4768 +             Function<? super T, U> fn,
4769 +             Executor executor) {
4770 +            return cf.applyToEitherAsync(other, fn, executor); }
4771 +        public CompletionStage<Void> acceptEither
4772 +            (CompletionStage<? extends T> other,
4773 +             Consumer<? super T> action) {
4774 +            return cf.acceptEither(other, action); }
4775 +        public CompletionStage<Void> acceptEitherAsync
4776 +            (CompletionStage<? extends T> other,
4777 +             Consumer<? super T> action) {
4778 +            return cf.acceptEitherAsync(other, action); }
4779 +        public CompletionStage<Void> acceptEitherAsync
4780 +            (CompletionStage<? extends T> other,
4781 +             Consumer<? super T> action,
4782 +             Executor executor) {
4783 +            return cf.acceptEitherAsync(other, action, executor); }
4784 +        public CompletionStage<Void> runAfterEither
4785 +            (CompletionStage<?> other,
4786 +             Runnable action) {
4787 +            return cf.runAfterEither(other, action); }
4788 +        public CompletionStage<Void> runAfterEitherAsync
4789 +            (CompletionStage<?> other,
4790 +             Runnable action) {
4791 +            return cf.runAfterEitherAsync(other, action); }
4792 +        public CompletionStage<Void> runAfterEitherAsync
4793 +            (CompletionStage<?> other,
4794 +             Runnable action,
4795 +             Executor executor) {
4796 +            return cf.runAfterEitherAsync(other, action, executor); }
4797 +        public <U> CompletionStage<U> thenCompose
4798 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4799 +            return cf.thenCompose(fn); }
4800 +        public <U> CompletionStage<U> thenComposeAsync
4801 +            (Function<? super T, ? extends CompletionStage<U>> fn) {
4802 +            return cf.thenComposeAsync(fn); }
4803 +        public <U> CompletionStage<U> thenComposeAsync
4804 +            (Function<? super T, ? extends CompletionStage<U>> fn,
4805 +             Executor executor) {
4806 +            return cf.thenComposeAsync(fn, executor); }
4807 +        public <U> CompletionStage<U> handle
4808 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4809 +            return cf.handle(fn); }
4810 +        public <U> CompletionStage<U> handleAsync
4811 +            (BiFunction<? super T, Throwable, ? extends U> fn) {
4812 +            return cf.handleAsync(fn); }
4813 +        public <U> CompletionStage<U> handleAsync
4814 +            (BiFunction<? super T, Throwable, ? extends U> fn,
4815 +             Executor executor) {
4816 +            return cf.handleAsync(fn, executor); }
4817 +        public CompletionStage<T> whenComplete
4818 +            (BiConsumer<? super T, ? super Throwable> action) {
4819 +            return cf.whenComplete(action); }
4820 +        public CompletionStage<T> whenCompleteAsync
4821 +            (BiConsumer<? super T, ? super Throwable> action) {
4822 +            return cf.whenCompleteAsync(action); }
4823 +        public CompletionStage<T> whenCompleteAsync
4824 +            (BiConsumer<? super T, ? super Throwable> action,
4825 +             Executor executor) {
4826 +            return cf.whenCompleteAsync(action, executor); }
4827 +        public CompletionStage<T> exceptionally
4828 +            (Function<Throwable, ? extends T> fn) {
4829 +            return cf.exceptionally(fn); }
4830 +    }
4831 +
4832 +    /**
4833 +     * default-implemented exceptionallyAsync action is not invoked when
4834 +     * source completes normally, and source result is propagated
4835 +     */
4836 +    public void testDefaultExceptionallyAsync_normalCompletion() {
4837 +        for (boolean createIncomplete : new boolean[] { true, false })
4838 +        for (Integer v1 : new Integer[] { 1, null })
4839 +    {
4840 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
4841 +        final DelegatedCompletionStage<Integer> d =
4842 +            new DelegatedCompletionStage<Integer>(f);
4843 +        if (!createIncomplete) assertTrue(f.complete(v1));
4844 +        final CompletionStage<Integer> g = d.exceptionallyAsync
4845 +            ((Throwable t) -> {
4846 +                threadFail("should not be called");
4847 +                return null;            // unreached
4848 +            });
4849 +        if (createIncomplete) assertTrue(f.complete(v1));
4850 +
4851 +        checkCompletedNormally(g.toCompletableFuture(), v1);
4852 +    }}
4853 +
4854 +    /**
4855 +     * default-implemented exceptionallyAsync action completes with
4856 +     * function value on source exception
4857 +     */
4858 +    public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4859          for (boolean createIncomplete : new boolean[] { true, false })
4860          for (Integer v1 : new Integer[] { 1, null })
4861      {
4862          final AtomicInteger a = new AtomicInteger(0);
4863          final CFException ex = new CFException();
4864          final CompletableFuture<Integer> f = new CompletableFuture<>();
4865 +        final DelegatedCompletionStage<Integer> d =
4866 +            new DelegatedCompletionStage<Integer>(f);
4867          if (!createIncomplete) f.completeExceptionally(ex);
4868 <        final CompletableFuture<Integer> g = m.whenComplete
4869 <            (f,
2855 <             (Integer x, Throwable t) -> {
2856 <                threadAssertNull(x);
4868 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4869 >            ((Throwable t) -> {
4870                  threadAssertSame(t, ex);
4871                  a.getAndIncrement();
4872 +                return v1;
4873              });
4874          if (createIncomplete) f.completeExceptionally(ex);
4875 <        checkCompletedWithWrappedCFException(f, ex);
4876 <        checkCompletedWithWrappedCFException(g, ex);
4875 >
4876 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4877          assertEquals(1, a.get());
4878      }}
4879  
4880      /**
4881 <     * whenComplete action executes on cancelled source, propagating
4882 <     * CancellationException.
4881 >     * Under default implementation, if an "exceptionally action"
4882 >     * throws an exception, it completes exceptionally with that
4883 >     * exception
4884       */
4885 <    public void testWhenComplete_sourceCancelled() {
2871 <        for (ExecutionMode m : ExecutionMode.values())
2872 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4885 >    public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() {
4886          for (boolean createIncomplete : new boolean[] { true, false })
4887      {
4888          final AtomicInteger a = new AtomicInteger(0);
4889 +        final CFException ex1 = new CFException();
4890 +        final CFException ex2 = new CFException();
4891          final CompletableFuture<Integer> f = new CompletableFuture<>();
4892 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4893 <        final CompletableFuture<Integer> g = m.whenComplete
4894 <            (f,
4895 <             (Integer x, Throwable t) -> {
4896 <                threadAssertNull(x);
4897 <                threadAssertTrue(t instanceof CancellationException);
4892 >        final DelegatedCompletionStage<Integer> d =
4893 >            new DelegatedCompletionStage<Integer>(f);
4894 >        if (!createIncomplete) f.completeExceptionally(ex1);
4895 >        final CompletionStage<Integer> g = d.exceptionallyAsync
4896 >            ((Throwable t) -> {
4897 >                threadAssertSame(t, ex1);
4898                  a.getAndIncrement();
4899 +                throw ex2;
4900              });
4901 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
4901 >        if (createIncomplete) f.completeExceptionally(ex1);
4902  
4903 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
4904 <        checkCompletedWithWrappedCancellationException(g);
4905 <        checkCancelled(f);
4903 >        checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4904 >        checkCompletedExceptionally(f, ex1);
4905 >        checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4906          assertEquals(1, a.get());
4907      }}
4908  
4909      /**
4910 <     * If a whenComplete action throws an exception when triggered by
4911 <     * a normal completion, it completes exceptionally
4910 >     * default exceptionallyCompose result completes normally after normal
4911 >     * completion of source
4912       */
4913 <    public void testWhenComplete_actionFailed() {
4913 >    public void testDefaultExceptionallyCompose_normalCompletion() {
4914          for (boolean createIncomplete : new boolean[] { true, false })
2899        for (ExecutionMode m : ExecutionMode.values())
4915          for (Integer v1 : new Integer[] { 1, null })
4916      {
4917 <        final AtomicInteger a = new AtomicInteger(0);
4917 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4918 >        final ExceptionalCompletableFutureFunction r =
4919 >            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4920 >        final DelegatedCompletionStage<Integer> d =
4921 >            new DelegatedCompletionStage<Integer>(f);
4922 >        if (!createIncomplete) assertTrue(f.complete(v1));
4923 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4924 >        if (createIncomplete) assertTrue(f.complete(v1));
4925 >
4926 >        checkCompletedNormally(f, v1);
4927 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4928 >        r.assertNotInvoked();
4929 >    }}
4930 >
4931 >    /**
4932 >     * default-implemented exceptionallyCompose result completes
4933 >     * normally after exceptional completion of source
4934 >     */
4935 >    public void testDefaultExceptionallyCompose_exceptionalCompletion() {
4936 >        for (boolean createIncomplete : new boolean[] { true, false })
4937 >    {
4938          final CFException ex = new CFException();
4939 +        final ExceptionalCompletableFutureFunction r =
4940 +            new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4941          final CompletableFuture<Integer> f = new CompletableFuture<>();
4942 <        if (!createIncomplete) f.complete(v1);
4943 <        final CompletableFuture<Integer> g = m.whenComplete
4944 <            (f,
4945 <             (Integer x, Throwable t) -> {
4946 <                threadAssertSame(x, v1);
4947 <                threadAssertNull(t);
4948 <                a.getAndIncrement();
4949 <                throw ex;
4950 <            });
4951 <        if (createIncomplete) f.complete(v1);
4942 >        final DelegatedCompletionStage<Integer> d =
4943 >            new DelegatedCompletionStage<Integer>(f);
4944 >        if (!createIncomplete) f.completeExceptionally(ex);
4945 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4946 >        if (createIncomplete) f.completeExceptionally(ex);
4947 >
4948 >        checkCompletedExceptionally(f, ex);
4949 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
4950 >        r.assertInvoked();
4951 >    }}
4952 >
4953 >    /**
4954 >     * default-implemented exceptionallyCompose completes
4955 >     * exceptionally on exception if action does
4956 >     */
4957 >    public void testDefaultExceptionallyCompose_actionFailed() {
4958 >        for (boolean createIncomplete : new boolean[] { true, false })
4959 >        for (Integer v1 : new Integer[] { 1, null })
4960 >    {
4961 >        final CFException ex = new CFException();
4962 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4963 >        final FailingExceptionalCompletableFutureFunction r
4964 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4965 >        final DelegatedCompletionStage<Integer> d =
4966 >            new DelegatedCompletionStage<Integer>(f);
4967 >        if (!createIncomplete) f.completeExceptionally(ex);
4968 >        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4969 >        if (createIncomplete) f.completeExceptionally(ex);
4970 >
4971 >        checkCompletedExceptionally(f, ex);
4972 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
4973 >        r.assertInvoked();
4974 >    }}
4975 >
4976 >    /**
4977 >     * default exceptionallyComposeAsync result completes normally after normal
4978 >     * completion of source
4979 >     */
4980 >    public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4981 >        for (boolean createIncomplete : new boolean[] { true, false })
4982 >        for (Integer v1 : new Integer[] { 1, null })
4983 >    {
4984 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
4985 >        final ExceptionalCompletableFutureFunction r =
4986 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4987 >        final DelegatedCompletionStage<Integer> d =
4988 >            new DelegatedCompletionStage<Integer>(f);
4989 >        if (!createIncomplete) assertTrue(f.complete(v1));
4990 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4991 >        if (createIncomplete) assertTrue(f.complete(v1));
4992 >
4993          checkCompletedNormally(f, v1);
4994 <        checkCompletedWithWrappedCFException(g, ex);
4995 <        assertEquals(1, a.get());
4994 >        checkCompletedNormally(g.toCompletableFuture(), v1);
4995 >        r.assertNotInvoked();
4996      }}
4997  
4998      /**
4999 <     * If a whenComplete action throws an exception when triggered by
5000 <     * a source completion that also throws an exception, the source
2923 <     * exception takes precedence.
4999 >     * default-implemented exceptionallyComposeAsync result completes
5000 >     * normally after exceptional completion of source
5001       */
5002 <    public void testWhenComplete_actionFailedSourceFailed() {
5002 >    public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() {
5003 >        for (boolean createIncomplete : new boolean[] { true, false })
5004 >    {
5005 >        final CFException ex = new CFException();
5006 >        final ExceptionalCompletableFutureFunction r =
5007 >            new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5008 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5009 >        final DelegatedCompletionStage<Integer> d =
5010 >            new DelegatedCompletionStage<Integer>(f);
5011 >        if (!createIncomplete) f.completeExceptionally(ex);
5012 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5013 >        if (createIncomplete) f.completeExceptionally(ex);
5014 >
5015 >        checkCompletedExceptionally(f, ex);
5016 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5017 >        r.assertInvoked();
5018 >    }}
5019 >
5020 >    /**
5021 >     * default-implemented exceptionallyComposeAsync completes
5022 >     * exceptionally on exception if action does
5023 >     */
5024 >    public void testDefaultExceptionallyComposeAsync_actionFailed() {
5025          for (boolean createIncomplete : new boolean[] { true, false })
2927        for (ExecutionMode m : ExecutionMode.values())
5026          for (Integer v1 : new Integer[] { 1, null })
5027      {
5028 <        final AtomicInteger a = new AtomicInteger(0);
2931 <        final CFException ex1 = new CFException();
2932 <        final CFException ex2 = new CFException();
5028 >        final CFException ex = new CFException();
5029          final CompletableFuture<Integer> f = new CompletableFuture<>();
5030 +        final FailingExceptionalCompletableFutureFunction r
5031 +            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5032 +        final DelegatedCompletionStage<Integer> d =
5033 +            new DelegatedCompletionStage<Integer>(f);
5034 +        if (!createIncomplete) f.completeExceptionally(ex);
5035 +        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5036 +        if (createIncomplete) f.completeExceptionally(ex);
5037  
5038 <        if (!createIncomplete) f.completeExceptionally(ex1);
5039 <        final CompletableFuture<Integer> g = m.whenComplete
5040 <            (f,
5041 <             (Integer x, Throwable t) -> {
2939 <                threadAssertSame(t, ex1);
2940 <                threadAssertNull(x);
2941 <                a.getAndIncrement();
2942 <                throw ex2;
2943 <            });
2944 <        if (createIncomplete) f.completeExceptionally(ex1);
5038 >        checkCompletedExceptionally(f, ex);
5039 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5040 >        r.assertInvoked();
5041 >    }}
5042  
5043 <        checkCompletedWithWrappedCFException(f, ex1);
5044 <        checkCompletedWithWrappedCFException(g, ex1);
5045 <        assertEquals(1, a.get());
5043 >
5044 >    /**
5045 >     * default exceptionallyComposeAsync result completes normally after normal
5046 >     * completion of source
5047 >     */
5048 >    public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5049 >        for (boolean createIncomplete : new boolean[] { true, false })
5050 >        for (Integer v1 : new Integer[] { 1, null })
5051 >    {
5052 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5053 >        final ExceptionalCompletableFutureFunction r =
5054 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5055 >        final DelegatedCompletionStage<Integer> d =
5056 >            new DelegatedCompletionStage<Integer>(f);
5057 >        if (!createIncomplete) assertTrue(f.complete(v1));
5058 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5059 >        if (createIncomplete) assertTrue(f.complete(v1));
5060 >
5061 >        checkCompletedNormally(f, v1);
5062 >        checkCompletedNormally(g.toCompletableFuture(), v1);
5063 >        r.assertNotInvoked();
5064 >    }}
5065 >
5066 >    /**
5067 >     * default-implemented exceptionallyComposeAsync result completes
5068 >     * normally after exceptional completion of source
5069 >     */
5070 >    public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() {
5071 >        for (boolean createIncomplete : new boolean[] { true, false })
5072 >    {
5073 >        final CFException ex = new CFException();
5074 >        final ExceptionalCompletableFutureFunction r =
5075 >            new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5076 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5077 >        final DelegatedCompletionStage<Integer> d =
5078 >            new DelegatedCompletionStage<Integer>(f);
5079 >        if (!createIncomplete) f.completeExceptionally(ex);
5080 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5081 >        if (createIncomplete) f.completeExceptionally(ex);
5082 >
5083 >        checkCompletedExceptionally(f, ex);
5084 >        checkCompletedNormally(g.toCompletableFuture(), r.value);
5085 >        r.assertInvoked();
5086 >    }}
5087 >
5088 >    /**
5089 >     * default-implemented exceptionallyComposeAsync completes
5090 >     * exceptionally on exception if action does
5091 >     */
5092 >    public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() {
5093 >        for (boolean createIncomplete : new boolean[] { true, false })
5094 >        for (Integer v1 : new Integer[] { 1, null })
5095 >    {
5096 >        final CFException ex = new CFException();
5097 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
5098 >        final FailingExceptionalCompletableFutureFunction r
5099 >            = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5100 >        final DelegatedCompletionStage<Integer> d =
5101 >            new DelegatedCompletionStage<Integer>(f);
5102 >        if (!createIncomplete) f.completeExceptionally(ex);
5103 >        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5104 >        if (createIncomplete) f.completeExceptionally(ex);
5105 >
5106 >        checkCompletedExceptionally(f, ex);
5107 >        checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex);
5108 >        r.assertInvoked();
5109      }}
5110  
5111   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines