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.58 by jsr166, Mon Jun 2 23:10:08 2014 UTC vs.
Revision 1.190 by jsr166, Wed Nov 8 02:21:43 2017 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.AssertionFailedError;
45 + import junit.framework.Test;
46 + import junit.framework.TestSuite;
47  
48   public class CompletableFutureTest extends JSR166TestCase {
49  
50      public static void main(String[] args) {
51 <        junit.textui.TestRunner.run(suite());
51 >        main(suite(), args);
52      }
53      public static Test suite() {
54          return new TestSuite(CompletableFutureTest.class);
# Line 44 | Line 59 | public class CompletableFutureTest exten
59      void checkIncomplete(CompletableFuture<?> f) {
60          assertFalse(f.isDone());
61          assertFalse(f.isCancelled());
62 <        assertTrue(f.toString().contains("[Not completed]"));
62 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
63          try {
64              assertNull(f.getNow(null));
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
66          try {
67 <            f.get(0L, SECONDS);
67 >            f.get(randomExpiredTimeout(), randomTimeUnit());
68              shouldThrow();
69          }
70          catch (TimeoutException success) {}
# Line 57 | Line 72 | public class CompletableFutureTest exten
72      }
73  
74      <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
75 <        try {
76 <            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
75 >        checkTimedGet(f, value);
76 >
77          try {
78              assertEquals(value, f.join());
65        } catch (Throwable fail) { threadUnexpectedException(fail); }
66        try {
79              assertEquals(value, f.getNow(null));
68        } catch (Throwable fail) { threadUnexpectedException(fail); }
69        try {
80              assertEquals(value, f.get());
81          } catch (Throwable fail) { threadUnexpectedException(fail); }
82          assertTrue(f.isDone());
83          assertFalse(f.isCancelled());
84          assertFalse(f.isCompletedExceptionally());
85 <        assertTrue(f.toString().contains("[Completed normally]"));
85 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
86      }
87  
88 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
89 <        try {
90 <            f.get(LONG_DELAY_MS, MILLISECONDS);
91 <            shouldThrow();
92 <        } catch (ExecutionException success) {
93 <            assertTrue(success.getCause() instanceof CFException);
94 <        } catch (Throwable fail) { threadUnexpectedException(fail); }
95 <        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]"));
88 >    /**
89 >     * Returns the "raw" internal exceptional completion of f,
90 >     * without any additional wrapping with CompletionException.
91 >     */
92 >    Throwable exceptionalCompletion(CompletableFuture<?> f) {
93 >        // handle (and whenComplete and exceptionally) can distinguish
94 >        // between "direct" and "wrapped" exceptional completion
95 >        return f.handle((u, t) -> t).join();
96      }
97  
98 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
99 <                                              CFException ex) {
98 >    void checkCompletedExceptionally(CompletableFuture<?> f,
99 >                                     boolean wrapped,
100 >                                     Consumer<Throwable> checker) {
101 >        Throwable cause = exceptionalCompletion(f);
102 >        if (wrapped) {
103 >            assertTrue(cause instanceof CompletionException);
104 >            cause = cause.getCause();
105 >        }
106 >        checker.accept(cause);
107 >
108 >        long startTime = System.nanoTime();
109          try {
110              f.get(LONG_DELAY_MS, MILLISECONDS);
111              shouldThrow();
112          } catch (ExecutionException success) {
113 <            assertSame(ex, success.getCause());
113 >            assertSame(cause, success.getCause());
114          } catch (Throwable fail) { threadUnexpectedException(fail); }
115 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
116 +
117          try {
118              f.join();
119              shouldThrow();
120          } catch (CompletionException success) {
121 <            assertSame(ex, success.getCause());
122 <        }
121 >            assertSame(cause, success.getCause());
122 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
123 >
124          try {
125              f.getNow(null);
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.get();
133              shouldThrow();
134          } catch (ExecutionException success) {
135 <            assertSame(ex, success.getCause());
135 >            assertSame(cause, success.getCause());
136          } catch (Throwable fail) { threadUnexpectedException(fail); }
137 <        assertTrue(f.isDone());
137 >
138          assertFalse(f.isCancelled());
139 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
139 >        assertTrue(f.isDone());
140 >        assertTrue(f.isCompletedExceptionally());
141 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
142 >    }
143 >
144 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
145 >        checkCompletedExceptionally(f, true,
146 >            t -> assertTrue(t instanceof CFException));
147 >    }
148 >
149 >    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
150 >        checkCompletedExceptionally(f, true,
151 >            t -> assertTrue(t instanceof CancellationException));
152 >    }
153 >
154 >    void checkCompletedWithTimeoutException(CompletableFuture<?> f) {
155 >        checkCompletedExceptionally(f, false,
156 >            t -> assertTrue(t instanceof TimeoutException));
157 >    }
158 >
159 >    void checkCompletedWithWrappedException(CompletableFuture<?> f,
160 >                                            Throwable ex) {
161 >        checkCompletedExceptionally(f, true, t -> assertSame(t, ex));
162 >    }
163 >
164 >    void checkCompletedExceptionally(CompletableFuture<?> f, Throwable ex) {
165 >        checkCompletedExceptionally(f, false, t -> assertSame(t, ex));
166      }
167  
168      void checkCancelled(CompletableFuture<?> f) {
169 +        long startTime = System.nanoTime();
170          try {
171              f.get(LONG_DELAY_MS, MILLISECONDS);
172              shouldThrow();
173          } catch (CancellationException success) {
174          } catch (Throwable fail) { threadUnexpectedException(fail); }
175 +        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
176 +
177          try {
178              f.join();
179              shouldThrow();
# Line 155 | Line 187 | public class CompletableFutureTest exten
187              shouldThrow();
188          } catch (CancellationException success) {
189          } 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    }
190  
191 <    void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
192 <        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); }
191 >        assertTrue(exceptionalCompletion(f) instanceof CancellationException);
192 >
193          assertTrue(f.isDone());
190        assertFalse(f.isCancelled());
194          assertTrue(f.isCompletedExceptionally());
195 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
195 >        assertTrue(f.isCancelled());
196 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
197      }
198  
199      /**
# Line 206 | Line 210 | public class CompletableFutureTest exten
210       * isCancelled, join, get, and getNow
211       */
212      public void testComplete() {
213 +        for (Integer v1 : new Integer[] { 1, null })
214 +    {
215          CompletableFuture<Integer> f = new CompletableFuture<>();
216          checkIncomplete(f);
217 <        f.complete(one);
218 <        checkCompletedNormally(f, one);
219 <    }
217 >        assertTrue(f.complete(v1));
218 >        assertFalse(f.complete(v1));
219 >        checkCompletedNormally(f, v1);
220 >    }}
221  
222      /**
223       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 225 | public class CompletableFutureTest exten
225       */
226      public void testCompleteExceptionally() {
227          CompletableFuture<Integer> f = new CompletableFuture<>();
228 +        CFException ex = new CFException();
229          checkIncomplete(f);
230 <        f.completeExceptionally(new CFException());
231 <        checkCompletedWithWrappedCFException(f);
230 >        f.completeExceptionally(ex);
231 >        checkCompletedExceptionally(f, ex);
232      }
233  
234      /**
# Line 228 | Line 236 | public class CompletableFutureTest exten
236       * methods isDone, isCancelled, join, get, and getNow
237       */
238      public void testCancel() {
239 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
240 +    {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242          checkIncomplete(f);
243 <        assertTrue(f.cancel(true));
243 >        assertTrue(f.cancel(mayInterruptIfRunning));
244 >        assertTrue(f.cancel(mayInterruptIfRunning));
245 >        assertTrue(f.cancel(!mayInterruptIfRunning));
246          checkCancelled(f);
247 <    }
247 >    }}
248  
249      /**
250       * obtrudeValue forces completion with given value
# Line 240 | Line 252 | public class CompletableFutureTest exten
252      public void testObtrudeValue() {
253          CompletableFuture<Integer> f = new CompletableFuture<>();
254          checkIncomplete(f);
255 <        f.complete(one);
255 >        assertTrue(f.complete(one));
256          checkCompletedNormally(f, one);
257          f.obtrudeValue(three);
258          checkCompletedNormally(f, three);
# Line 261 | Line 273 | public class CompletableFutureTest exten
273       * obtrudeException forces completion with given exception
274       */
275      public void testObtrudeException() {
276 <        CompletableFuture<Integer> f = new CompletableFuture<>();
277 <        checkIncomplete(f);
278 <        f.complete(one);
279 <        checkCompletedNormally(f, one);
280 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
276 >        for (Integer v1 : new Integer[] { 1, null })
277 >    {
278 >        CFException ex;
279 >        CompletableFuture<Integer> f;
280 >
281          f = new CompletableFuture<>();
282 <        f.obtrudeException(new CFException());
283 <        checkCompletedWithWrappedCFException(f);
282 >        assertTrue(f.complete(v1));
283 >        for (int i = 0; i < 2; i++) {
284 >            f.obtrudeException(ex = new CFException());
285 >            checkCompletedExceptionally(f, ex);
286 >        }
287 >
288 >        f = new CompletableFuture<>();
289 >        for (int i = 0; i < 2; i++) {
290 >            f.obtrudeException(ex = new CFException());
291 >            checkCompletedExceptionally(f, ex);
292 >        }
293 >
294          f = new CompletableFuture<>();
295 +        f.completeExceptionally(ex = new CFException());
296 +        f.obtrudeValue(v1);
297 +        checkCompletedNormally(f, v1);
298 +        f.obtrudeException(ex = new CFException());
299 +        checkCompletedExceptionally(f, ex);
300          f.completeExceptionally(new CFException());
301 <        f.obtrudeValue(four);
302 <        checkCompletedNormally(f, four);
303 <        f.obtrudeException(new CFException());
304 <        checkCompletedWithWrappedCFException(f);
279 <    }
301 >        checkCompletedExceptionally(f, ex);
302 >        assertFalse(f.complete(v1));
303 >        checkCompletedExceptionally(f, ex);
304 >    }}
305  
306      /**
307       * getNumberOfDependents returns number of dependent tasks
308       */
309      public void testGetNumberOfDependents() {
310 +        for (ExecutionMode m : ExecutionMode.values())
311 +        for (Integer v1 : new Integer[] { 1, null })
312 +    {
313          CompletableFuture<Integer> f = new CompletableFuture<>();
314          assertEquals(0, f.getNumberOfDependents());
315 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
315 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
316          assertEquals(1, f.getNumberOfDependents());
317          assertEquals(0, g.getNumberOfDependents());
318 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
318 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
319          assertEquals(2, f.getNumberOfDependents());
320 <        f.complete(1);
320 >        assertEquals(0, h.getNumberOfDependents());
321 >        assertTrue(f.complete(v1));
322          checkCompletedNormally(g, null);
323 +        checkCompletedNormally(h, null);
324          assertEquals(0, f.getNumberOfDependents());
325          assertEquals(0, g.getNumberOfDependents());
326 <    }
326 >        assertEquals(0, h.getNumberOfDependents());
327 >    }}
328  
329      /**
330       * toString indicates current completion state
331       */
332 <    public void testToString() {
333 <        CompletableFuture<String> f;
334 <
335 <        f = new CompletableFuture<String>();
336 <        assertTrue(f.toString().contains("[Not completed]"));
337 <
338 <        f.complete("foo");
339 <        assertTrue(f.toString().contains("[Completed normally]"));
340 <
341 <        f = new CompletableFuture<String>();
342 <        f.completeExceptionally(new IndexOutOfBoundsException());
343 <        assertTrue(f.toString().contains("[Completed exceptionally]"));
332 >    public void testToString_incomplete() {
333 >        CompletableFuture<String> f = new CompletableFuture<String>();
334 >        assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
335 >        if (testImplementationDetails)
336 >            assertEquals(identityString(f) + "[Not completed]",
337 >                         f.toString());
338 >    }
339 >
340 >    public void testToString_normal() {
341 >        CompletableFuture<String> f = new CompletableFuture<String>();
342 >        assertTrue(f.complete("foo"));
343 >        assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
344 >        if (testImplementationDetails)
345 >            assertEquals(identityString(f) + "[Completed normally]",
346 >                         f.toString());
347 >    }
348 >
349 >    public void testToString_exception() {
350 >        CompletableFuture<String> f = new CompletableFuture<String>();
351 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
352 >        assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
353 >        if (testImplementationDetails)
354 >            assertTrue(f.toString().startsWith(
355 >                               identityString(f) + "[Completed exceptionally: "));
356 >    }
357 >
358 >    public void testToString_cancelled() {
359 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
360 >            CompletableFuture<String> f = new CompletableFuture<String>();
361 >            assertTrue(f.cancel(mayInterruptIfRunning));
362 >            assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]"));
363 >            if (testImplementationDetails)
364 >                assertTrue(f.toString().startsWith(
365 >                                   identityString(f) + "[Completed exceptionally: "));
366 >        }
367      }
368  
369      /**
# Line 320 | Line 374 | public class CompletableFutureTest exten
374          checkCompletedNormally(f, "test");
375      }
376  
377 <    // Choose non-commutative actions for better coverage
378 <
379 <    // A non-commutative function that handles and produces null values as well.
380 <    static Integer subtract(Integer x, Integer y) {
381 <        return (x == null && y == null) ? null :
382 <            ((x == null) ? 42 : x.intValue())
383 <            - ((y == null) ? 99 : y.intValue());
377 >    abstract static class CheckedAction {
378 >        int invocationCount = 0;
379 >        final ExecutionMode m;
380 >        CheckedAction(ExecutionMode m) { this.m = m; }
381 >        void invoked() {
382 >            m.checkExecutionMode();
383 >            assertEquals(0, invocationCount++);
384 >        }
385 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
386 >        void assertInvoked() { assertEquals(1, invocationCount); }
387      }
388  
389 <    // A function that handles and produces null values as well.
390 <    static Integer inc(Integer x) {
391 <        return (x == null) ? null : x + 1;
389 >    abstract static class CheckedIntegerAction extends CheckedAction {
390 >        Integer value;
391 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
392 >        void assertValue(Integer expected) {
393 >            assertInvoked();
394 >            assertEquals(expected, value);
395 >        }
396      }
397  
398 <    static final class IntegerSupplier implements Supplier<Integer> {
399 <        final ExecutionMode m;
400 <        int invocationCount = 0;
398 >    static class IntegerSupplier extends CheckedAction
399 >        implements Supplier<Integer>
400 >    {
401          final Integer value;
402          IntegerSupplier(ExecutionMode m, Integer value) {
403 <            this.m = m;
403 >            super(m);
404              this.value = value;
405          }
406          public Integer get() {
407 <            m.checkExecutionMode();
347 <            invocationCount++;
407 >            invoked();
408              return value;
409          }
410      }
411 <        
412 <    static final class IncAction implements Consumer<Integer> {
413 <        int invocationCount = 0;
414 <        Integer value;
411 >
412 >    // A function that handles and produces null values as well.
413 >    static Integer inc(Integer x) {
414 >        return (x == null) ? null : x + 1;
415 >    }
416 >
417 >    static class NoopConsumer extends CheckedIntegerAction
418 >        implements Consumer<Integer>
419 >    {
420 >        NoopConsumer(ExecutionMode m) { super(m); }
421          public void accept(Integer x) {
422 <            invocationCount++;
423 <            value = inc(x);
422 >            invoked();
423 >            value = x;
424          }
425      }
426 <    static final class IncFunction implements Function<Integer,Integer> {
427 <        final ExecutionMode m;
428 <        int invocationCount = 0;
429 <        Integer value;
430 <        IncFunction(ExecutionMode m) { this.m = m; }
426 >
427 >    static class IncFunction extends CheckedIntegerAction
428 >        implements Function<Integer,Integer>
429 >    {
430 >        IncFunction(ExecutionMode m) { super(m); }
431          public Integer apply(Integer x) {
432 <            m.checkExecutionMode();
367 <            invocationCount++;
432 >            invoked();
433              return value = inc(x);
434          }
435      }
436 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
437 <        final ExecutionMode m;
438 <        int invocationCount = 0;
439 <        Integer value;
440 <        // Check this action was invoked exactly once when result is computed.
441 <        SubtractAction(ExecutionMode m) { this.m = m; }
436 >
437 >    // Choose non-commutative actions for better coverage
438 >    // A non-commutative function that handles and produces null values as well.
439 >    static Integer subtract(Integer x, Integer y) {
440 >        return (x == null && y == null) ? null :
441 >            ((x == null) ? 42 : x.intValue())
442 >            - ((y == null) ? 99 : y.intValue());
443 >    }
444 >
445 >    static class SubtractAction extends CheckedIntegerAction
446 >        implements BiConsumer<Integer, Integer>
447 >    {
448 >        SubtractAction(ExecutionMode m) { super(m); }
449          public void accept(Integer x, Integer y) {
450 <            m.checkExecutionMode();
379 <            invocationCount++;
450 >            invoked();
451              value = subtract(x, y);
452          }
453      }
454 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
455 <        final ExecutionMode m;
456 <        int invocationCount = 0;
457 <        Integer value;
458 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
454 >
455 >    static class SubtractFunction extends CheckedIntegerAction
456 >        implements BiFunction<Integer, Integer, Integer>
457 >    {
458 >        SubtractFunction(ExecutionMode m) { super(m); }
459          public Integer apply(Integer x, Integer y) {
460 <            m.checkExecutionMode();
391 <            invocationCount++;
460 >            invoked();
461              return value = subtract(x, y);
462          }
463      }
464 <    static final class Noop implements Runnable {
465 <        final ExecutionMode m;
466 <        int invocationCount = 0;
398 <        Noop(ExecutionMode m) { this.m = m; }
464 >
465 >    static class Noop extends CheckedAction implements Runnable {
466 >        Noop(ExecutionMode m) { super(m); }
467          public void run() {
468 <            m.checkExecutionMode();
401 <            invocationCount++;
468 >            invoked();
469          }
470      }
471  
472 <    static final class FailingSupplier implements Supplier<Integer> {
473 <        final ExecutionMode m;
474 <        int invocationCount = 0;
475 <        FailingSupplier(ExecutionMode m) { this.m = m; }
472 >    static class FailingSupplier extends CheckedAction
473 >        implements Supplier<Integer>
474 >    {
475 >        final CFException ex;
476 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
477          public Integer get() {
478 <            m.checkExecutionMode();
479 <            invocationCount++;
412 <            throw new CFException();
478 >            invoked();
479 >            throw ex;
480          }
481      }
482 <    static final class FailingConsumer implements Consumer<Integer> {
483 <        final ExecutionMode m;
484 <        int invocationCount = 0;
485 <        FailingConsumer(ExecutionMode m) { this.m = m; }
482 >
483 >    static class FailingConsumer extends CheckedIntegerAction
484 >        implements Consumer<Integer>
485 >    {
486 >        final CFException ex;
487 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x) {
489 <            m.checkExecutionMode();
490 <            invocationCount++;
491 <            throw new CFException();
489 >            invoked();
490 >            value = x;
491 >            throw ex;
492          }
493      }
494 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
495 <        final ExecutionMode m;
496 <        int invocationCount = 0;
497 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
494 >
495 >    static class FailingBiConsumer extends CheckedIntegerAction
496 >        implements BiConsumer<Integer, Integer>
497 >    {
498 >        final CFException ex;
499 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
500          public void accept(Integer x, Integer y) {
501 <            m.checkExecutionMode();
502 <            invocationCount++;
503 <            throw new CFException();
501 >            invoked();
502 >            value = subtract(x, y);
503 >            throw ex;
504          }
505      }
506 <    static final class FailingFunction implements Function<Integer, Integer> {
507 <        final ExecutionMode m;
508 <        int invocationCount = 0;
509 <        FailingFunction(ExecutionMode m) { this.m = m; }
506 >
507 >    static class FailingFunction extends CheckedIntegerAction
508 >        implements Function<Integer, Integer>
509 >    {
510 >        final CFException ex;
511 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x) {
513 <            m.checkExecutionMode();
514 <            invocationCount++;
515 <            throw new CFException();
513 >            invoked();
514 >            value = x;
515 >            throw ex;
516          }
517      }
518 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
519 <        final ExecutionMode m;
520 <        int invocationCount = 0;
521 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
518 >
519 >    static class FailingBiFunction extends CheckedIntegerAction
520 >        implements BiFunction<Integer, Integer, Integer>
521 >    {
522 >        final CFException ex;
523 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
524          public Integer apply(Integer x, Integer y) {
525 <            m.checkExecutionMode();
526 <            invocationCount++;
527 <            throw new CFException();
525 >            invoked();
526 >            value = subtract(x, y);
527 >            throw ex;
528          }
529      }
530 <    static final class FailingRunnable implements Runnable {
531 <        final ExecutionMode m;
532 <        int invocationCount = 0;
533 <        FailingRunnable(ExecutionMode m) { this.m = m; }
530 >
531 >    static class FailingRunnable extends CheckedAction implements Runnable {
532 >        final CFException ex;
533 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
534          public void run() {
535 <            m.checkExecutionMode();
536 <            invocationCount++;
462 <            throw new CFException();
535 >            invoked();
536 >            throw ex;
537          }
538      }
539  
540 <    static final class CompletableFutureInc
541 <        implements Function<Integer, CompletableFuture<Integer>> {
542 <        final ExecutionMode m;
543 <        int invocationCount = 0;
470 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
540 >    static class CompletableFutureInc extends CheckedIntegerAction
541 >        implements Function<Integer, CompletableFuture<Integer>>
542 >    {
543 >        CompletableFutureInc(ExecutionMode m) { super(m); }
544          public CompletableFuture<Integer> apply(Integer x) {
545 <            m.checkExecutionMode();
546 <            invocationCount++;
545 >            invoked();
546 >            value = x;
547              CompletableFuture<Integer> f = new CompletableFuture<>();
548 <            f.complete(inc(x));
548 >            assertTrue(f.complete(inc(x)));
549              return f;
550          }
551      }
552  
553 <    static final class FailingCompletableFutureFunction
554 <        implements Function<Integer, CompletableFuture<Integer>> {
555 <        final ExecutionMode m;
556 <        int invocationCount = 0;
557 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
553 >    static class FailingCompletableFutureFunction extends CheckedIntegerAction
554 >        implements Function<Integer, CompletableFuture<Integer>>
555 >    {
556 >        final CFException ex;
557 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
558          public CompletableFuture<Integer> apply(Integer x) {
559 <            m.checkExecutionMode();
560 <            invocationCount++;
561 <            throw new CFException();
559 >            invoked();
560 >            value = x;
561 >            throw ex;
562 >        }
563 >    }
564 >
565 >    static class CountingRejectingExecutor implements Executor {
566 >        final RejectedExecutionException ex = new RejectedExecutionException();
567 >        final AtomicInteger count = new AtomicInteger(0);
568 >        public void execute(Runnable r) {
569 >            count.getAndIncrement();
570 >            throw ex;
571          }
572      }
573  
# Line 503 | Line 585 | public class CompletableFutureTest exten
585          }
586      }
587  
588 +    static final boolean defaultExecutorIsCommonPool
589 +        = ForkJoinPool.getCommonPoolParallelism() > 1;
590 +
591      /**
592       * Permits the testing of parallel code for the 3 different
593 <     * execution modes without repeating all the testing code.
593 >     * execution modes without copy/pasting all the test methods.
594       */
595      enum ExecutionMode {
596 <        DEFAULT {
596 >        SYNC {
597              public void checkExecutionMode() {
598 +                assertFalse(ThreadExecutor.startedCurrentThread());
599                  assertNull(ForkJoinTask.getPool());
600              }
601              public CompletableFuture<Void> runAsync(Runnable a) {
# Line 583 | Line 669 | public class CompletableFutureTest exten
669  
670          ASYNC {
671              public void checkExecutionMode() {
672 <                assertSame(ForkJoinPool.commonPool(),
673 <                           ForkJoinTask.getPool());
672 >                assertEquals(defaultExecutorIsCommonPool,
673 >                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
674              }
675              public CompletableFuture<Void> runAsync(Runnable a) {
676                  return CompletableFuture.runAsync(a);
# Line 780 | Line 866 | public class CompletableFutureTest exten
866      {
867          final AtomicInteger a = new AtomicInteger(0);
868          final CompletableFuture<Integer> f = new CompletableFuture<>();
869 <        if (!createIncomplete) f.complete(v1);
869 >        if (!createIncomplete) assertTrue(f.complete(v1));
870          final CompletableFuture<Integer> g = f.exceptionally
871              ((Throwable t) -> {
786                // Should not be called
872                  a.getAndIncrement();
873 <                throw new AssertionError();
873 >                threadFail("should not be called");
874 >                return null;            // unreached
875              });
876 <        if (createIncomplete) f.complete(v1);
876 >        if (createIncomplete) assertTrue(f.complete(v1));
877  
878          checkCompletedNormally(g, v1);
879          checkCompletedNormally(f, v1);
880          assertEquals(0, a.get());
881      }}
882  
797
883      /**
884       * exceptionally action completes with function value on source
885       * exception
# Line 809 | Line 894 | public class CompletableFutureTest exten
894          if (!createIncomplete) f.completeExceptionally(ex);
895          final CompletableFuture<Integer> g = f.exceptionally
896              ((Throwable t) -> {
897 <                ExecutionMode.DEFAULT.checkExecutionMode();
897 >                ExecutionMode.SYNC.checkExecutionMode();
898                  threadAssertSame(t, ex);
899                  a.getAndIncrement();
900                  return v1;
# Line 820 | Line 905 | public class CompletableFutureTest exten
905          assertEquals(1, a.get());
906      }}
907  
908 +    /**
909 +     * If an "exceptionally action" throws an exception, it completes
910 +     * exceptionally with that exception
911 +     */
912      public void testExceptionally_exceptionalCompletionActionFailed() {
913          for (boolean createIncomplete : new boolean[] { true, false })
825        for (Integer v1 : new Integer[] { 1, null })
914      {
915          final AtomicInteger a = new AtomicInteger(0);
916          final CFException ex1 = new CFException();
# Line 831 | Line 919 | public class CompletableFutureTest exten
919          if (!createIncomplete) f.completeExceptionally(ex1);
920          final CompletableFuture<Integer> g = f.exceptionally
921              ((Throwable t) -> {
922 <                ExecutionMode.DEFAULT.checkExecutionMode();
922 >                ExecutionMode.SYNC.checkExecutionMode();
923                  threadAssertSame(t, ex1);
924                  a.getAndIncrement();
925                  throw ex2;
926              });
927          if (createIncomplete) f.completeExceptionally(ex1);
928  
929 <        checkCompletedWithWrappedCFException(g, ex2);
929 >        checkCompletedWithWrappedException(g, ex2);
930 >        checkCompletedExceptionally(f, ex1);
931 >        assertEquals(1, a.get());
932 >    }}
933 >
934 >    /**
935 >     * whenComplete action executes on normal completion, propagating
936 >     * source result.
937 >     */
938 >    public void testWhenComplete_normalCompletion() {
939 >        for (ExecutionMode m : ExecutionMode.values())
940 >        for (boolean createIncomplete : new boolean[] { true, false })
941 >        for (Integer v1 : new Integer[] { 1, null })
942 >    {
943 >        final AtomicInteger a = new AtomicInteger(0);
944 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
945 >        if (!createIncomplete) assertTrue(f.complete(v1));
946 >        final CompletableFuture<Integer> g = m.whenComplete
947 >            (f,
948 >             (Integer result, Throwable t) -> {
949 >                m.checkExecutionMode();
950 >                threadAssertSame(result, v1);
951 >                threadAssertNull(t);
952 >                a.getAndIncrement();
953 >            });
954 >        if (createIncomplete) assertTrue(f.complete(v1));
955 >
956 >        checkCompletedNormally(g, v1);
957 >        checkCompletedNormally(f, v1);
958 >        assertEquals(1, a.get());
959 >    }}
960 >
961 >    /**
962 >     * whenComplete action executes on exceptional completion, propagating
963 >     * source result.
964 >     */
965 >    public void testWhenComplete_exceptionalCompletion() {
966 >        for (ExecutionMode m : ExecutionMode.values())
967 >        for (boolean createIncomplete : new boolean[] { true, false })
968 >    {
969 >        final AtomicInteger a = new AtomicInteger(0);
970 >        final CFException ex = new CFException();
971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 >        if (!createIncomplete) f.completeExceptionally(ex);
973 >        final CompletableFuture<Integer> g = m.whenComplete
974 >            (f,
975 >             (Integer result, Throwable t) -> {
976 >                m.checkExecutionMode();
977 >                threadAssertNull(result);
978 >                threadAssertSame(t, ex);
979 >                a.getAndIncrement();
980 >            });
981 >        if (createIncomplete) f.completeExceptionally(ex);
982 >
983 >        checkCompletedWithWrappedException(g, ex);
984 >        checkCompletedExceptionally(f, ex);
985 >        assertEquals(1, a.get());
986 >    }}
987 >
988 >    /**
989 >     * whenComplete action executes on cancelled source, propagating
990 >     * CancellationException.
991 >     */
992 >    public void testWhenComplete_sourceCancelled() {
993 >        for (ExecutionMode m : ExecutionMode.values())
994 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
995 >        for (boolean createIncomplete : new boolean[] { true, false })
996 >    {
997 >        final AtomicInteger a = new AtomicInteger(0);
998 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
999 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1000 >        final CompletableFuture<Integer> g = m.whenComplete
1001 >            (f,
1002 >             (Integer result, Throwable t) -> {
1003 >                m.checkExecutionMode();
1004 >                threadAssertNull(result);
1005 >                threadAssertTrue(t instanceof CancellationException);
1006 >                a.getAndIncrement();
1007 >            });
1008 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1009 >
1010 >        checkCompletedWithWrappedCancellationException(g);
1011 >        checkCancelled(f);
1012 >        assertEquals(1, a.get());
1013 >    }}
1014 >
1015 >    /**
1016 >     * If a whenComplete action throws an exception when triggered by
1017 >     * a normal completion, it completes exceptionally
1018 >     */
1019 >    public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1020 >        for (boolean createIncomplete : new boolean[] { true, false })
1021 >        for (ExecutionMode m : ExecutionMode.values())
1022 >        for (Integer v1 : new Integer[] { 1, null })
1023 >    {
1024 >        final AtomicInteger a = new AtomicInteger(0);
1025 >        final CFException ex = new CFException();
1026 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1027 >        if (!createIncomplete) assertTrue(f.complete(v1));
1028 >        final CompletableFuture<Integer> g = m.whenComplete
1029 >            (f,
1030 >             (Integer result, Throwable t) -> {
1031 >                m.checkExecutionMode();
1032 >                threadAssertSame(result, v1);
1033 >                threadAssertNull(t);
1034 >                a.getAndIncrement();
1035 >                throw ex;
1036 >            });
1037 >        if (createIncomplete) assertTrue(f.complete(v1));
1038 >
1039 >        checkCompletedWithWrappedException(g, ex);
1040 >        checkCompletedNormally(f, v1);
1041 >        assertEquals(1, a.get());
1042 >    }}
1043 >
1044 >    /**
1045 >     * If a whenComplete action throws an exception when triggered by
1046 >     * a source completion that also throws an exception, the source
1047 >     * exception takes precedence (unlike handle)
1048 >     */
1049 >    public void testWhenComplete_sourceFailedActionFailed() {
1050 >        for (boolean createIncomplete : new boolean[] { true, false })
1051 >        for (ExecutionMode m : ExecutionMode.values())
1052 >    {
1053 >        final AtomicInteger a = new AtomicInteger(0);
1054 >        final CFException ex1 = new CFException();
1055 >        final CFException ex2 = new CFException();
1056 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1057 >
1058 >        if (!createIncomplete) f.completeExceptionally(ex1);
1059 >        final CompletableFuture<Integer> g = m.whenComplete
1060 >            (f,
1061 >             (Integer result, Throwable t) -> {
1062 >                m.checkExecutionMode();
1063 >                threadAssertSame(t, ex1);
1064 >                threadAssertNull(result);
1065 >                a.getAndIncrement();
1066 >                throw ex2;
1067 >            });
1068 >        if (createIncomplete) f.completeExceptionally(ex1);
1069 >
1070 >        checkCompletedWithWrappedException(g, ex1);
1071 >        checkCompletedExceptionally(f, ex1);
1072 >        if (testImplementationDetails) {
1073 >            assertEquals(1, ex1.getSuppressed().length);
1074 >            assertSame(ex2, ex1.getSuppressed()[0]);
1075 >        }
1076          assertEquals(1, a.get());
1077      }}
1078  
# Line 853 | Line 1087 | public class CompletableFutureTest exten
1087      {
1088          final CompletableFuture<Integer> f = new CompletableFuture<>();
1089          final AtomicInteger a = new AtomicInteger(0);
1090 <        if (!createIncomplete) f.complete(v1);
1090 >        if (!createIncomplete) assertTrue(f.complete(v1));
1091          final CompletableFuture<Integer> g = m.handle
1092              (f,
1093 <             (Integer x, Throwable t) -> {
1093 >             (Integer result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095 <                threadAssertSame(x, v1);
1095 >                threadAssertSame(result, v1);
1096                  threadAssertNull(t);
1097                  a.getAndIncrement();
1098                  return inc(v1);
1099              });
1100 <        if (createIncomplete) f.complete(v1);
1100 >        if (createIncomplete) assertTrue(f.complete(v1));
1101  
1102          checkCompletedNormally(g, inc(v1));
1103          checkCompletedNormally(f, v1);
# Line 885 | Line 1119 | public class CompletableFutureTest exten
1119          if (!createIncomplete) f.completeExceptionally(ex);
1120          final CompletableFuture<Integer> g = m.handle
1121              (f,
1122 <             (Integer x, Throwable t) -> {
1122 >             (Integer result, Throwable t) -> {
1123                  m.checkExecutionMode();
1124 <                threadAssertNull(x);
1124 >                threadAssertNull(result);
1125                  threadAssertSame(t, ex);
1126                  a.getAndIncrement();
1127                  return v1;
# Line 895 | Line 1129 | public class CompletableFutureTest exten
1129          if (createIncomplete) f.completeExceptionally(ex);
1130  
1131          checkCompletedNormally(g, v1);
1132 <        checkCompletedWithWrappedCFException(f, ex);
1132 >        checkCompletedExceptionally(f, ex);
1133          assertEquals(1, a.get());
1134      }}
1135  
# Line 914 | Line 1148 | public class CompletableFutureTest exten
1148          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1149          final CompletableFuture<Integer> g = m.handle
1150              (f,
1151 <             (Integer x, Throwable t) -> {
1151 >             (Integer result, Throwable t) -> {
1152                  m.checkExecutionMode();
1153 <                threadAssertNull(x);
1153 >                threadAssertNull(result);
1154                  threadAssertTrue(t instanceof CancellationException);
1155                  a.getAndIncrement();
1156                  return v1;
# Line 929 | Line 1163 | public class CompletableFutureTest exten
1163      }}
1164  
1165      /**
1166 <     * handle result completes exceptionally if action does
1166 >     * If a "handle action" throws an exception when triggered by
1167 >     * a normal completion, it completes exceptionally
1168       */
1169 <    public void testHandle_sourceFailedActionFailed() {
1169 >    public void testHandle_sourceCompletedNormallyActionFailed() {
1170          for (ExecutionMode m : ExecutionMode.values())
1171          for (boolean createIncomplete : new boolean[] { true, false })
1172 +        for (Integer v1 : new Integer[] { 1, null })
1173      {
1174          final CompletableFuture<Integer> f = new CompletableFuture<>();
1175          final AtomicInteger a = new AtomicInteger(0);
1176 <        final CFException ex1 = new CFException();
1177 <        final CFException ex2 = new CFException();
942 <        if (!createIncomplete) f.completeExceptionally(ex1);
1176 >        final CFException ex = new CFException();
1177 >        if (!createIncomplete) assertTrue(f.complete(v1));
1178          final CompletableFuture<Integer> g = m.handle
1179              (f,
1180 <             (Integer x, Throwable t) -> {
1180 >             (Integer result, Throwable t) -> {
1181                  m.checkExecutionMode();
1182 <                threadAssertNull(x);
1183 <                threadAssertSame(ex1, t);
1182 >                threadAssertSame(result, v1);
1183 >                threadAssertNull(t);
1184                  a.getAndIncrement();
1185 <                throw ex2;
1185 >                throw ex;
1186              });
1187 <        if (createIncomplete) f.completeExceptionally(ex1);
1187 >        if (createIncomplete) assertTrue(f.complete(v1));
1188  
1189 <        checkCompletedWithWrappedCFException(g, ex2);
1190 <        checkCompletedWithWrappedCFException(f, ex1);
1189 >        checkCompletedWithWrappedException(g, ex);
1190 >        checkCompletedNormally(f, v1);
1191          assertEquals(1, a.get());
1192      }}
1193  
1194 <    public void testHandle_sourceCompletedNormallyActionFailed() {
1195 <        for (ExecutionMode m : ExecutionMode.values())
1194 >    /**
1195 >     * If a "handle action" throws an exception when triggered by
1196 >     * a source completion that also throws an exception, the action
1197 >     * exception takes precedence (unlike whenComplete)
1198 >     */
1199 >    public void testHandle_sourceFailedActionFailed() {
1200          for (boolean createIncomplete : new boolean[] { true, false })
1201 <        for (Integer v1 : new Integer[] { 1, null })
1201 >        for (ExecutionMode m : ExecutionMode.values())
1202      {
964        final CompletableFuture<Integer> f = new CompletableFuture<>();
1203          final AtomicInteger a = new AtomicInteger(0);
1204 <        final CFException ex = new CFException();
1205 <        if (!createIncomplete) f.complete(v1);
1204 >        final CFException ex1 = new CFException();
1205 >        final CFException ex2 = new CFException();
1206 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1207 >
1208 >        if (!createIncomplete) f.completeExceptionally(ex1);
1209          final CompletableFuture<Integer> g = m.handle
1210              (f,
1211 <             (Integer x, Throwable t) -> {
1211 >             (Integer result, Throwable t) -> {
1212                  m.checkExecutionMode();
1213 <                threadAssertSame(x, v1);
1214 <                threadAssertNull(t);
1213 >                threadAssertNull(result);
1214 >                threadAssertSame(ex1, t);
1215                  a.getAndIncrement();
1216 <                throw ex;
1216 >                throw ex2;
1217              });
1218 <        if (createIncomplete) f.complete(v1);
1218 >        if (createIncomplete) f.completeExceptionally(ex1);
1219  
1220 <        checkCompletedWithWrappedCFException(g, ex);
1221 <        checkCompletedNormally(f, v1);
1220 >        checkCompletedWithWrappedException(g, ex2);
1221 >        checkCompletedExceptionally(f, ex1);
1222          assertEquals(1, a.get());
1223      }}
1224  
# Line 995 | Line 1236 | public class CompletableFutureTest exten
1236          final CompletableFuture<Void> f = m.runAsync(r);
1237          assertNull(f.join());
1238          checkCompletedNormally(f, null);
1239 <        assertEquals(1, r.invocationCount);
1239 >        r.assertInvoked();
1240      }}
1241  
1242      /**
# Line 1010 | Line 1251 | public class CompletableFutureTest exten
1251      {
1252          final FailingRunnable r = new FailingRunnable(m);
1253          final CompletableFuture<Void> f = m.runAsync(r);
1254 <        checkCompletedWithWrappedCFException(f);
1255 <        assertEquals(1, r.invocationCount);
1254 >        checkCompletedWithWrappedException(f, r.ex);
1255 >        r.assertInvoked();
1256      }}
1257  
1258 +    @SuppressWarnings("FutureReturnValueIgnored")
1259 +    public void testRunAsync_rejectingExecutor() {
1260 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1261 +        try {
1262 +            CompletableFuture.runAsync(() -> {}, e);
1263 +            shouldThrow();
1264 +        } catch (Throwable t) {
1265 +            assertSame(e.ex, t);
1266 +        }
1267 +
1268 +        assertEquals(1, e.count.get());
1269 +    }
1270 +
1271      /**
1272       * supplyAsync completes with result of supplier
1273       */
# Line 1029 | Line 1283 | public class CompletableFutureTest exten
1283          final CompletableFuture<Integer> f = m.supplyAsync(r);
1284          assertSame(v1, f.join());
1285          checkCompletedNormally(f, v1);
1286 <        assertEquals(1, r.invocationCount);
1286 >        r.assertInvoked();
1287      }}
1288  
1289      /**
# Line 1044 | Line 1298 | public class CompletableFutureTest exten
1298      {
1299          FailingSupplier r = new FailingSupplier(m);
1300          CompletableFuture<Integer> f = m.supplyAsync(r);
1301 <        checkCompletedWithWrappedCFException(f);
1302 <        assertEquals(1, r.invocationCount);
1301 >        checkCompletedWithWrappedException(f, r.ex);
1302 >        r.assertInvoked();
1303      }}
1304  
1305 +    @SuppressWarnings("FutureReturnValueIgnored")
1306 +    public void testSupplyAsync_rejectingExecutor() {
1307 +        CountingRejectingExecutor e = new CountingRejectingExecutor();
1308 +        try {
1309 +            CompletableFuture.supplyAsync(() -> null, e);
1310 +            shouldThrow();
1311 +        } catch (Throwable t) {
1312 +            assertSame(e.ex, t);
1313 +        }
1314 +
1315 +        assertEquals(1, e.count.get());
1316 +    }
1317 +
1318      // seq completion methods
1319  
1320      /**
# Line 1055 | Line 1322 | public class CompletableFutureTest exten
1322       */
1323      public void testThenRun_normalCompletion() {
1324          for (ExecutionMode m : ExecutionMode.values())
1058        for (boolean createIncomplete : new boolean[] { true, false })
1325          for (Integer v1 : new Integer[] { 1, null })
1326      {
1327          final CompletableFuture<Integer> f = new CompletableFuture<>();
1328 <        final Noop r = new Noop(m);
1329 <        if (!createIncomplete) f.complete(v1);
1064 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1065 <        if (createIncomplete) {
1066 <            checkIncomplete(g);
1067 <            f.complete(v1);
1068 <        }
1328 >        final Noop[] rs = new Noop[6];
1329 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1330  
1331 <        checkCompletedNormally(g, null);
1331 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1332 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1333 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1334 >        checkIncomplete(h0);
1335 >        checkIncomplete(h1);
1336 >        checkIncomplete(h2);
1337 >        assertTrue(f.complete(v1));
1338 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1339 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1340 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1341 >
1342 >        checkCompletedNormally(h0, null);
1343 >        checkCompletedNormally(h1, null);
1344 >        checkCompletedNormally(h2, null);
1345 >        checkCompletedNormally(h3, null);
1346 >        checkCompletedNormally(h4, null);
1347 >        checkCompletedNormally(h5, null);
1348          checkCompletedNormally(f, v1);
1349 <        assertEquals(1, r.invocationCount);
1349 >        for (Noop r : rs) r.assertInvoked();
1350      }}
1351  
1352      /**
# Line 1078 | Line 1355 | public class CompletableFutureTest exten
1355       */
1356      public void testThenRun_exceptionalCompletion() {
1357          for (ExecutionMode m : ExecutionMode.values())
1081        for (boolean createIncomplete : new boolean[] { true, false })
1358      {
1359          final CFException ex = new CFException();
1360          final CompletableFuture<Integer> f = new CompletableFuture<>();
1361 <        final Noop r = new Noop(m);
1362 <        if (!createIncomplete) f.completeExceptionally(ex);
1087 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1088 <        if (createIncomplete) {
1089 <            checkIncomplete(g);
1090 <            f.completeExceptionally(ex);
1091 <        }
1361 >        final Noop[] rs = new Noop[6];
1362 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1363  
1364 <        checkCompletedWithWrappedCFException(g, ex);
1365 <        checkCompletedWithWrappedCFException(f, ex);
1366 <        assertEquals(0, r.invocationCount);
1364 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1365 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1366 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1367 >        checkIncomplete(h0);
1368 >        checkIncomplete(h1);
1369 >        checkIncomplete(h2);
1370 >        assertTrue(f.completeExceptionally(ex));
1371 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1372 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1373 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1374 >
1375 >        checkCompletedWithWrappedException(h0, ex);
1376 >        checkCompletedWithWrappedException(h1, ex);
1377 >        checkCompletedWithWrappedException(h2, ex);
1378 >        checkCompletedWithWrappedException(h3, ex);
1379 >        checkCompletedWithWrappedException(h4, ex);
1380 >        checkCompletedWithWrappedException(h5, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        for (Noop r : rs) r.assertNotInvoked();
1383      }}
1384  
1385      /**
# Line 1100 | Line 1387 | public class CompletableFutureTest exten
1387       */
1388      public void testThenRun_sourceCancelled() {
1389          for (ExecutionMode m : ExecutionMode.values())
1103        for (boolean createIncomplete : new boolean[] { true, false })
1390          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1391      {
1392          final CompletableFuture<Integer> f = new CompletableFuture<>();
1393 <        final Noop r = new Noop(m);
1394 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1109 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1110 <        if (createIncomplete) {
1111 <            checkIncomplete(g);
1112 <            assertTrue(f.cancel(mayInterruptIfRunning));
1113 <        }
1393 >        final Noop[] rs = new Noop[6];
1394 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1395  
1396 <        checkCompletedWithWrappedCancellationException(g);
1396 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1397 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1398 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1399 >        checkIncomplete(h0);
1400 >        checkIncomplete(h1);
1401 >        checkIncomplete(h2);
1402 >        assertTrue(f.cancel(mayInterruptIfRunning));
1403 >        final CompletableFuture<Void> h3 = m.thenRun(f, rs[3]);
1404 >        final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1405 >        final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1406 >
1407 >        checkCompletedWithWrappedCancellationException(h0);
1408 >        checkCompletedWithWrappedCancellationException(h1);
1409 >        checkCompletedWithWrappedCancellationException(h2);
1410 >        checkCompletedWithWrappedCancellationException(h3);
1411 >        checkCompletedWithWrappedCancellationException(h4);
1412 >        checkCompletedWithWrappedCancellationException(h5);
1413          checkCancelled(f);
1414 <        assertEquals(0, r.invocationCount);
1414 >        for (Noop r : rs) r.assertNotInvoked();
1415      }}
1416  
1417      /**
# Line 1122 | Line 1419 | public class CompletableFutureTest exten
1419       */
1420      public void testThenRun_actionFailed() {
1421          for (ExecutionMode m : ExecutionMode.values())
1125        for (boolean createIncomplete : new boolean[] { true, false })
1422          for (Integer v1 : new Integer[] { 1, null })
1423      {
1424          final CompletableFuture<Integer> f = new CompletableFuture<>();
1425 <        final FailingRunnable r = new FailingRunnable(m);
1426 <        if (!createIncomplete) f.complete(v1);
1131 <        final CompletableFuture<Void> g = m.thenRun(f, r);
1132 <        if (createIncomplete) {
1133 <            checkIncomplete(g);
1134 <            f.complete(v1);
1135 <        }
1425 >        final FailingRunnable[] rs = new FailingRunnable[6];
1426 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1427  
1428 <        checkCompletedWithWrappedCFException(g);
1428 >        final CompletableFuture<Void> h0 = m.thenRun(f, rs[0]);
1429 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, f, rs[1]);
1430 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, f, rs[2]);
1431 >        assertTrue(f.complete(v1));
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, rs[0].ex);
1437 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1438 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1439 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1440 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1441 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1442          checkCompletedNormally(f, v1);
1443      }}
1444  
# Line 1143 | Line 1447 | public class CompletableFutureTest exten
1447       */
1448      public void testThenApply_normalCompletion() {
1449          for (ExecutionMode m : ExecutionMode.values())
1146        for (boolean createIncomplete : new boolean[] { true, false })
1450          for (Integer v1 : new Integer[] { 1, null })
1451      {
1452          final CompletableFuture<Integer> f = new CompletableFuture<>();
1453 <        final IncFunction r = new IncFunction(m);
1454 <        if (!createIncomplete) f.complete(v1);
1152 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1153 <        if (createIncomplete) {
1154 <            checkIncomplete(g);
1155 <            f.complete(v1);
1156 <        }
1453 >        final IncFunction[] rs = new IncFunction[4];
1454 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1455  
1456 <        checkCompletedNormally(g, inc(v1));
1456 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1457 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1458 >        checkIncomplete(h0);
1459 >        checkIncomplete(h1);
1460 >        assertTrue(f.complete(v1));
1461 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1462 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1463 >
1464 >        checkCompletedNormally(h0, inc(v1));
1465 >        checkCompletedNormally(h1, inc(v1));
1466 >        checkCompletedNormally(h2, inc(v1));
1467 >        checkCompletedNormally(h3, inc(v1));
1468          checkCompletedNormally(f, v1);
1469 <        assertEquals(1, r.invocationCount);
1469 >        for (IncFunction r : rs) r.assertValue(inc(v1));
1470      }}
1471  
1472      /**
# Line 1166 | Line 1475 | public class CompletableFutureTest exten
1475       */
1476      public void testThenApply_exceptionalCompletion() {
1477          for (ExecutionMode m : ExecutionMode.values())
1169        for (boolean createIncomplete : new boolean[] { true, false })
1478      {
1479          final CFException ex = new CFException();
1480          final CompletableFuture<Integer> f = new CompletableFuture<>();
1481 <        final IncFunction r = new IncFunction(m);
1482 <        if (!createIncomplete) f.completeExceptionally(ex);
1175 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1176 <        if (createIncomplete) {
1177 <            checkIncomplete(g);
1178 <            f.completeExceptionally(ex);
1179 <        }
1481 >        final IncFunction[] rs = new IncFunction[4];
1482 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1483  
1484 <        checkCompletedWithWrappedCFException(g, ex);
1485 <        checkCompletedWithWrappedCFException(f, ex);
1486 <        assertEquals(0, r.invocationCount);
1484 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1485 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1486 >        assertTrue(f.completeExceptionally(ex));
1487 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1488 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1489 >
1490 >        checkCompletedWithWrappedException(h0, ex);
1491 >        checkCompletedWithWrappedException(h1, ex);
1492 >        checkCompletedWithWrappedException(h2, ex);
1493 >        checkCompletedWithWrappedException(h3, ex);
1494 >        checkCompletedExceptionally(f, ex);
1495 >        for (IncFunction r : rs) r.assertNotInvoked();
1496      }}
1497  
1498      /**
# Line 1188 | Line 1500 | public class CompletableFutureTest exten
1500       */
1501      public void testThenApply_sourceCancelled() {
1502          for (ExecutionMode m : ExecutionMode.values())
1191        for (boolean createIncomplete : new boolean[] { true, false })
1503          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1504      {
1505          final CompletableFuture<Integer> f = new CompletableFuture<>();
1506 <        final IncFunction r = new IncFunction(m);
1507 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1197 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1198 <        if (createIncomplete) {
1199 <            checkIncomplete(g);
1200 <            assertTrue(f.cancel(mayInterruptIfRunning));
1201 <        }
1506 >        final IncFunction[] rs = new IncFunction[4];
1507 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1508  
1509 <        checkCompletedWithWrappedCancellationException(g);
1509 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1510 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1511 >        assertTrue(f.cancel(mayInterruptIfRunning));
1512 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1513 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1514 >
1515 >        checkCompletedWithWrappedCancellationException(h0);
1516 >        checkCompletedWithWrappedCancellationException(h1);
1517 >        checkCompletedWithWrappedCancellationException(h2);
1518 >        checkCompletedWithWrappedCancellationException(h3);
1519          checkCancelled(f);
1520 <        assertEquals(0, r.invocationCount);
1520 >        for (IncFunction r : rs) r.assertNotInvoked();
1521      }}
1522  
1523      /**
# Line 1210 | Line 1525 | public class CompletableFutureTest exten
1525       */
1526      public void testThenApply_actionFailed() {
1527          for (ExecutionMode m : ExecutionMode.values())
1213        for (boolean createIncomplete : new boolean[] { true, false })
1528          for (Integer v1 : new Integer[] { 1, null })
1529      {
1530          final CompletableFuture<Integer> f = new CompletableFuture<>();
1531 <        final FailingFunction r = new FailingFunction(m);
1532 <        if (!createIncomplete) f.complete(v1);
1219 <        final CompletableFuture<Integer> g = m.thenApply(f, r);
1220 <        if (createIncomplete) {
1221 <            checkIncomplete(g);
1222 <            f.complete(v1);
1223 <        }
1531 >        final FailingFunction[] rs = new FailingFunction[4];
1532 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1533  
1534 <        checkCompletedWithWrappedCFException(g);
1534 >        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1535 >        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1536 >        assertTrue(f.complete(v1));
1537 >        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1538 >        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1539 >
1540 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1541 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1542 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1543 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1544          checkCompletedNormally(f, v1);
1545      }}
1546  
# Line 1231 | Line 1549 | public class CompletableFutureTest exten
1549       */
1550      public void testThenAccept_normalCompletion() {
1551          for (ExecutionMode m : ExecutionMode.values())
1234        for (boolean createIncomplete : new boolean[] { true, false })
1552          for (Integer v1 : new Integer[] { 1, null })
1553      {
1554          final CompletableFuture<Integer> f = new CompletableFuture<>();
1555 <        final IncAction r = new IncAction();
1556 <        if (!createIncomplete) f.complete(v1);
1240 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1241 <        if (createIncomplete) {
1242 <            checkIncomplete(g);
1243 <            f.complete(v1);
1244 <        }
1555 >        final NoopConsumer[] rs = new NoopConsumer[4];
1556 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1557  
1558 <        checkCompletedNormally(g, null);
1558 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1559 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1560 >        checkIncomplete(h0);
1561 >        checkIncomplete(h1);
1562 >        assertTrue(f.complete(v1));
1563 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1564 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1565 >
1566 >        checkCompletedNormally(h0, null);
1567 >        checkCompletedNormally(h1, null);
1568 >        checkCompletedNormally(h2, null);
1569 >        checkCompletedNormally(h3, null);
1570          checkCompletedNormally(f, v1);
1571 <        assertEquals(1, r.invocationCount);
1249 <        assertEquals(inc(v1), r.value);
1571 >        for (NoopConsumer r : rs) r.assertValue(v1);
1572      }}
1573  
1574      /**
# Line 1255 | Line 1577 | public class CompletableFutureTest exten
1577       */
1578      public void testThenAccept_exceptionalCompletion() {
1579          for (ExecutionMode m : ExecutionMode.values())
1258        for (boolean createIncomplete : new boolean[] { true, false })
1580      {
1581          final CFException ex = new CFException();
1582          final CompletableFuture<Integer> f = new CompletableFuture<>();
1583 <        final IncAction r = new IncAction();
1584 <        if (!createIncomplete) f.completeExceptionally(ex);
1264 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1265 <        if (createIncomplete) {
1266 <            checkIncomplete(g);
1267 <            f.completeExceptionally(ex);
1268 <        }
1583 >        final NoopConsumer[] rs = new NoopConsumer[4];
1584 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1585  
1586 <        checkCompletedWithWrappedCFException(g, ex);
1587 <        checkCompletedWithWrappedCFException(f, ex);
1588 <        assertEquals(0, r.invocationCount);
1586 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1587 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1588 >        assertTrue(f.completeExceptionally(ex));
1589 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1590 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1591 >
1592 >        checkCompletedWithWrappedException(h0, ex);
1593 >        checkCompletedWithWrappedException(h1, ex);
1594 >        checkCompletedWithWrappedException(h2, ex);
1595 >        checkCompletedWithWrappedException(h3, ex);
1596 >        checkCompletedExceptionally(f, ex);
1597 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1598      }}
1599  
1600      /**
1601 <     * thenAccept result completes exceptionally if action does
1601 >     * thenAccept result completes exceptionally if source cancelled
1602       */
1603 <    public void testThenAccept_actionFailed() {
1603 >    public void testThenAccept_sourceCancelled() {
1604          for (ExecutionMode m : ExecutionMode.values())
1605 <        for (boolean createIncomplete : new boolean[] { true, false })
1281 <        for (Integer v1 : new Integer[] { 1, null })
1605 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1606      {
1607          final CompletableFuture<Integer> f = new CompletableFuture<>();
1608 <        final FailingConsumer r = new FailingConsumer(m);
1609 <        if (!createIncomplete) f.complete(v1);
1286 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1287 <        if (createIncomplete) {
1288 <            checkIncomplete(g);
1289 <            f.complete(v1);
1290 <        }
1608 >        final NoopConsumer[] rs = new NoopConsumer[4];
1609 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1610  
1611 <        checkCompletedWithWrappedCFException(g);
1612 <        checkCompletedNormally(f, v1);
1611 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1612 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1613 >        assertTrue(f.cancel(mayInterruptIfRunning));
1614 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1615 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1616 >
1617 >        checkCompletedWithWrappedCancellationException(h0);
1618 >        checkCompletedWithWrappedCancellationException(h1);
1619 >        checkCompletedWithWrappedCancellationException(h2);
1620 >        checkCompletedWithWrappedCancellationException(h3);
1621 >        checkCancelled(f);
1622 >        for (NoopConsumer r : rs) r.assertNotInvoked();
1623      }}
1624  
1625      /**
1626 <     * thenAccept result completes exceptionally if source cancelled
1626 >     * thenAccept result completes exceptionally if action does
1627       */
1628 <    public void testThenAccept_sourceCancelled() {
1628 >    public void testThenAccept_actionFailed() {
1629          for (ExecutionMode m : ExecutionMode.values())
1630 <        for (boolean createIncomplete : new boolean[] { true, false })
1302 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1630 >        for (Integer v1 : new Integer[] { 1, null })
1631      {
1632          final CompletableFuture<Integer> f = new CompletableFuture<>();
1633 <        final IncAction r = new IncAction();
1634 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1307 <        final CompletableFuture<Void> g = m.thenAccept(f, r);
1308 <        if (createIncomplete) {
1309 <            checkIncomplete(g);
1310 <            assertTrue(f.cancel(mayInterruptIfRunning));
1311 <        }
1633 >        final FailingConsumer[] rs = new FailingConsumer[4];
1634 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1635  
1636 <        checkCompletedWithWrappedCancellationException(g);
1637 <        checkCancelled(f);
1638 <        assertEquals(0, r.invocationCount);
1636 >        final CompletableFuture<Void> h0 = m.thenAccept(f, rs[0]);
1637 >        final CompletableFuture<Void> h1 = m.acceptEither(f, f, rs[1]);
1638 >        assertTrue(f.complete(v1));
1639 >        final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1640 >        final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1641 >
1642 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1643 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1644 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1645 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1646 >        checkCompletedNormally(f, v1);
1647      }}
1648  
1649      /**
# Line 1321 | Line 1652 | public class CompletableFutureTest exten
1652       */
1653      public void testThenCombine_normalCompletion() {
1654          for (ExecutionMode m : ExecutionMode.values())
1324        for (boolean createIncomplete : new boolean[] { true, false })
1655          for (boolean fFirst : new boolean[] { true, false })
1656          for (Integer v1 : new Integer[] { 1, null })
1657          for (Integer v2 : new Integer[] { 2, null })
1658      {
1659          final CompletableFuture<Integer> f = new CompletableFuture<>();
1660          final CompletableFuture<Integer> g = new CompletableFuture<>();
1661 <        final SubtractFunction r = new SubtractFunction(m);
1661 >        final SubtractFunction[] rs = new SubtractFunction[6];
1662 >        for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1663  
1664 <        if (fFirst) f.complete(v1); else g.complete(v2);
1665 <        if (!createIncomplete)
1666 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1667 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1668 <        if (createIncomplete) {
1669 <            checkIncomplete(h);
1670 <            assertEquals(0, r.invocationCount);
1671 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1672 <        }
1664 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1665 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1666 >        final Integer w1 =  fFirst ? v1 : v2;
1667 >        final Integer w2 = !fFirst ? v1 : v2;
1668 >
1669 >        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1670 >        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1671 >        assertTrue(fst.complete(w1));
1672 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1673 >        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1674 >        checkIncomplete(h0); rs[0].assertNotInvoked();
1675 >        checkIncomplete(h2); rs[2].assertNotInvoked();
1676 >        checkCompletedNormally(h1, subtract(w1, w1));
1677 >        checkCompletedNormally(h3, subtract(w1, w1));
1678 >        rs[1].assertValue(subtract(w1, w1));
1679 >        rs[3].assertValue(subtract(w1, w1));
1680 >        assertTrue(snd.complete(w2));
1681 >        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1682 >
1683 >        checkCompletedNormally(h0, subtract(v1, v2));
1684 >        checkCompletedNormally(h2, subtract(v1, v2));
1685 >        checkCompletedNormally(h4, subtract(v1, v2));
1686 >        rs[0].assertValue(subtract(v1, v2));
1687 >        rs[2].assertValue(subtract(v1, v2));
1688 >        rs[4].assertValue(subtract(v1, v2));
1689  
1343        checkCompletedNormally(h, subtract(v1, v2));
1690          checkCompletedNormally(f, v1);
1691          checkCompletedNormally(g, v2);
1346        assertEquals(1, r.invocationCount);
1692      }}
1693  
1694      /**
1695       * thenCombine result completes exceptionally after exceptional
1696       * completion of either source
1697       */
1698 <    public void testThenCombine_exceptionalCompletion() {
1698 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1699          for (ExecutionMode m : ExecutionMode.values())
1355        for (boolean createIncomplete : new boolean[] { true, false })
1700          for (boolean fFirst : new boolean[] { true, false })
1701 +        for (boolean failFirst : new boolean[] { true, false })
1702          for (Integer v1 : new Integer[] { 1, null })
1703      {
1704          final CompletableFuture<Integer> f = new CompletableFuture<>();
1705          final CompletableFuture<Integer> g = new CompletableFuture<>();
1706          final CFException ex = new CFException();
1707 <        final SubtractFunction r = new SubtractFunction(m);
1708 <
1709 <        (fFirst ? f : g).complete(v1);
1710 <        if (!createIncomplete)
1711 <            (!fFirst ? f : g).completeExceptionally(ex);
1712 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1713 <        if (createIncomplete) {
1714 <            checkIncomplete(h);
1715 <            (!fFirst ? f : g).completeExceptionally(ex);
1716 <        }
1717 <
1718 <        checkCompletedWithWrappedCFException(h, ex);
1719 <        assertEquals(0, r.invocationCount);
1720 <        checkCompletedNormally(fFirst ? f : g, v1);
1721 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1707 >        final SubtractFunction r1 = new SubtractFunction(m);
1708 >        final SubtractFunction r2 = new SubtractFunction(m);
1709 >        final SubtractFunction r3 = new SubtractFunction(m);
1710 >
1711 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1712 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1713 >        final Callable<Boolean> complete1 = failFirst ?
1714 >            () -> fst.completeExceptionally(ex) :
1715 >            () -> fst.complete(v1);
1716 >        final Callable<Boolean> complete2 = failFirst ?
1717 >            () -> snd.complete(v1) :
1718 >            () -> snd.completeExceptionally(ex);
1719 >
1720 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1721 >        assertTrue(complete1.call());
1722 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1723 >        checkIncomplete(h1);
1724 >        checkIncomplete(h2);
1725 >        assertTrue(complete2.call());
1726 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1727 >
1728 >        checkCompletedWithWrappedException(h1, ex);
1729 >        checkCompletedWithWrappedException(h2, ex);
1730 >        checkCompletedWithWrappedException(h3, ex);
1731 >        r1.assertNotInvoked();
1732 >        r2.assertNotInvoked();
1733 >        r3.assertNotInvoked();
1734 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1735 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1736      }}
1737  
1738      /**
1739 <     * thenCombine result completes exceptionally if action does
1739 >     * thenCombine result completes exceptionally if either source cancelled
1740       */
1741 <    public void testThenCombine_actionFailed() {
1741 >    public void testThenCombine_sourceCancelled() throws Throwable {
1742          for (ExecutionMode m : ExecutionMode.values())
1743 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1744          for (boolean fFirst : new boolean[] { true, false })
1745 +        for (boolean failFirst : new boolean[] { true, false })
1746          for (Integer v1 : new Integer[] { 1, null })
1386        for (Integer v2 : new Integer[] { 2, null })
1747      {
1748          final CompletableFuture<Integer> f = new CompletableFuture<>();
1749          final CompletableFuture<Integer> g = new CompletableFuture<>();
1750 <        final FailingBiFunction r = new FailingBiFunction(m);
1751 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1752 <
1753 <        if (fFirst) {
1754 <            f.complete(v1);
1755 <            g.complete(v2);
1756 <        } else {
1757 <            g.complete(v2);
1758 <            f.complete(v1);
1759 <        }
1760 <
1761 <        checkCompletedWithWrappedCFException(h);
1762 <        checkCompletedNormally(f, v1);
1763 <        checkCompletedNormally(g, v2);
1750 >        final SubtractFunction r1 = new SubtractFunction(m);
1751 >        final SubtractFunction r2 = new SubtractFunction(m);
1752 >        final SubtractFunction r3 = new SubtractFunction(m);
1753 >
1754 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1755 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1756 >        final Callable<Boolean> complete1 = failFirst ?
1757 >            () -> fst.cancel(mayInterruptIfRunning) :
1758 >            () -> fst.complete(v1);
1759 >        final Callable<Boolean> complete2 = failFirst ?
1760 >            () -> snd.complete(v1) :
1761 >            () -> snd.cancel(mayInterruptIfRunning);
1762 >
1763 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1764 >        assertTrue(complete1.call());
1765 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1766 >        checkIncomplete(h1);
1767 >        checkIncomplete(h2);
1768 >        assertTrue(complete2.call());
1769 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1770 >
1771 >        checkCompletedWithWrappedCancellationException(h1);
1772 >        checkCompletedWithWrappedCancellationException(h2);
1773 >        checkCompletedWithWrappedCancellationException(h3);
1774 >        r1.assertNotInvoked();
1775 >        r2.assertNotInvoked();
1776 >        r3.assertNotInvoked();
1777 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1778 >        checkCancelled(failFirst ? fst : snd);
1779      }}
1780  
1781      /**
1782 <     * thenCombine result completes exceptionally if either source cancelled
1782 >     * thenCombine result completes exceptionally if action does
1783       */
1784 <    public void testThenCombine_sourceCancelled() {
1784 >    public void testThenCombine_actionFailed() {
1785          for (ExecutionMode m : ExecutionMode.values())
1411        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412        for (boolean createIncomplete : new boolean[] { true, false })
1786          for (boolean fFirst : new boolean[] { true, false })
1787          for (Integer v1 : new Integer[] { 1, null })
1788 +        for (Integer v2 : new Integer[] { 2, null })
1789      {
1790          final CompletableFuture<Integer> f = new CompletableFuture<>();
1791          final CompletableFuture<Integer> g = new CompletableFuture<>();
1792 <        final SubtractFunction r = new SubtractFunction(m);
1793 <
1794 <        (fFirst ? f : g).complete(v1);
1795 <        if (!createIncomplete)
1796 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1797 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1798 <        if (createIncomplete) {
1799 <            checkIncomplete(h);
1800 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1801 <        }
1802 <
1803 <        checkCompletedWithWrappedCancellationException(h);
1804 <        checkCancelled(!fFirst ? f : g);
1805 <        assertEquals(0, r.invocationCount);
1806 <        checkCompletedNormally(fFirst ? f : g, v1);
1792 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1793 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1794 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1795 >
1796 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1797 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1798 >        final Integer w1 =  fFirst ? v1 : v2;
1799 >        final Integer w2 = !fFirst ? v1 : v2;
1800 >
1801 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1802 >        assertTrue(fst.complete(w1));
1803 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1804 >        assertTrue(snd.complete(w2));
1805 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1806 >
1807 >        checkCompletedWithWrappedException(h1, r1.ex);
1808 >        checkCompletedWithWrappedException(h2, r2.ex);
1809 >        checkCompletedWithWrappedException(h3, r3.ex);
1810 >        r1.assertInvoked();
1811 >        r2.assertInvoked();
1812 >        r3.assertInvoked();
1813 >        checkCompletedNormally(f, v1);
1814 >        checkCompletedNormally(g, v2);
1815      }}
1816  
1817      /**
# Line 1438 | Line 1820 | public class CompletableFutureTest exten
1820       */
1821      public void testThenAcceptBoth_normalCompletion() {
1822          for (ExecutionMode m : ExecutionMode.values())
1441        for (boolean createIncomplete : new boolean[] { true, false })
1823          for (boolean fFirst : new boolean[] { true, false })
1824          for (Integer v1 : new Integer[] { 1, null })
1825          for (Integer v2 : new Integer[] { 2, null })
1826      {
1827          final CompletableFuture<Integer> f = new CompletableFuture<>();
1828          final CompletableFuture<Integer> g = new CompletableFuture<>();
1829 <        final SubtractAction r = new SubtractAction(m);
1830 <
1831 <        if (fFirst) f.complete(v1); else g.complete(v2);
1832 <        if (!createIncomplete)
1833 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1834 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1835 <        if (createIncomplete) {
1836 <            checkIncomplete(h);
1837 <            assertEquals(0, r.invocationCount);
1838 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1839 <        }
1840 <
1841 <        checkCompletedNormally(h, null);
1842 <        assertEquals(subtract(v1, v2), r.value);
1829 >        final SubtractAction r1 = new SubtractAction(m);
1830 >        final SubtractAction r2 = new SubtractAction(m);
1831 >        final SubtractAction r3 = new SubtractAction(m);
1832 >
1833 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1834 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1835 >        final Integer w1 =  fFirst ? v1 : v2;
1836 >        final Integer w2 = !fFirst ? v1 : v2;
1837 >
1838 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1839 >        assertTrue(fst.complete(w1));
1840 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1841 >        checkIncomplete(h1);
1842 >        checkIncomplete(h2);
1843 >        r1.assertNotInvoked();
1844 >        r2.assertNotInvoked();
1845 >        assertTrue(snd.complete(w2));
1846 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1847 >
1848 >        checkCompletedNormally(h1, null);
1849 >        checkCompletedNormally(h2, null);
1850 >        checkCompletedNormally(h3, null);
1851 >        r1.assertValue(subtract(v1, v2));
1852 >        r2.assertValue(subtract(v1, v2));
1853 >        r3.assertValue(subtract(v1, v2));
1854          checkCompletedNormally(f, v1);
1855          checkCompletedNormally(g, v2);
1856      }}
# Line 1467 | Line 1859 | public class CompletableFutureTest exten
1859       * thenAcceptBoth result completes exceptionally after exceptional
1860       * completion of either source
1861       */
1862 <    public void testThenAcceptBoth_exceptionalCompletion() {
1862 >    public void testThenAcceptBoth_exceptionalCompletion() throws Throwable {
1863          for (ExecutionMode m : ExecutionMode.values())
1472        for (boolean createIncomplete : new boolean[] { true, false })
1864          for (boolean fFirst : new boolean[] { true, false })
1865 +        for (boolean failFirst : new boolean[] { true, false })
1866          for (Integer v1 : new Integer[] { 1, null })
1867      {
1868          final CompletableFuture<Integer> f = new CompletableFuture<>();
1869          final CompletableFuture<Integer> g = new CompletableFuture<>();
1870          final CFException ex = new CFException();
1871 <        final SubtractAction r = new SubtractAction(m);
1872 <
1873 <        (fFirst ? f : g).complete(v1);
1874 <        if (!createIncomplete)
1875 <            (!fFirst ? f : g).completeExceptionally(ex);
1876 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1877 <        if (createIncomplete) {
1878 <            checkIncomplete(h);
1879 <            (!fFirst ? f : g).completeExceptionally(ex);
1880 <        }
1881 <
1882 <        checkCompletedWithWrappedCFException(h, ex);
1883 <        assertEquals(0, r.invocationCount);
1884 <        checkCompletedNormally(fFirst ? f : g, v1);
1885 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1871 >        final SubtractAction r1 = new SubtractAction(m);
1872 >        final SubtractAction r2 = new SubtractAction(m);
1873 >        final SubtractAction r3 = new SubtractAction(m);
1874 >
1875 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1876 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1877 >        final Callable<Boolean> complete1 = failFirst ?
1878 >            () -> fst.completeExceptionally(ex) :
1879 >            () -> fst.complete(v1);
1880 >        final Callable<Boolean> complete2 = failFirst ?
1881 >            () -> snd.complete(v1) :
1882 >            () -> snd.completeExceptionally(ex);
1883 >
1884 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1885 >        assertTrue(complete1.call());
1886 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1887 >        checkIncomplete(h1);
1888 >        checkIncomplete(h2);
1889 >        assertTrue(complete2.call());
1890 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1891 >
1892 >        checkCompletedWithWrappedException(h1, ex);
1893 >        checkCompletedWithWrappedException(h2, ex);
1894 >        checkCompletedWithWrappedException(h3, ex);
1895 >        r1.assertNotInvoked();
1896 >        r2.assertNotInvoked();
1897 >        r3.assertNotInvoked();
1898 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1899 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1900      }}
1901  
1902      /**
1903 <     * thenAcceptBoth result completes exceptionally if action does
1903 >     * thenAcceptBoth result completes exceptionally if either source cancelled
1904       */
1905 <    public void testThenAcceptBoth_actionFailed() {
1905 >    public void testThenAcceptBoth_sourceCancelled() throws Throwable {
1906          for (ExecutionMode m : ExecutionMode.values())
1907 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1908          for (boolean fFirst : new boolean[] { true, false })
1909 +        for (boolean failFirst : new boolean[] { true, false })
1910          for (Integer v1 : new Integer[] { 1, null })
1503        for (Integer v2 : new Integer[] { 2, null })
1911      {
1912          final CompletableFuture<Integer> f = new CompletableFuture<>();
1913          final CompletableFuture<Integer> g = new CompletableFuture<>();
1914 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1915 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1916 <
1917 <        if (fFirst) {
1918 <            f.complete(v1);
1919 <            g.complete(v2);
1920 <        } else {
1921 <            g.complete(v2);
1922 <            f.complete(v1);
1923 <        }
1924 <
1925 <        checkCompletedWithWrappedCFException(h);
1926 <        checkCompletedNormally(f, v1);
1927 <        checkCompletedNormally(g, v2);
1914 >        final SubtractAction r1 = new SubtractAction(m);
1915 >        final SubtractAction r2 = new SubtractAction(m);
1916 >        final SubtractAction r3 = new SubtractAction(m);
1917 >
1918 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1919 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1920 >        final Callable<Boolean> complete1 = failFirst ?
1921 >            () -> fst.cancel(mayInterruptIfRunning) :
1922 >            () -> fst.complete(v1);
1923 >        final Callable<Boolean> complete2 = failFirst ?
1924 >            () -> snd.complete(v1) :
1925 >            () -> snd.cancel(mayInterruptIfRunning);
1926 >
1927 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1928 >        assertTrue(complete1.call());
1929 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1930 >        checkIncomplete(h1);
1931 >        checkIncomplete(h2);
1932 >        assertTrue(complete2.call());
1933 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1934 >
1935 >        checkCompletedWithWrappedCancellationException(h1);
1936 >        checkCompletedWithWrappedCancellationException(h2);
1937 >        checkCompletedWithWrappedCancellationException(h3);
1938 >        r1.assertNotInvoked();
1939 >        r2.assertNotInvoked();
1940 >        r3.assertNotInvoked();
1941 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1942 >        checkCancelled(failFirst ? fst : snd);
1943      }}
1944  
1945      /**
1946 <     * thenAcceptBoth result completes exceptionally if either source cancelled
1946 >     * thenAcceptBoth result completes exceptionally if action does
1947       */
1948 <    public void testThenAcceptBoth_sourceCancelled() {
1948 >    public void testThenAcceptBoth_actionFailed() {
1949          for (ExecutionMode m : ExecutionMode.values())
1528        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529        for (boolean createIncomplete : new boolean[] { true, false })
1950          for (boolean fFirst : new boolean[] { true, false })
1951          for (Integer v1 : new Integer[] { 1, null })
1952 +        for (Integer v2 : new Integer[] { 2, null })
1953      {
1954          final CompletableFuture<Integer> f = new CompletableFuture<>();
1955          final CompletableFuture<Integer> g = new CompletableFuture<>();
1956 <        final SubtractAction r = new SubtractAction(m);
1957 <
1958 <        (fFirst ? f : g).complete(v1);
1959 <        if (!createIncomplete)
1960 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1961 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1962 <        if (createIncomplete) {
1963 <            checkIncomplete(h);
1964 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1965 <        }
1966 <
1967 <        checkCompletedWithWrappedCancellationException(h);
1968 <        checkCancelled(!fFirst ? f : g);
1969 <        assertEquals(0, r.invocationCount);
1970 <        checkCompletedNormally(fFirst ? f : g, v1);
1956 >        final FailingBiConsumer r1 = new FailingBiConsumer(m);
1957 >        final FailingBiConsumer r2 = new FailingBiConsumer(m);
1958 >        final FailingBiConsumer r3 = new FailingBiConsumer(m);
1959 >
1960 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1961 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1962 >        final Integer w1 =  fFirst ? v1 : v2;
1963 >        final Integer w2 = !fFirst ? v1 : v2;
1964 >
1965 >        final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1966 >        assertTrue(fst.complete(w1));
1967 >        final CompletableFuture<Void> h2 = m.thenAcceptBoth(f, g, r2);
1968 >        assertTrue(snd.complete(w2));
1969 >        final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1970 >
1971 >        checkCompletedWithWrappedException(h1, r1.ex);
1972 >        checkCompletedWithWrappedException(h2, r2.ex);
1973 >        checkCompletedWithWrappedException(h3, r3.ex);
1974 >        r1.assertInvoked();
1975 >        r2.assertInvoked();
1976 >        r3.assertInvoked();
1977 >        checkCompletedNormally(f, v1);
1978 >        checkCompletedNormally(g, v2);
1979      }}
1980  
1981      /**
# Line 1555 | Line 1984 | public class CompletableFutureTest exten
1984       */
1985      public void testRunAfterBoth_normalCompletion() {
1986          for (ExecutionMode m : ExecutionMode.values())
1558        for (boolean createIncomplete : new boolean[] { true, false })
1987          for (boolean fFirst : new boolean[] { true, false })
1988          for (Integer v1 : new Integer[] { 1, null })
1989          for (Integer v2 : new Integer[] { 2, null })
1990      {
1991          final CompletableFuture<Integer> f = new CompletableFuture<>();
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993 <        final Noop r = new Noop(m);
1994 <
1995 <        if (fFirst) f.complete(v1); else g.complete(v2);
1996 <        if (!createIncomplete)
1997 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1998 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1999 <        if (createIncomplete) {
2000 <            checkIncomplete(h);
2001 <            assertEquals(0, r.invocationCount);
2002 <            if (!fFirst) f.complete(v1); else g.complete(v2);
2003 <        }
2004 <
2005 <        checkCompletedNormally(h, null);
2006 <        assertEquals(1, r.invocationCount);
1993 >        final Noop r1 = new Noop(m);
1994 >        final Noop r2 = new Noop(m);
1995 >        final Noop r3 = new Noop(m);
1996 >
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        checkIncomplete(h1);
2006 >        checkIncomplete(h2);
2007 >        r1.assertNotInvoked();
2008 >        r2.assertNotInvoked();
2009 >        assertTrue(snd.complete(w2));
2010 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2011 >
2012 >        checkCompletedNormally(h1, null);
2013 >        checkCompletedNormally(h2, null);
2014 >        checkCompletedNormally(h3, null);
2015 >        r1.assertInvoked();
2016 >        r2.assertInvoked();
2017 >        r3.assertInvoked();
2018          checkCompletedNormally(f, v1);
2019          checkCompletedNormally(g, v2);
2020      }}
# Line 1584 | Line 2023 | public class CompletableFutureTest exten
2023       * runAfterBoth result completes exceptionally after exceptional
2024       * completion of either source
2025       */
2026 <    public void testRunAfterBoth_exceptionalCompletion() {
2026 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
2027          for (ExecutionMode m : ExecutionMode.values())
1589        for (boolean createIncomplete : new boolean[] { true, false })
2028          for (boolean fFirst : new boolean[] { true, false })
2029 +        for (boolean failFirst : new boolean[] { true, false })
2030          for (Integer v1 : new Integer[] { 1, null })
2031      {
2032          final CompletableFuture<Integer> f = new CompletableFuture<>();
2033          final CompletableFuture<Integer> g = new CompletableFuture<>();
2034          final CFException ex = new CFException();
2035 <        final Noop r = new Noop(m);
2036 <
2037 <        (fFirst ? f : g).complete(v1);
2038 <        if (!createIncomplete)
2039 <            (!fFirst ? f : g).completeExceptionally(ex);
2040 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2041 <        if (createIncomplete) {
2042 <            checkIncomplete(h);
2043 <            (!fFirst ? f : g).completeExceptionally(ex);
2044 <        }
2045 <
2046 <        checkCompletedWithWrappedCFException(h, ex);
2047 <        assertEquals(0, r.invocationCount);
2048 <        checkCompletedNormally(fFirst ? f : g, v1);
2049 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
2050 <    }}
2051 <
2052 <    /**
2053 <     * runAfterBoth result completes exceptionally if action does
2054 <     */
2055 <    public void testRunAfterBoth_actionFailed() {
2056 <        for (ExecutionMode m : ExecutionMode.values())
2057 <        for (boolean fFirst : new boolean[] { true, false })
2058 <        for (Integer v1 : new Integer[] { 1, null })
2059 <        for (Integer v2 : new Integer[] { 2, null })
2060 <    {
2061 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2062 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2063 <        final FailingRunnable r = new FailingRunnable(m);
1625 <
1626 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1627 <        if (fFirst) {
1628 <            f.complete(v1);
1629 <            g.complete(v2);
1630 <        } else {
1631 <            g.complete(v2);
1632 <            f.complete(v1);
1633 <        }
1634 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1635 <
1636 <        checkCompletedWithWrappedCFException(h1);
1637 <        checkCompletedWithWrappedCFException(h2);
1638 <        checkCompletedNormally(f, v1);
1639 <        checkCompletedNormally(g, v2);
2035 >        final Noop r1 = new Noop(m);
2036 >        final Noop r2 = new Noop(m);
2037 >        final Noop r3 = new Noop(m);
2038 >
2039 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2040 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2041 >        final Callable<Boolean> complete1 = failFirst ?
2042 >            () -> fst.completeExceptionally(ex) :
2043 >            () -> fst.complete(v1);
2044 >        final Callable<Boolean> complete2 = failFirst ?
2045 >            () -> snd.complete(v1) :
2046 >            () -> snd.completeExceptionally(ex);
2047 >
2048 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2049 >        assertTrue(complete1.call());
2050 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2051 >        checkIncomplete(h1);
2052 >        checkIncomplete(h2);
2053 >        assertTrue(complete2.call());
2054 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2055 >
2056 >        checkCompletedWithWrappedException(h1, ex);
2057 >        checkCompletedWithWrappedException(h2, ex);
2058 >        checkCompletedWithWrappedException(h3, ex);
2059 >        r1.assertNotInvoked();
2060 >        r2.assertNotInvoked();
2061 >        r3.assertNotInvoked();
2062 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2063 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
2064      }}
2065  
2066      /**
2067       * runAfterBoth result completes exceptionally if either source cancelled
2068       */
2069 <    public void testRunAfterBoth_sourceCancelled() {
2069 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
2070          for (ExecutionMode m : ExecutionMode.values())
2071          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648        for (boolean createIncomplete : new boolean[] { true, false })
2072          for (boolean fFirst : new boolean[] { true, false })
2073 +        for (boolean failFirst : new boolean[] { true, false })
2074          for (Integer v1 : new Integer[] { 1, null })
2075      {
2076          final CompletableFuture<Integer> f = new CompletableFuture<>();
2077          final CompletableFuture<Integer> g = new CompletableFuture<>();
2078 <        final Noop r = new Noop(m);
2079 <
2080 <
2081 <        (fFirst ? f : g).complete(v1);
2082 <        if (!createIncomplete)
2083 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2084 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
2085 <        if (createIncomplete) {
2086 <            checkIncomplete(h);
2087 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
2088 <        }
2089 <
2090 <        checkCompletedWithWrappedCancellationException(h);
2091 <        checkCancelled(!fFirst ? f : g);
2092 <        assertEquals(0, r.invocationCount);
2093 <        checkCompletedNormally(fFirst ? f : g, v1);
2078 >        final Noop r1 = new Noop(m);
2079 >        final Noop r2 = new Noop(m);
2080 >        final Noop r3 = new Noop(m);
2081 >
2082 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2083 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2084 >        final Callable<Boolean> complete1 = failFirst ?
2085 >            () -> fst.cancel(mayInterruptIfRunning) :
2086 >            () -> fst.complete(v1);
2087 >        final Callable<Boolean> complete2 = failFirst ?
2088 >            () -> snd.complete(v1) :
2089 >            () -> snd.cancel(mayInterruptIfRunning);
2090 >
2091 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2092 >        assertTrue(complete1.call());
2093 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2094 >        checkIncomplete(h1);
2095 >        checkIncomplete(h2);
2096 >        assertTrue(complete2.call());
2097 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2098 >
2099 >        checkCompletedWithWrappedCancellationException(h1);
2100 >        checkCompletedWithWrappedCancellationException(h2);
2101 >        checkCompletedWithWrappedCancellationException(h3);
2102 >        r1.assertNotInvoked();
2103 >        r2.assertNotInvoked();
2104 >        r3.assertNotInvoked();
2105 >        checkCompletedNormally(failFirst ? snd : fst, v1);
2106 >        checkCancelled(failFirst ? fst : snd);
2107      }}
2108  
2109      /**
2110 <     * applyToEither result completes normally after normal completion
1674 <     * of either source
2110 >     * runAfterBoth result completes exceptionally if action does
2111       */
2112 <    public void testApplyToEither_normalCompletion() {
2112 >    public void testRunAfterBoth_actionFailed() {
2113          for (ExecutionMode m : ExecutionMode.values())
1678        for (boolean createIncomplete : new boolean[] { true, false })
2114          for (boolean fFirst : new boolean[] { true, false })
2115          for (Integer v1 : new Integer[] { 1, null })
2116          for (Integer v2 : new Integer[] { 2, null })
2117      {
2118          final CompletableFuture<Integer> f = new CompletableFuture<>();
2119          final CompletableFuture<Integer> g = new CompletableFuture<>();
2120 <        final IncFunction r = new IncFunction(m);
2121 <
2122 <        if (!createIncomplete)
2123 <            if (fFirst) f.complete(v1); else g.complete(v2);
2124 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2125 <        if (createIncomplete) {
2126 <            checkIncomplete(h);
2127 <            assertEquals(0, r.invocationCount);
2128 <            if (fFirst) f.complete(v1); else g.complete(v2);
2129 <        }
2130 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2131 <        if (!fFirst) f.complete(v1); else g.complete(v2);
2132 <
2120 >        final FailingRunnable r1 = new FailingRunnable(m);
2121 >        final FailingRunnable r2 = new FailingRunnable(m);
2122 >        final FailingRunnable r3 = new FailingRunnable(m);
2123 >
2124 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2125 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2126 >        final Integer w1 =  fFirst ? v1 : v2;
2127 >        final Integer w2 = !fFirst ? v1 : v2;
2128 >
2129 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2130 >        assertTrue(fst.complete(w1));
2131 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2132 >        assertTrue(snd.complete(w2));
2133 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2134 >
2135 >        checkCompletedWithWrappedException(h1, r1.ex);
2136 >        checkCompletedWithWrappedException(h2, r2.ex);
2137 >        checkCompletedWithWrappedException(h3, r3.ex);
2138 >        r1.assertInvoked();
2139 >        r2.assertInvoked();
2140 >        r3.assertInvoked();
2141          checkCompletedNormally(f, v1);
2142          checkCompletedNormally(g, v2);
1700        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
2143      }}
2144  
2145 <    public void testApplyToEither_normalCompletionBothAvailable() {
2145 >    /**
2146 >     * applyToEither result completes normally after normal completion
2147 >     * of either source
2148 >     */
2149 >    public void testApplyToEither_normalCompletion() {
2150          for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean fFirst : new boolean[] { true, false })
2151          for (Integer v1 : new Integer[] { 1, null })
2152          for (Integer v2 : new Integer[] { 2, null })
2153      {
2154          final CompletableFuture<Integer> f = new CompletableFuture<>();
2155          final CompletableFuture<Integer> g = new CompletableFuture<>();
2156 <        final IncFunction r = new IncFunction(m);
2156 >        final IncFunction[] rs = new IncFunction[6];
2157 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2158  
2159 <        if (fFirst) {
2160 <            f.complete(v1);
2161 <            g.complete(v2);
2162 <        } else {
2163 <            g.complete(v2);
2164 <            f.complete(v1);
2165 <        }
2159 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2160 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2161 >        checkIncomplete(h0);
2162 >        checkIncomplete(h1);
2163 >        rs[0].assertNotInvoked();
2164 >        rs[1].assertNotInvoked();
2165 >        f.complete(v1);
2166 >        checkCompletedNormally(h0, inc(v1));
2167 >        checkCompletedNormally(h1, inc(v1));
2168 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2169 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2170 >        checkCompletedNormally(h2, inc(v1));
2171 >        checkCompletedNormally(h3, inc(v1));
2172 >        g.complete(v2);
2173  
2174 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2174 >        // unspecified behavior - both source completions available
2175 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2176 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2177 >        rs[4].assertValue(h4.join());
2178 >        rs[5].assertValue(h5.join());
2179 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
2180 >                   Objects.equals(inc(v2), h4.join()));
2181 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
2182 >                   Objects.equals(inc(v2), h5.join()));
2183  
2184          checkCompletedNormally(f, v1);
2185          checkCompletedNormally(g, v2);
2186 <
2187 <        // unspecified behavior
2188 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
2189 <                   Objects.equals(h.join(), inc(v2)));
2190 <        assertEquals(1, r.invocationCount);
2186 >        checkCompletedNormally(h0, inc(v1));
2187 >        checkCompletedNormally(h1, inc(v1));
2188 >        checkCompletedNormally(h2, inc(v1));
2189 >        checkCompletedNormally(h3, inc(v1));
2190 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
2191      }}
2192  
2193      /**
2194       * applyToEither result completes exceptionally after exceptional
2195       * completion of either source
2196       */
2197 <    public void testApplyToEither_exceptionalCompletion1() {
2197 >    public void testApplyToEither_exceptionalCompletion() {
2198          for (ExecutionMode m : ExecutionMode.values())
1738        for (boolean createIncomplete : new boolean[] { true, false })
1739        for (boolean fFirst : new boolean[] { true, false })
2199          for (Integer v1 : new Integer[] { 1, null })
2200      {
2201          final CompletableFuture<Integer> f = new CompletableFuture<>();
2202          final CompletableFuture<Integer> g = new CompletableFuture<>();
2203          final CFException ex = new CFException();
2204 <        final IncFunction r = new IncFunction(m);
2204 >        final IncFunction[] rs = new IncFunction[6];
2205 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2206  
2207 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
2208 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2209 <        if (createIncomplete) {
2210 <            checkIncomplete(h);
2211 <            assertEquals(0, r.invocationCount);
2212 <            (fFirst ? f : g).completeExceptionally(ex);
2207 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2208 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2209 >        checkIncomplete(h0);
2210 >        checkIncomplete(h1);
2211 >        rs[0].assertNotInvoked();
2212 >        rs[1].assertNotInvoked();
2213 >        f.completeExceptionally(ex);
2214 >        checkCompletedWithWrappedException(h0, ex);
2215 >        checkCompletedWithWrappedException(h1, ex);
2216 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2217 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2218 >        checkCompletedWithWrappedException(h2, ex);
2219 >        checkCompletedWithWrappedException(h3, ex);
2220 >        g.complete(v1);
2221 >
2222 >        // unspecified behavior - both source completions available
2223 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2224 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2225 >        try {
2226 >            assertEquals(inc(v1), h4.join());
2227 >            rs[4].assertValue(inc(v1));
2228 >        } catch (CompletionException ok) {
2229 >            checkCompletedWithWrappedException(h4, ex);
2230 >            rs[4].assertNotInvoked();
2231 >        }
2232 >        try {
2233 >            assertEquals(inc(v1), h5.join());
2234 >            rs[5].assertValue(inc(v1));
2235 >        } catch (CompletionException ok) {
2236 >            checkCompletedWithWrappedException(h5, ex);
2237 >            rs[5].assertNotInvoked();
2238          }
2239  
2240 <        checkCompletedWithWrappedCFException(h, ex);
2241 <        (!fFirst ? f : g).complete(v1);
2242 <
2243 <        assertEquals(0, r.invocationCount);
2244 <        checkCompletedNormally(!fFirst ? f : g, v1);
2245 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2246 <        checkCompletedWithWrappedCFException(h, ex);
2240 >        checkCompletedExceptionally(f, ex);
2241 >        checkCompletedNormally(g, v1);
2242 >        checkCompletedWithWrappedException(h0, ex);
2243 >        checkCompletedWithWrappedException(h1, ex);
2244 >        checkCompletedWithWrappedException(h2, ex);
2245 >        checkCompletedWithWrappedException(h3, ex);
2246 >        checkCompletedWithWrappedException(h4, ex);
2247 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2248      }}
2249  
2250      public void testApplyToEither_exceptionalCompletion2() {
2251          for (ExecutionMode m : ExecutionMode.values())
1766        for (boolean reverseArgs : new boolean[] { true, false })
2252          for (boolean fFirst : new boolean[] { true, false })
2253          for (Integer v1 : new Integer[] { 1, null })
2254      {
2255          final CompletableFuture<Integer> f = new CompletableFuture<>();
2256          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772        final IncFunction r1 = new IncFunction(m);
1773        final IncFunction r2 = new IncFunction(m);
2257          final CFException ex = new CFException();
2258 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2259 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2260 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2261 <        if (fFirst) {
2262 <            f.complete(v1);
2263 <            g.completeExceptionally(ex);
2264 <        } else {
2265 <            g.completeExceptionally(ex);
2266 <            f.complete(v1);
1784 <        }
1785 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2258 >        final IncFunction[] rs = new IncFunction[6];
2259 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2260 >
2261 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2262 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2263 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2264 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2265 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2266 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2267  
2268 <        // unspecified behavior
2268 >        // unspecified behavior - both source completions available
2269 >        try {
2270 >            assertEquals(inc(v1), h0.join());
2271 >            rs[0].assertValue(inc(v1));
2272 >        } catch (CompletionException ok) {
2273 >            checkCompletedWithWrappedException(h0, ex);
2274 >            rs[0].assertNotInvoked();
2275 >        }
2276          try {
2277              assertEquals(inc(v1), h1.join());
2278 <            assertEquals(1, r1.invocationCount);
2278 >            rs[1].assertValue(inc(v1));
2279          } catch (CompletionException ok) {
2280 <            checkCompletedWithWrappedCFException(h1, ex);
2281 <            assertEquals(0, r1.invocationCount);
2280 >            checkCompletedWithWrappedException(h1, ex);
2281 >            rs[1].assertNotInvoked();
2282          }
1795
2283          try {
2284              assertEquals(inc(v1), h2.join());
2285 <            assertEquals(1, r2.invocationCount);
2285 >            rs[2].assertValue(inc(v1));
2286          } catch (CompletionException ok) {
2287 <            checkCompletedWithWrappedCFException(h2, ex);
2288 <            assertEquals(0, r2.invocationCount);
2287 >            checkCompletedWithWrappedException(h2, ex);
2288 >            rs[2].assertNotInvoked();
2289 >        }
2290 >        try {
2291 >            assertEquals(inc(v1), h3.join());
2292 >            rs[3].assertValue(inc(v1));
2293 >        } catch (CompletionException ok) {
2294 >            checkCompletedWithWrappedException(h3, ex);
2295 >            rs[3].assertNotInvoked();
2296          }
2297  
1804        checkCompletedWithWrappedCFException(g, ex);
1805        checkCompletedNormally(f, v1);
1806    }}
1807
1808    /**
1809     * applyToEither result completes exceptionally if action does
1810     */
1811    public void testApplyToEither_actionFailed1() {
1812        for (ExecutionMode m : ExecutionMode.values())
1813        for (Integer v1 : new Integer[] { 1, null })
1814        for (Integer v2 : new Integer[] { 2, null })
1815    {
1816        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818        final FailingFunction r = new FailingFunction(m);
1819        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1820
1821        f.complete(v1);
1822        checkCompletedWithWrappedCFException(h);
1823        g.complete(v2);
1824        checkCompletedNormally(f, v1);
1825        checkCompletedNormally(g, v2);
1826    }}
1827
1828    public void testApplyToEither_actionFailed2() {
1829        for (ExecutionMode m : ExecutionMode.values())
1830        for (Integer v1 : new Integer[] { 1, null })
1831        for (Integer v2 : new Integer[] { 2, null })
1832    {
1833        final CompletableFuture<Integer> f = new CompletableFuture<>();
1834        final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final FailingFunction r = new FailingFunction(m);
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837
1838        g.complete(v2);
1839        checkCompletedWithWrappedCFException(h);
1840        f.complete(v1);
2298          checkCompletedNormally(f, v1);
2299 <        checkCompletedNormally(g, v2);
2299 >        checkCompletedExceptionally(g, ex);
2300      }}
2301  
2302      /**
2303       * applyToEither result completes exceptionally if either source cancelled
2304       */
2305 <    public void testApplyToEither_sourceCancelled1() {
2305 >    public void testApplyToEither_sourceCancelled() {
2306          for (ExecutionMode m : ExecutionMode.values())
2307          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851        for (boolean createIncomplete : new boolean[] { true, false })
1852        for (boolean fFirst : new boolean[] { true, false })
2308          for (Integer v1 : new Integer[] { 1, null })
2309      {
2310          final CompletableFuture<Integer> f = new CompletableFuture<>();
2311          final CompletableFuture<Integer> g = new CompletableFuture<>();
2312 <        final IncFunction r = new IncFunction(m);
2312 >        final IncFunction[] rs = new IncFunction[6];
2313 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2314  
2315 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2316 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2317 <        if (createIncomplete) {
2318 <            checkIncomplete(h);
2319 <            assertEquals(0, r.invocationCount);
2320 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2315 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2316 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2317 >        checkIncomplete(h0);
2318 >        checkIncomplete(h1);
2319 >        rs[0].assertNotInvoked();
2320 >        rs[1].assertNotInvoked();
2321 >        f.cancel(mayInterruptIfRunning);
2322 >        checkCompletedWithWrappedCancellationException(h0);
2323 >        checkCompletedWithWrappedCancellationException(h1);
2324 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2325 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2326 >        checkCompletedWithWrappedCancellationException(h2);
2327 >        checkCompletedWithWrappedCancellationException(h3);
2328 >        g.complete(v1);
2329 >
2330 >        // unspecified behavior - both source completions available
2331 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2332 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2333 >        try {
2334 >            assertEquals(inc(v1), h4.join());
2335 >            rs[4].assertValue(inc(v1));
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedCancellationException(h4);
2338 >            rs[4].assertNotInvoked();
2339 >        }
2340 >        try {
2341 >            assertEquals(inc(v1), h5.join());
2342 >            rs[5].assertValue(inc(v1));
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedCancellationException(h5);
2345 >            rs[5].assertNotInvoked();
2346          }
2347  
2348 <        checkCompletedWithWrappedCancellationException(h);
2349 <        (!fFirst ? f : g).complete(v1);
2350 <
2351 <        assertEquals(0, r.invocationCount);
2352 <        checkCompletedNormally(!fFirst ? f : g, v1);
2353 <        checkCancelled(fFirst ? f : g);
2354 <        checkCompletedWithWrappedCancellationException(h);
2348 >        checkCancelled(f);
2349 >        checkCompletedNormally(g, v1);
2350 >        checkCompletedWithWrappedCancellationException(h0);
2351 >        checkCompletedWithWrappedCancellationException(h1);
2352 >        checkCompletedWithWrappedCancellationException(h2);
2353 >        checkCompletedWithWrappedCancellationException(h3);
2354 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2355      }}
2356  
2357      public void testApplyToEither_sourceCancelled2() {
2358          for (ExecutionMode m : ExecutionMode.values())
2359          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879        for (boolean reverseArgs : new boolean[] { true, false })
2360          for (boolean fFirst : new boolean[] { true, false })
2361          for (Integer v1 : new Integer[] { 1, null })
2362      {
2363          final CompletableFuture<Integer> f = new CompletableFuture<>();
2364          final CompletableFuture<Integer> g = new CompletableFuture<>();
2365 <        final IncFunction r1 = new IncFunction(m);
2366 <        final IncFunction r2 = new IncFunction(m);
1887 <        final CFException ex = new CFException();
1888 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1889 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2365 >        final IncFunction[] rs = new IncFunction[6];
2366 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2367  
2368 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2369 <        if (fFirst) {
2370 <            f.complete(v1);
2371 <            assertTrue(g.cancel(mayInterruptIfRunning));
2372 <        } else {
2373 <            assertTrue(g.cancel(mayInterruptIfRunning));
1897 <            f.complete(v1);
1898 <        }
1899 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2368 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2369 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2370 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2371 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2372 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2373 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2374  
2375 <        // unspecified behavior
2375 >        // unspecified behavior - both source completions available
2376 >        try {
2377 >            assertEquals(inc(v1), h0.join());
2378 >            rs[0].assertValue(inc(v1));
2379 >        } catch (CompletionException ok) {
2380 >            checkCompletedWithWrappedCancellationException(h0);
2381 >            rs[0].assertNotInvoked();
2382 >        }
2383          try {
2384              assertEquals(inc(v1), h1.join());
2385 <            assertEquals(1, r1.invocationCount);
2385 >            rs[1].assertValue(inc(v1));
2386          } catch (CompletionException ok) {
2387              checkCompletedWithWrappedCancellationException(h1);
2388 <            assertEquals(0, r1.invocationCount);
2388 >            rs[1].assertNotInvoked();
2389          }
1909
2390          try {
2391              assertEquals(inc(v1), h2.join());
2392 <            assertEquals(1, r2.invocationCount);
2392 >            rs[2].assertValue(inc(v1));
2393          } catch (CompletionException ok) {
2394              checkCompletedWithWrappedCancellationException(h2);
2395 <            assertEquals(0, r2.invocationCount);
2395 >            rs[2].assertNotInvoked();
2396 >        }
2397 >        try {
2398 >            assertEquals(inc(v1), h3.join());
2399 >            rs[3].assertValue(inc(v1));
2400 >        } catch (CompletionException ok) {
2401 >            checkCompletedWithWrappedCancellationException(h3);
2402 >            rs[3].assertNotInvoked();
2403          }
2404  
1918        checkCancelled(g);
2405          checkCompletedNormally(f, v1);
2406 +        checkCancelled(g);
2407      }}
2408  
2409      /**
2410 <     * acceptEither result completes normally after normal completion
1924 <     * of either source
2410 >     * applyToEither result completes exceptionally if action does
2411       */
2412 <    public void testAcceptEither_normalCompletion1() {
2412 >    public void testApplyToEither_actionFailed() {
2413          for (ExecutionMode m : ExecutionMode.values())
2414          for (Integer v1 : new Integer[] { 1, null })
2415          for (Integer v2 : new Integer[] { 2, null })
2416      {
2417          final CompletableFuture<Integer> f = new CompletableFuture<>();
2418          final CompletableFuture<Integer> g = new CompletableFuture<>();
2419 <        final IncAction r = new IncAction();
2420 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2419 >        final FailingFunction[] rs = new FailingFunction[6];
2420 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2421  
2422 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2423 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2424          f.complete(v1);
2425 <        checkCompletedNormally(h, null);
2426 <        assertEquals(inc(v1), r.value);
2427 <        g.complete(v2);
2428 <
2429 <        checkCompletedNormally(f, v1);
2430 <        checkCompletedNormally(g, v2);
2431 <        checkCompletedNormally(h, null);
1944 <    }}
1945 <
1946 <    public void testAcceptEither_normalCompletion2() {
1947 <        for (ExecutionMode m : ExecutionMode.values())
1948 <        for (Integer v1 : new Integer[] { 1, null })
1949 <        for (Integer v2 : new Integer[] { 2, null })
1950 <    {
1951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 <        final IncAction r = new IncAction();
1954 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2425 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2426 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2427 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2428 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2429 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2430 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2431 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2432  
2433          g.complete(v2);
2434 <        checkCompletedNormally(h, null);
2435 <        assertEquals(inc(v2), r.value);
2436 <        f.complete(v1);
2434 >
2435 >        // unspecified behavior - both source completions available
2436 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2437 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2438 >
2439 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2440 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2441 >                   Objects.equals(v2, rs[4].value));
2442 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2443 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2444 >                   Objects.equals(v2, rs[5].value));
2445  
2446          checkCompletedNormally(f, v1);
2447          checkCompletedNormally(g, v2);
1963        checkCompletedNormally(h, null);
2448      }}
2449  
2450 <    public void testAcceptEither_normalCompletion3() {
2450 >    /**
2451 >     * acceptEither result completes normally after normal completion
2452 >     * of either source
2453 >     */
2454 >    public void testAcceptEither_normalCompletion() {
2455          for (ExecutionMode m : ExecutionMode.values())
2456          for (Integer v1 : new Integer[] { 1, null })
2457          for (Integer v2 : new Integer[] { 2, null })
2458      {
2459          final CompletableFuture<Integer> f = new CompletableFuture<>();
2460          final CompletableFuture<Integer> g = new CompletableFuture<>();
2461 <        final IncAction r = new IncAction();
2461 >        final NoopConsumer[] rs = new NoopConsumer[6];
2462 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2463  
2464 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2465 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2466 +        checkIncomplete(h0);
2467 +        checkIncomplete(h1);
2468 +        rs[0].assertNotInvoked();
2469 +        rs[1].assertNotInvoked();
2470          f.complete(v1);
2471 +        checkCompletedNormally(h0, null);
2472 +        checkCompletedNormally(h1, null);
2473 +        rs[0].assertValue(v1);
2474 +        rs[1].assertValue(v1);
2475 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2476 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2477 +        checkCompletedNormally(h2, null);
2478 +        checkCompletedNormally(h3, null);
2479 +        rs[2].assertValue(v1);
2480 +        rs[3].assertValue(v1);
2481          g.complete(v2);
1977        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2482  
2483 <        checkCompletedNormally(h, null);
2483 >        // unspecified behavior - both source completions available
2484 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2485 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2486 >        checkCompletedNormally(h4, null);
2487 >        checkCompletedNormally(h5, null);
2488 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2489 >                   Objects.equals(v2, rs[4].value));
2490 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2491 >                   Objects.equals(v2, rs[5].value));
2492 >
2493          checkCompletedNormally(f, v1);
2494          checkCompletedNormally(g, v2);
2495 <
2496 <        // unspecified behavior
2497 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2498 <                   Objects.equals(r.value, inc(v2)));
2495 >        checkCompletedNormally(h0, null);
2496 >        checkCompletedNormally(h1, null);
2497 >        checkCompletedNormally(h2, null);
2498 >        checkCompletedNormally(h3, null);
2499 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2500      }}
2501  
2502      /**
2503       * acceptEither result completes exceptionally after exceptional
2504       * completion of either source
2505       */
2506 <    public void testAcceptEither_exceptionalCompletion1() {
2506 >    public void testAcceptEither_exceptionalCompletion() {
2507          for (ExecutionMode m : ExecutionMode.values())
2508          for (Integer v1 : new Integer[] { 1, null })
2509      {
2510          final CompletableFuture<Integer> f = new CompletableFuture<>();
2511          final CompletableFuture<Integer> g = new CompletableFuture<>();
1998        final IncAction r = new IncAction();
1999        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2512          final CFException ex = new CFException();
2513 +        final NoopConsumer[] rs = new NoopConsumer[6];
2514 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2515  
2516 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2517 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2518 +        checkIncomplete(h0);
2519 +        checkIncomplete(h1);
2520 +        rs[0].assertNotInvoked();
2521 +        rs[1].assertNotInvoked();
2522          f.completeExceptionally(ex);
2523 <        checkCompletedWithWrappedCFException(h, ex);
2523 >        checkCompletedWithWrappedException(h0, ex);
2524 >        checkCompletedWithWrappedException(h1, ex);
2525 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2526 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2527 >        checkCompletedWithWrappedException(h2, ex);
2528 >        checkCompletedWithWrappedException(h3, ex);
2529 >
2530          g.complete(v1);
2531  
2532 <        assertEquals(0, r.invocationCount);
2532 >        // unspecified behavior - both source completions available
2533 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2534 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2535 >        try {
2536 >            assertNull(h4.join());
2537 >            rs[4].assertValue(v1);
2538 >        } catch (CompletionException ok) {
2539 >            checkCompletedWithWrappedException(h4, ex);
2540 >            rs[4].assertNotInvoked();
2541 >        }
2542 >        try {
2543 >            assertNull(h5.join());
2544 >            rs[5].assertValue(v1);
2545 >        } catch (CompletionException ok) {
2546 >            checkCompletedWithWrappedException(h5, ex);
2547 >            rs[5].assertNotInvoked();
2548 >        }
2549 >
2550 >        checkCompletedExceptionally(f, ex);
2551          checkCompletedNormally(g, v1);
2552 <        checkCompletedWithWrappedCFException(f, ex);
2553 <        checkCompletedWithWrappedCFException(h, ex);
2552 >        checkCompletedWithWrappedException(h0, ex);
2553 >        checkCompletedWithWrappedException(h1, ex);
2554 >        checkCompletedWithWrappedException(h2, ex);
2555 >        checkCompletedWithWrappedException(h3, ex);
2556 >        checkCompletedWithWrappedException(h4, ex);
2557 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2558      }}
2559  
2560      public void testAcceptEither_exceptionalCompletion2() {
2561          for (ExecutionMode m : ExecutionMode.values())
2562 +        for (boolean fFirst : new boolean[] { true, false })
2563          for (Integer v1 : new Integer[] { 1, null })
2564      {
2565          final CompletableFuture<Integer> f = new CompletableFuture<>();
2566          final CompletableFuture<Integer> g = new CompletableFuture<>();
2018        final IncAction r = new IncAction();
2019        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2020        final CFException ex = new CFException();
2021
2022        g.completeExceptionally(ex);
2023        checkCompletedWithWrappedCFException(h, ex);
2024        f.complete(v1);
2025
2026        assertEquals(0, r.invocationCount);
2027        checkCompletedNormally(f, v1);
2028        checkCompletedWithWrappedCFException(g, ex);
2029        checkCompletedWithWrappedCFException(h, ex);
2030    }}
2031
2032    public void testAcceptEither_exceptionalCompletion3() {
2033        for (ExecutionMode m : ExecutionMode.values())
2034        for (Integer v1 : new Integer[] { 1, null })
2035    {
2036        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038        final IncAction r = new IncAction();
2567          final CFException ex = new CFException();
2568 +        final NoopConsumer[] rs = new NoopConsumer[6];
2569 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2570  
2571 <        g.completeExceptionally(ex);
2572 <        f.complete(v1);
2573 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2571 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2572 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2573 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2574 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2575 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2576 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2577  
2578 <        // unspecified behavior
2046 <        Integer v;
2578 >        // unspecified behavior - both source completions available
2579          try {
2580 <            assertNull(h.join());
2581 <            assertEquals(1, r.invocationCount);
2050 <            assertEquals(inc(v1), r.value);
2580 >            assertNull(h0.join());
2581 >            rs[0].assertValue(v1);
2582          } catch (CompletionException ok) {
2583 <            checkCompletedWithWrappedCFException(h, ex);
2584 <            assertEquals(0, r.invocationCount);
2583 >            checkCompletedWithWrappedException(h0, ex);
2584 >            rs[0].assertNotInvoked();
2585          }
2055
2056        checkCompletedWithWrappedCFException(g, ex);
2057        checkCompletedNormally(f, v1);
2058    }}
2059
2060    public void testAcceptEither_exceptionalCompletion4() {
2061        for (ExecutionMode m : ExecutionMode.values())
2062        for (Integer v1 : new Integer[] { 1, null })
2063    {
2064        final CompletableFuture<Integer> f = new CompletableFuture<>();
2065        final CompletableFuture<Integer> g = new CompletableFuture<>();
2066        final IncAction r = new IncAction();
2067        final CFException ex = new CFException();
2068
2069        f.completeExceptionally(ex);
2070        g.complete(v1);
2071        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2072
2073        // unspecified behavior
2074        Integer v;
2586          try {
2587 <            assertNull(h.join());
2588 <            assertEquals(1, r.invocationCount);
2078 <            assertEquals(inc(v1), r.value);
2587 >            assertNull(h1.join());
2588 >            rs[1].assertValue(v1);
2589          } catch (CompletionException ok) {
2590 <            checkCompletedWithWrappedCFException(h, ex);
2591 <            assertEquals(0, r.invocationCount);
2590 >            checkCompletedWithWrappedException(h1, ex);
2591 >            rs[1].assertNotInvoked();
2592 >        }
2593 >        try {
2594 >            assertNull(h2.join());
2595 >            rs[2].assertValue(v1);
2596 >        } catch (CompletionException ok) {
2597 >            checkCompletedWithWrappedException(h2, ex);
2598 >            rs[2].assertNotInvoked();
2599 >        }
2600 >        try {
2601 >            assertNull(h3.join());
2602 >            rs[3].assertValue(v1);
2603 >        } catch (CompletionException ok) {
2604 >            checkCompletedWithWrappedException(h3, ex);
2605 >            rs[3].assertNotInvoked();
2606          }
2607  
2084        checkCompletedWithWrappedCFException(f, ex);
2085        checkCompletedNormally(g, v1);
2086    }}
2087
2088    /**
2089     * acceptEither result completes exceptionally if action does
2090     */
2091    public void testAcceptEither_actionFailed1() {
2092        for (ExecutionMode m : ExecutionMode.values())
2093        for (Integer v1 : new Integer[] { 1, null })
2094        for (Integer v2 : new Integer[] { 2, null })
2095    {
2096        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098        final FailingConsumer r = new FailingConsumer(m);
2099        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2100
2101        f.complete(v1);
2102        checkCompletedWithWrappedCFException(h);
2103        g.complete(v2);
2104        checkCompletedNormally(f, v1);
2105        checkCompletedNormally(g, v2);
2106    }}
2107
2108    public void testAcceptEither_actionFailed2() {
2109        for (ExecutionMode m : ExecutionMode.values())
2110        for (Integer v1 : new Integer[] { 1, null })
2111        for (Integer v2 : new Integer[] { 2, null })
2112    {
2113        final CompletableFuture<Integer> f = new CompletableFuture<>();
2114        final CompletableFuture<Integer> g = new CompletableFuture<>();
2115        final FailingConsumer r = new FailingConsumer(m);
2116        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2117
2118        g.complete(v2);
2119        checkCompletedWithWrappedCFException(h);
2120        f.complete(v1);
2608          checkCompletedNormally(f, v1);
2609 <        checkCompletedNormally(g, v2);
2609 >        checkCompletedExceptionally(g, ex);
2610      }}
2611  
2612      /**
2613       * acceptEither result completes exceptionally if either source cancelled
2614       */
2615 <    public void testAcceptEither_sourceCancelled1() {
2615 >    public void testAcceptEither_sourceCancelled() {
2616          for (ExecutionMode m : ExecutionMode.values())
2617          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618          for (Integer v1 : new Integer[] { 1, null })
2619      {
2620          final CompletableFuture<Integer> f = new CompletableFuture<>();
2621          final CompletableFuture<Integer> g = new CompletableFuture<>();
2622 <        final IncAction r = new IncAction();
2623 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2137 <
2138 <        assertTrue(f.cancel(mayInterruptIfRunning));
2139 <        checkCompletedWithWrappedCancellationException(h);
2140 <        g.complete(v1);
2622 >        final NoopConsumer[] rs = new NoopConsumer[6];
2623 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2624  
2625 <        checkCancelled(f);
2626 <        assertEquals(0, r.invocationCount);
2627 <        checkCompletedNormally(g, v1);
2628 <        checkCompletedWithWrappedCancellationException(h);
2629 <    }}
2625 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2626 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2627 >        checkIncomplete(h0);
2628 >        checkIncomplete(h1);
2629 >        rs[0].assertNotInvoked();
2630 >        rs[1].assertNotInvoked();
2631 >        f.cancel(mayInterruptIfRunning);
2632 >        checkCompletedWithWrappedCancellationException(h0);
2633 >        checkCompletedWithWrappedCancellationException(h1);
2634 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2635 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2636 >        checkCompletedWithWrappedCancellationException(h2);
2637 >        checkCompletedWithWrappedCancellationException(h3);
2638  
2639 <    public void testAcceptEither_sourceCancelled2() {
2149 <        for (ExecutionMode m : ExecutionMode.values())
2150 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2151 <        for (Integer v1 : new Integer[] { 1, null })
2152 <    {
2153 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2154 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2155 <        final IncAction r = new IncAction();
2156 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2157 <
2158 <        assertTrue(g.cancel(mayInterruptIfRunning));
2159 <        checkCompletedWithWrappedCancellationException(h);
2160 <        f.complete(v1);
2161 <
2162 <        checkCancelled(g);
2163 <        assertEquals(0, r.invocationCount);
2164 <        checkCompletedNormally(f, v1);
2165 <        checkCompletedWithWrappedCancellationException(h);
2166 <    }}
2167 <
2168 <    public void testAcceptEither_sourceCancelled3() {
2169 <        for (ExecutionMode m : ExecutionMode.values())
2170 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2171 <        for (Integer v1 : new Integer[] { 1, null })
2172 <    {
2173 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2174 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2175 <        final IncAction r = new IncAction();
2176 <
2177 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        f.complete(v1);
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2639 >        g.complete(v1);
2640  
2641 <        // unspecified behavior
2642 <        Integer v;
2641 >        // unspecified behavior - both source completions available
2642 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2643 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2644          try {
2645 <            assertNull(h.join());
2646 <            assertEquals(1, r.invocationCount);
2186 <            assertEquals(inc(v1), r.value);
2645 >            assertNull(h4.join());
2646 >            rs[4].assertValue(v1);
2647          } catch (CompletionException ok) {
2648 <            checkCompletedWithWrappedCancellationException(h);
2649 <            assertEquals(0, r.invocationCount);
2648 >            checkCompletedWithWrappedCancellationException(h4);
2649 >            rs[4].assertNotInvoked();
2650          }
2191
2192        checkCancelled(g);
2193        checkCompletedNormally(f, v1);
2194    }}
2195
2196    public void testAcceptEither_sourceCancelled4() {
2197        for (ExecutionMode m : ExecutionMode.values())
2198        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2199        for (Integer v1 : new Integer[] { 1, null })
2200    {
2201        final CompletableFuture<Integer> f = new CompletableFuture<>();
2202        final CompletableFuture<Integer> g = new CompletableFuture<>();
2203        final IncAction r = new IncAction();
2204
2205        assertTrue(f.cancel(mayInterruptIfRunning));
2206        g.complete(v1);
2207        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2208
2209        // unspecified behavior
2210        Integer v;
2651          try {
2652 <            assertNull(h.join());
2653 <            assertEquals(1, r.invocationCount);
2214 <            assertEquals(inc(v1), r.value);
2652 >            assertNull(h5.join());
2653 >            rs[5].assertValue(v1);
2654          } catch (CompletionException ok) {
2655 <            checkCompletedWithWrappedCancellationException(h);
2656 <            assertEquals(0, r.invocationCount);
2655 >            checkCompletedWithWrappedCancellationException(h5);
2656 >            rs[5].assertNotInvoked();
2657          }
2658  
2659          checkCancelled(f);
2660          checkCompletedNormally(g, v1);
2661 +        checkCompletedWithWrappedCancellationException(h0);
2662 +        checkCompletedWithWrappedCancellationException(h1);
2663 +        checkCompletedWithWrappedCancellationException(h2);
2664 +        checkCompletedWithWrappedCancellationException(h3);
2665 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2666      }}
2667  
2668      /**
2669 <     * runAfterEither result completes normally after normal completion
2226 <     * of either source
2669 >     * acceptEither result completes exceptionally if action does
2670       */
2671 <    public void testRunAfterEither_normalCompletion1() {
2671 >    public void testAcceptEither_actionFailed() {
2672          for (ExecutionMode m : ExecutionMode.values())
2673          for (Integer v1 : new Integer[] { 1, null })
2674          for (Integer v2 : new Integer[] { 2, null })
2675      {
2676          final CompletableFuture<Integer> f = new CompletableFuture<>();
2677          final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 <        final Noop r = new Noop(m);
2679 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678 >        final FailingConsumer[] rs = new FailingConsumer[6];
2679 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2680  
2681 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2682 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2683          f.complete(v1);
2684 <        checkCompletedNormally(h, null);
2685 <        assertEquals(1, r.invocationCount);
2684 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2685 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2686 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2687 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2688 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2689 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2690 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2691 >
2692          g.complete(v2);
2693  
2694 +        // unspecified behavior - both source completions available
2695 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2696 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2697 +
2698 +        checkCompletedWithWrappedException(h4, rs[4].ex);
2699 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2700 +                   Objects.equals(v2, rs[4].value));
2701 +        checkCompletedWithWrappedException(h5, rs[5].ex);
2702 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2703 +                   Objects.equals(v2, rs[5].value));
2704 +
2705          checkCompletedNormally(f, v1);
2706          checkCompletedNormally(g, v2);
2245        checkCompletedNormally(h, null);
2246        assertEquals(1, r.invocationCount);
2707      }}
2708  
2709 <    public void testRunAfterEither_normalCompletion2() {
2709 >    /**
2710 >     * runAfterEither result completes normally after normal completion
2711 >     * of either source
2712 >     */
2713 >    public void testRunAfterEither_normalCompletion() {
2714          for (ExecutionMode m : ExecutionMode.values())
2715          for (Integer v1 : new Integer[] { 1, null })
2716          for (Integer v2 : new Integer[] { 2, null })
2717 +        for (boolean pushNop : new boolean[] { true, false })
2718      {
2719          final CompletableFuture<Integer> f = new CompletableFuture<>();
2720          final CompletableFuture<Integer> g = new CompletableFuture<>();
2721 <        final Noop r = new Noop(m);
2722 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2721 >        final Noop[] rs = new Noop[6];
2722 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2723  
2724 <        g.complete(v2);
2725 <        checkCompletedNormally(h, null);
2726 <        assertEquals(1, r.invocationCount);
2724 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2725 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2726 >        checkIncomplete(h0);
2727 >        checkIncomplete(h1);
2728 >        rs[0].assertNotInvoked();
2729 >        rs[1].assertNotInvoked();
2730 >        if (pushNop) {          // ad hoc test of intra-completion interference
2731 >            m.thenRun(f, () -> {});
2732 >            m.thenRun(g, () -> {});
2733 >        }
2734          f.complete(v1);
2735 +        checkCompletedNormally(h0, null);
2736 +        checkCompletedNormally(h1, null);
2737 +        rs[0].assertInvoked();
2738 +        rs[1].assertInvoked();
2739 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2740 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2741 +        checkCompletedNormally(h2, null);
2742 +        checkCompletedNormally(h3, null);
2743 +        rs[2].assertInvoked();
2744 +        rs[3].assertInvoked();
2745  
2264        checkCompletedNormally(f, v1);
2265        checkCompletedNormally(g, v2);
2266        checkCompletedNormally(h, null);
2267        assertEquals(1, r.invocationCount);
2268        }}
2269
2270    public void testRunAfterEither_normalCompletion3() {
2271        for (ExecutionMode m : ExecutionMode.values())
2272        for (Integer v1 : new Integer[] { 1, null })
2273        for (Integer v2 : new Integer[] { 2, null })
2274    {
2275        final CompletableFuture<Integer> f = new CompletableFuture<>();
2276        final CompletableFuture<Integer> g = new CompletableFuture<>();
2277        final Noop r = new Noop(m);
2278
2279        f.complete(v1);
2746          g.complete(v2);
2281        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2747  
2748 <        checkCompletedNormally(h, null);
2748 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2749 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2750 >
2751          checkCompletedNormally(f, v1);
2752          checkCompletedNormally(g, v2);
2753 <        assertEquals(1, r.invocationCount);
2753 >        checkCompletedNormally(h0, null);
2754 >        checkCompletedNormally(h1, null);
2755 >        checkCompletedNormally(h2, null);
2756 >        checkCompletedNormally(h3, null);
2757 >        checkCompletedNormally(h4, null);
2758 >        checkCompletedNormally(h5, null);
2759 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2760      }}
2761  
2762      /**
2763       * runAfterEither result completes exceptionally after exceptional
2764       * completion of either source
2765       */
2766 <    public void testRunAfterEither_exceptionalCompletion1() {
2766 >    public void testRunAfterEither_exceptionalCompletion() {
2767          for (ExecutionMode m : ExecutionMode.values())
2768          for (Integer v1 : new Integer[] { 1, null })
2769      {
2770          final CompletableFuture<Integer> f = new CompletableFuture<>();
2771          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299        final Noop r = new Noop(m);
2300        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2772          final CFException ex = new CFException();
2773 +        final Noop[] rs = new Noop[6];
2774 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2775  
2776 <        f.completeExceptionally(ex);
2777 <        checkCompletedWithWrappedCFException(h, ex);
2778 <        g.complete(v1);
2776 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2777 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2778 >        checkIncomplete(h0);
2779 >        checkIncomplete(h1);
2780 >        rs[0].assertNotInvoked();
2781 >        rs[1].assertNotInvoked();
2782 >        assertTrue(f.completeExceptionally(ex));
2783 >        checkCompletedWithWrappedException(h0, ex);
2784 >        checkCompletedWithWrappedException(h1, ex);
2785 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2786 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2787 >        checkCompletedWithWrappedException(h2, ex);
2788 >        checkCompletedWithWrappedException(h3, ex);
2789 >
2790 >        assertTrue(g.complete(v1));
2791 >
2792 >        // unspecified behavior - both source completions available
2793 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2794 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2795 >        try {
2796 >            assertNull(h4.join());
2797 >            rs[4].assertInvoked();
2798 >        } catch (CompletionException ok) {
2799 >            checkCompletedWithWrappedException(h4, ex);
2800 >            rs[4].assertNotInvoked();
2801 >        }
2802 >        try {
2803 >            assertNull(h5.join());
2804 >            rs[5].assertInvoked();
2805 >        } catch (CompletionException ok) {
2806 >            checkCompletedWithWrappedException(h5, ex);
2807 >            rs[5].assertNotInvoked();
2808 >        }
2809  
2810 <        assertEquals(0, r.invocationCount);
2810 >        checkCompletedExceptionally(f, ex);
2811          checkCompletedNormally(g, v1);
2812 <        checkCompletedWithWrappedCFException(f, ex);
2813 <        checkCompletedWithWrappedCFException(h, ex);
2812 >        checkCompletedWithWrappedException(h0, ex);
2813 >        checkCompletedWithWrappedException(h1, ex);
2814 >        checkCompletedWithWrappedException(h2, ex);
2815 >        checkCompletedWithWrappedException(h3, ex);
2816 >        checkCompletedWithWrappedException(h4, ex);
2817 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2818      }}
2819  
2820      public void testRunAfterEither_exceptionalCompletion2() {
2821          for (ExecutionMode m : ExecutionMode.values())
2822 +        for (boolean fFirst : new boolean[] { true, false })
2823          for (Integer v1 : new Integer[] { 1, null })
2824      {
2825          final CompletableFuture<Integer> f = new CompletableFuture<>();
2826          final CompletableFuture<Integer> g = new CompletableFuture<>();
2319        final Noop r = new Noop(m);
2320        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2321        final CFException ex = new CFException();
2322
2323        g.completeExceptionally(ex);
2324        checkCompletedWithWrappedCFException(h, ex);
2325        f.complete(v1);
2326
2327        assertEquals(0, r.invocationCount);
2328        checkCompletedNormally(f, v1);
2329        checkCompletedWithWrappedCFException(g, ex);
2330        checkCompletedWithWrappedCFException(h, ex);
2331    }}
2332
2333    public void testRunAfterEither_exceptionalCompletion3() {
2334        for (ExecutionMode m : ExecutionMode.values())
2335        for (Integer v1 : new Integer[] { 1, null })
2336    {
2337        final CompletableFuture<Integer> f = new CompletableFuture<>();
2338        final CompletableFuture<Integer> g = new CompletableFuture<>();
2339        final Noop r = new Noop(m);
2827          final CFException ex = new CFException();
2828 +        final Noop[] rs = new Noop[6];
2829 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2830  
2831 <        g.completeExceptionally(ex);
2832 <        f.complete(v1);
2833 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2831 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2832 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2833 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2834 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2835 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2836 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2837  
2838 <        // unspecified behavior
2347 <        Integer v;
2838 >        // unspecified behavior - both source completions available
2839          try {
2840 <            assertNull(h.join());
2841 <            assertEquals(1, r.invocationCount);
2840 >            assertNull(h0.join());
2841 >            rs[0].assertInvoked();
2842          } catch (CompletionException ok) {
2843 <            checkCompletedWithWrappedCFException(h, ex);
2844 <            assertEquals(0, r.invocationCount);
2843 >            checkCompletedWithWrappedException(h0, ex);
2844 >            rs[0].assertNotInvoked();
2845          }
2355
2356        checkCompletedWithWrappedCFException(g, ex);
2357        checkCompletedNormally(f, v1);
2358    }}
2359
2360    public void testRunAfterEither_exceptionalCompletion4() {
2361        for (ExecutionMode m : ExecutionMode.values())
2362        for (Integer v1 : new Integer[] { 1, null })
2363    {
2364        final CompletableFuture<Integer> f = new CompletableFuture<>();
2365        final CompletableFuture<Integer> g = new CompletableFuture<>();
2366        final Noop r = new Noop(m);
2367        final CFException ex = new CFException();
2368
2369        f.completeExceptionally(ex);
2370        g.complete(v1);
2371        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2372
2373        // unspecified behavior
2374        Integer v;
2846          try {
2847 <            assertNull(h.join());
2848 <            assertEquals(1, r.invocationCount);
2847 >            assertNull(h1.join());
2848 >            rs[1].assertInvoked();
2849          } catch (CompletionException ok) {
2850 <            checkCompletedWithWrappedCFException(h, ex);
2851 <            assertEquals(0, r.invocationCount);
2850 >            checkCompletedWithWrappedException(h1, ex);
2851 >            rs[1].assertNotInvoked();
2852 >        }
2853 >        try {
2854 >            assertNull(h2.join());
2855 >            rs[2].assertInvoked();
2856 >        } catch (CompletionException ok) {
2857 >            checkCompletedWithWrappedException(h2, ex);
2858 >            rs[2].assertNotInvoked();
2859 >        }
2860 >        try {
2861 >            assertNull(h3.join());
2862 >            rs[3].assertInvoked();
2863 >        } catch (CompletionException ok) {
2864 >            checkCompletedWithWrappedException(h3, ex);
2865 >            rs[3].assertNotInvoked();
2866          }
2867  
2383        checkCompletedWithWrappedCFException(f, ex);
2384        checkCompletedNormally(g, v1);
2385    }}
2386
2387    /**
2388     * runAfterEither result completes exceptionally if action does
2389     */
2390    public void testRunAfterEither_actionFailed1() {
2391        for (ExecutionMode m : ExecutionMode.values())
2392        for (Integer v1 : new Integer[] { 1, null })
2393        for (Integer v2 : new Integer[] { 2, null })
2394    {
2395        final CompletableFuture<Integer> f = new CompletableFuture<>();
2396        final CompletableFuture<Integer> g = new CompletableFuture<>();
2397        final FailingRunnable r = new FailingRunnable(m);
2398        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2399
2400        f.complete(v1);
2401        checkCompletedWithWrappedCFException(h);
2402        g.complete(v2);
2403        checkCompletedNormally(f, v1);
2404        checkCompletedNormally(g, v2);
2405    }}
2406
2407    public void testRunAfterEither_actionFailed2() {
2408        for (ExecutionMode m : ExecutionMode.values())
2409        for (Integer v1 : new Integer[] { 1, null })
2410        for (Integer v2 : new Integer[] { 2, null })
2411    {
2412        final CompletableFuture<Integer> f = new CompletableFuture<>();
2413        final CompletableFuture<Integer> g = new CompletableFuture<>();
2414        final FailingRunnable r = new FailingRunnable(m);
2415        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2416
2417        g.complete(v2);
2418        checkCompletedWithWrappedCFException(h);
2419        f.complete(v1);
2868          checkCompletedNormally(f, v1);
2869 <        checkCompletedNormally(g, v2);
2869 >        checkCompletedExceptionally(g, ex);
2870      }}
2871  
2872      /**
2873       * runAfterEither result completes exceptionally if either source cancelled
2874       */
2875 <    public void testRunAfterEither_sourceCancelled1() {
2428 <        for (ExecutionMode m : ExecutionMode.values())
2429 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2430 <        for (Integer v1 : new Integer[] { 1, null })
2431 <    {
2432 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 <        final Noop r = new Noop(m);
2435 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 <
2437 <        assertTrue(f.cancel(mayInterruptIfRunning));
2438 <        checkCompletedWithWrappedCancellationException(h);
2439 <        g.complete(v1);
2440 <
2441 <        checkCancelled(f);
2442 <        assertEquals(0, r.invocationCount);
2443 <        checkCompletedNormally(g, v1);
2444 <        checkCompletedWithWrappedCancellationException(h);
2445 <    }}
2446 <
2447 <    public void testRunAfterEither_sourceCancelled2() {
2448 <        for (ExecutionMode m : ExecutionMode.values())
2449 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 <        for (Integer v1 : new Integer[] { 1, null })
2451 <    {
2452 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 <        final Noop r = new Noop(m);
2455 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 <
2457 <        assertTrue(g.cancel(mayInterruptIfRunning));
2458 <        checkCompletedWithWrappedCancellationException(h);
2459 <        f.complete(v1);
2460 <
2461 <        checkCancelled(g);
2462 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedWithWrappedCancellationException(h);
2465 <    }}
2466 <
2467 <    public void testRunAfterEither_sourceCancelled3() {
2875 >    public void testRunAfterEither_sourceCancelled() {
2876          for (ExecutionMode m : ExecutionMode.values())
2877          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2878          for (Integer v1 : new Integer[] { 1, null })
2879      {
2880          final CompletableFuture<Integer> f = new CompletableFuture<>();
2881          final CompletableFuture<Integer> g = new CompletableFuture<>();
2882 <        final Noop r = new Noop(m);
2883 <
2476 <        assertTrue(g.cancel(mayInterruptIfRunning));
2477 <        f.complete(v1);
2478 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2882 >        final Noop[] rs = new Noop[6];
2883 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2884  
2885 <        // unspecified behavior
2886 <        Integer v;
2885 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2886 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2887 >        checkIncomplete(h0);
2888 >        checkIncomplete(h1);
2889 >        rs[0].assertNotInvoked();
2890 >        rs[1].assertNotInvoked();
2891 >        f.cancel(mayInterruptIfRunning);
2892 >        checkCompletedWithWrappedCancellationException(h0);
2893 >        checkCompletedWithWrappedCancellationException(h1);
2894 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2895 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2896 >        checkCompletedWithWrappedCancellationException(h2);
2897 >        checkCompletedWithWrappedCancellationException(h3);
2898 >
2899 >        assertTrue(g.complete(v1));
2900 >
2901 >        // unspecified behavior - both source completions available
2902 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2903 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2904          try {
2905 <            assertNull(h.join());
2906 <            assertEquals(1, r.invocationCount);
2905 >            assertNull(h4.join());
2906 >            rs[4].assertInvoked();
2907          } catch (CompletionException ok) {
2908 <            checkCompletedWithWrappedCancellationException(h);
2909 <            assertEquals(0, r.invocationCount);
2908 >            checkCompletedWithWrappedCancellationException(h4);
2909 >            rs[4].assertNotInvoked();
2910 >        }
2911 >        try {
2912 >            assertNull(h5.join());
2913 >            rs[5].assertInvoked();
2914 >        } catch (CompletionException ok) {
2915 >            checkCompletedWithWrappedCancellationException(h5);
2916 >            rs[5].assertNotInvoked();
2917          }
2918  
2919 <        checkCancelled(g);
2920 <        checkCompletedNormally(f, v1);
2919 >        checkCancelled(f);
2920 >        checkCompletedNormally(g, v1);
2921 >        checkCompletedWithWrappedCancellationException(h0);
2922 >        checkCompletedWithWrappedCancellationException(h1);
2923 >        checkCompletedWithWrappedCancellationException(h2);
2924 >        checkCompletedWithWrappedCancellationException(h3);
2925 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2926      }}
2927  
2928 <    public void testRunAfterEither_sourceCancelled4() {
2928 >    /**
2929 >     * runAfterEither result completes exceptionally if action does
2930 >     */
2931 >    public void testRunAfterEither_actionFailed() {
2932          for (ExecutionMode m : ExecutionMode.values())
2496        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2933          for (Integer v1 : new Integer[] { 1, null })
2934 +        for (Integer v2 : new Integer[] { 2, null })
2935      {
2936          final CompletableFuture<Integer> f = new CompletableFuture<>();
2937          final CompletableFuture<Integer> g = new CompletableFuture<>();
2938 <        final Noop r = new Noop(m);
2938 >        final FailingRunnable[] rs = new FailingRunnable[6];
2939 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2940  
2941 <        assertTrue(f.cancel(mayInterruptIfRunning));
2942 <        g.complete(v1);
2943 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2944 <
2945 <        // unspecified behavior
2946 <        Integer v;
2947 <        try {
2948 <            assertNull(h.join());
2949 <            assertEquals(1, r.invocationCount);
2950 <        } catch (CompletionException ok) {
2951 <            checkCompletedWithWrappedCancellationException(h);
2952 <            assertEquals(0, r.invocationCount);
2953 <        }
2941 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2942 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2943 >        assertTrue(f.complete(v1));
2944 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2945 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2946 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2947 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2948 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2949 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2950 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2951 >        assertTrue(g.complete(v2));
2952 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2953 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2954 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2955 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2956  
2957 <        checkCancelled(f);
2958 <        checkCompletedNormally(g, v1);
2957 >        checkCompletedNormally(f, v1);
2958 >        checkCompletedNormally(g, v2);
2959 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2960      }}
2961  
2962      /**
# Line 2528 | Line 2969 | public class CompletableFutureTest exten
2969      {
2970          final CompletableFuture<Integer> f = new CompletableFuture<>();
2971          final CompletableFutureInc r = new CompletableFutureInc(m);
2972 <        if (!createIncomplete) f.complete(v1);
2972 >        if (!createIncomplete) assertTrue(f.complete(v1));
2973          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2974 <        if (createIncomplete) f.complete(v1);
2974 >        if (createIncomplete) assertTrue(f.complete(v1));
2975  
2976          checkCompletedNormally(g, inc(v1));
2977          checkCompletedNormally(f, v1);
2978 <        assertEquals(1, r.invocationCount);
2978 >        r.assertValue(v1);
2979      }}
2980  
2981      /**
# Line 2552 | Line 2993 | public class CompletableFutureTest exten
2993          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2994          if (createIncomplete) f.completeExceptionally(ex);
2995  
2996 <        checkCompletedWithWrappedCFException(g, ex);
2997 <        checkCompletedWithWrappedCFException(f, ex);
2998 <        assertEquals(0, r.invocationCount);
2996 >        checkCompletedWithWrappedException(g, ex);
2997 >        checkCompletedExceptionally(f, ex);
2998 >        r.assertNotInvoked();
2999      }}
3000  
3001      /**
# Line 2568 | Line 3009 | public class CompletableFutureTest exten
3009          final CompletableFuture<Integer> f = new CompletableFuture<>();
3010          final FailingCompletableFutureFunction r
3011              = new FailingCompletableFutureFunction(m);
3012 <        if (!createIncomplete) f.complete(v1);
3012 >        if (!createIncomplete) assertTrue(f.complete(v1));
3013          final CompletableFuture<Integer> g = m.thenCompose(f, r);
3014 <        if (createIncomplete) f.complete(v1);
3014 >        if (createIncomplete) assertTrue(f.complete(v1));
3015  
3016 <        checkCompletedWithWrappedCFException(g);
3016 >        checkCompletedWithWrappedException(g, r.ex);
3017          checkCompletedNormally(f, v1);
3018      }}
3019  
# Line 2597 | Line 3038 | public class CompletableFutureTest exten
3038          checkCancelled(f);
3039      }}
3040  
3041 +    /**
3042 +     * thenCompose result completes exceptionally if the result of the action does
3043 +     */
3044 +    public void testThenCompose_actionReturnsFailingFuture() {
3045 +        for (ExecutionMode m : ExecutionMode.values())
3046 +        for (int order = 0; order < 6; order++)
3047 +        for (Integer v1 : new Integer[] { 1, null })
3048 +    {
3049 +        final CFException ex = new CFException();
3050 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
3051 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
3052 +        final CompletableFuture<Integer> h;
3053 +        // Test all permutations of orders
3054 +        switch (order) {
3055 +        case 0:
3056 +            assertTrue(f.complete(v1));
3057 +            assertTrue(g.completeExceptionally(ex));
3058 +            h = m.thenCompose(f, (x -> g));
3059 +            break;
3060 +        case 1:
3061 +            assertTrue(f.complete(v1));
3062 +            h = m.thenCompose(f, (x -> g));
3063 +            assertTrue(g.completeExceptionally(ex));
3064 +            break;
3065 +        case 2:
3066 +            assertTrue(g.completeExceptionally(ex));
3067 +            assertTrue(f.complete(v1));
3068 +            h = m.thenCompose(f, (x -> g));
3069 +            break;
3070 +        case 3:
3071 +            assertTrue(g.completeExceptionally(ex));
3072 +            h = m.thenCompose(f, (x -> g));
3073 +            assertTrue(f.complete(v1));
3074 +            break;
3075 +        case 4:
3076 +            h = m.thenCompose(f, (x -> g));
3077 +            assertTrue(f.complete(v1));
3078 +            assertTrue(g.completeExceptionally(ex));
3079 +            break;
3080 +        case 5:
3081 +            h = m.thenCompose(f, (x -> g));
3082 +            assertTrue(f.complete(v1));
3083 +            assertTrue(g.completeExceptionally(ex));
3084 +            break;
3085 +        default: throw new AssertionError();
3086 +        }
3087 +
3088 +        checkCompletedExceptionally(g, ex);
3089 +        checkCompletedWithWrappedException(h, ex);
3090 +        checkCompletedNormally(f, v1);
3091 +    }}
3092 +
3093      // other static methods
3094  
3095      /**
# Line 2613 | Line 3106 | public class CompletableFutureTest exten
3106       * when all components complete normally
3107       */
3108      public void testAllOf_normal() throws Exception {
3109 <        for (int k = 1; k < 20; ++k) {
3110 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3111 <            for (int i = 0; i < k; ++i)
3109 >        for (int k = 1; k < 10; k++) {
3110 >            CompletableFuture<Integer>[] fs
3111 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3112 >            for (int i = 0; i < k; i++)
3113 >                fs[i] = new CompletableFuture<>();
3114 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3115 >            for (int i = 0; i < k; i++) {
3116 >                checkIncomplete(f);
3117 >                checkIncomplete(CompletableFuture.allOf(fs));
3118 >                fs[i].complete(one);
3119 >            }
3120 >            checkCompletedNormally(f, null);
3121 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
3122 >        }
3123 >    }
3124 >
3125 >    public void testAllOf_normal_backwards() throws Exception {
3126 >        for (int k = 1; k < 10; k++) {
3127 >            CompletableFuture<Integer>[] fs
3128 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3129 >            for (int i = 0; i < k; i++)
3130                  fs[i] = new CompletableFuture<>();
3131              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3132 <            for (int i = 0; i < k; ++i) {
3132 >            for (int i = k - 1; i >= 0; i--) {
3133                  checkIncomplete(f);
3134                  checkIncomplete(CompletableFuture.allOf(fs));
3135                  fs[i].complete(one);
# Line 2628 | Line 3139 | public class CompletableFutureTest exten
3139          }
3140      }
3141  
3142 +    public void testAllOf_exceptional() throws Exception {
3143 +        for (int k = 1; k < 10; k++) {
3144 +            CompletableFuture<Integer>[] fs
3145 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3146 +            CFException ex = new CFException();
3147 +            for (int i = 0; i < k; i++)
3148 +                fs[i] = new CompletableFuture<>();
3149 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3150 +            for (int i = 0; i < k; i++) {
3151 +                checkIncomplete(f);
3152 +                checkIncomplete(CompletableFuture.allOf(fs));
3153 +                if (i != k / 2) {
3154 +                    fs[i].complete(i);
3155 +                    checkCompletedNormally(fs[i], i);
3156 +                } else {
3157 +                    fs[i].completeExceptionally(ex);
3158 +                    checkCompletedExceptionally(fs[i], ex);
3159 +                }
3160 +            }
3161 +            checkCompletedWithWrappedException(f, ex);
3162 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
3163 +        }
3164 +    }
3165 +
3166      /**
3167       * anyOf(no component futures) returns an incomplete future
3168       */
3169      public void testAnyOf_empty() throws Exception {
3170 +        for (Integer v1 : new Integer[] { 1, null })
3171 +    {
3172          CompletableFuture<Object> f = CompletableFuture.anyOf();
3173          checkIncomplete(f);
3174 <    }
3174 >
3175 >        f.complete(v1);
3176 >        checkCompletedNormally(f, v1);
3177 >    }}
3178  
3179      /**
3180       * anyOf returns a future completed normally with a value when
3181       * a component future does
3182       */
3183      public void testAnyOf_normal() throws Exception {
3184 <        for (int k = 0; k < 10; ++k) {
3184 >        for (int k = 0; k < 10; k++) {
3185              CompletableFuture[] fs = new CompletableFuture[k];
3186 <            for (int i = 0; i < k; ++i)
3186 >            for (int i = 0; i < k; i++)
3187                  fs[i] = new CompletableFuture<>();
3188              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3189              checkIncomplete(f);
3190 <            for (int i = 0; i < k; ++i) {
3191 <                fs[i].complete(one);
3192 <                checkCompletedNormally(f, one);
3193 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3190 >            for (int i = 0; i < k; i++) {
3191 >                fs[i].complete(i);
3192 >                checkCompletedNormally(f, 0);
3193 >                int x = (int) CompletableFuture.anyOf(fs).join();
3194 >                assertTrue(0 <= x && x <= i);
3195 >            }
3196 >        }
3197 >    }
3198 >    public void testAnyOf_normal_backwards() throws Exception {
3199 >        for (int k = 0; k < 10; k++) {
3200 >            CompletableFuture[] fs = new CompletableFuture[k];
3201 >            for (int i = 0; i < k; i++)
3202 >                fs[i] = new CompletableFuture<>();
3203 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3204 >            checkIncomplete(f);
3205 >            for (int i = k - 1; i >= 0; i--) {
3206 >                fs[i].complete(i);
3207 >                checkCompletedNormally(f, k - 1);
3208 >                int x = (int) CompletableFuture.anyOf(fs).join();
3209 >                assertTrue(i <= x && x <= k - 1);
3210              }
3211          }
3212      }
# Line 2659 | Line 3215 | public class CompletableFutureTest exten
3215       * anyOf result completes exceptionally when any component does.
3216       */
3217      public void testAnyOf_exceptional() throws Exception {
3218 <        for (int k = 0; k < 10; ++k) {
3218 >        for (int k = 0; k < 10; k++) {
3219 >            CompletableFuture[] fs = new CompletableFuture[k];
3220 >            CFException[] exs = new CFException[k];
3221 >            for (int i = 0; i < k; i++) {
3222 >                fs[i] = new CompletableFuture<>();
3223 >                exs[i] = new CFException();
3224 >            }
3225 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3226 >            checkIncomplete(f);
3227 >            for (int i = 0; i < k; i++) {
3228 >                fs[i].completeExceptionally(exs[i]);
3229 >                checkCompletedWithWrappedException(f, exs[0]);
3230 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3231 >            }
3232 >        }
3233 >    }
3234 >
3235 >    public void testAnyOf_exceptional_backwards() throws Exception {
3236 >        for (int k = 0; k < 10; k++) {
3237              CompletableFuture[] fs = new CompletableFuture[k];
3238 <            for (int i = 0; i < k; ++i)
3238 >            CFException[] exs = new CFException[k];
3239 >            for (int i = 0; i < k; i++) {
3240                  fs[i] = new CompletableFuture<>();
3241 +                exs[i] = new CFException();
3242 +            }
3243              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3244              checkIncomplete(f);
3245 <            for (int i = 0; i < k; ++i) {
3246 <                fs[i].completeExceptionally(new CFException());
3247 <                checkCompletedWithWrappedCFException(f);
3245 >            for (int i = k - 1; i >= 0; i--) {
3246 >                fs[i].completeExceptionally(exs[i]);
3247 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3248                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3249              }
3250          }
# Line 2676 | Line 3253 | public class CompletableFutureTest exten
3253      /**
3254       * Completion methods throw NullPointerException with null arguments
3255       */
3256 +    @SuppressWarnings("FutureReturnValueIgnored")
3257      public void testNPE() {
3258          CompletableFuture<Integer> f = new CompletableFuture<>();
3259          CompletableFuture<Integer> g = new CompletableFuture<>();
3260          CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2683        CompletableFuture<?> h;
3261          ThreadExecutor exec = new ThreadExecutor();
3262  
3263          Runnable[] throwingActions = {
3264              () -> CompletableFuture.supplyAsync(null),
3265              () -> CompletableFuture.supplyAsync(null, exec),
3266 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
3266 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3267  
3268              () -> CompletableFuture.runAsync(null),
3269              () -> CompletableFuture.runAsync(null, exec),
# Line 2696 | Line 3273 | public class CompletableFutureTest exten
3273  
3274              () -> f.thenApply(null),
3275              () -> f.thenApplyAsync(null),
3276 <            () -> f.thenApplyAsync((x) -> x, null),
3276 >            () -> f.thenApplyAsync(x -> x, null),
3277              () -> f.thenApplyAsync(null, exec),
3278  
3279              () -> f.thenAccept(null),
3280              () -> f.thenAcceptAsync(null),
3281 <            () -> f.thenAcceptAsync((x) -> {} , null),
3281 >            () -> f.thenAcceptAsync(x -> {} , null),
3282              () -> f.thenAcceptAsync(null, exec),
3283  
3284              () -> f.thenRun(null),
# Line 2736 | Line 3313 | public class CompletableFutureTest exten
3313              () -> f.applyToEither(g, null),
3314              () -> f.applyToEitherAsync(g, null),
3315              () -> f.applyToEitherAsync(g, null, exec),
3316 <            () -> f.applyToEither(nullFuture, (x) -> x),
3317 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
3318 <            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
3319 <            () -> f.applyToEitherAsync(g, (x) -> x, null),
3316 >            () -> f.applyToEither(nullFuture, x -> x),
3317 >            () -> f.applyToEitherAsync(nullFuture, x -> x),
3318 >            () -> f.applyToEitherAsync(nullFuture, x -> x, exec),
3319 >            () -> f.applyToEitherAsync(g, x -> x, null),
3320  
3321              () -> f.acceptEither(g, null),
3322              () -> f.acceptEitherAsync(g, null),
3323              () -> f.acceptEitherAsync(g, null, exec),
3324 <            () -> f.acceptEither(nullFuture, (x) -> {}),
3325 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
3326 <            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
3327 <            () -> f.acceptEitherAsync(g, (x) -> {}, null),
3324 >            () -> f.acceptEither(nullFuture, x -> {}),
3325 >            () -> f.acceptEitherAsync(nullFuture, x -> {}),
3326 >            () -> f.acceptEitherAsync(nullFuture, x -> {}, exec),
3327 >            () -> f.acceptEitherAsync(g, x -> {}, null),
3328  
3329              () -> f.runAfterEither(g, null),
3330              () -> f.runAfterEitherAsync(g, null),
# Line 2777 | Line 3354 | public class CompletableFutureTest exten
3354              () -> CompletableFuture.anyOf(null, f),
3355  
3356              () -> f.obtrudeException(null),
3357 +
3358 +            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3359 +            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3360 +            () -> CompletableFuture.delayedExecutor(1L, null),
3361 +
3362 +            () -> f.orTimeout(1L, null),
3363 +            () -> f.completeOnTimeout(42, 1L, null),
3364 +
3365 +            () -> CompletableFuture.failedFuture(null),
3366 +            () -> CompletableFuture.failedStage(null),
3367          };
3368  
3369          assertThrows(NullPointerException.class, throwingActions);
# Line 2784 | Line 3371 | public class CompletableFutureTest exten
3371      }
3372  
3373      /**
3374 +     * Test submissions to an executor that rejects all tasks.
3375 +     */
3376 +    public void testRejectingExecutor() {
3377 +        for (Integer v : new Integer[] { 1, null })
3378 +    {
3379 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3380 +
3381 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3382 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3383 +
3384 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3385 +
3386 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3387 +        srcs.add(complete);
3388 +        srcs.add(incomplete);
3389 +
3390 +        for (CompletableFuture<Integer> src : srcs) {
3391 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3392 +            fs.add(src.thenRunAsync(() -> {}, e));
3393 +            fs.add(src.thenAcceptAsync(z -> {}, e));
3394 +            fs.add(src.thenApplyAsync(z -> z, e));
3395 +
3396 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3397 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3398 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3399 +
3400 +            fs.add(src.applyToEitherAsync(src, z -> z, e));
3401 +            fs.add(src.acceptEitherAsync(src, z -> {}, e));
3402 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3403 +
3404 +            fs.add(src.thenComposeAsync(z -> null, e));
3405 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3406 +            fs.add(src.handleAsync((z, t) -> null, e));
3407 +
3408 +            for (CompletableFuture<?> future : fs) {
3409 +                if (src.isDone())
3410 +                    checkCompletedWithWrappedException(future, e.ex);
3411 +                else
3412 +                    checkIncomplete(future);
3413 +            }
3414 +            futures.addAll(fs);
3415 +        }
3416 +
3417 +        {
3418 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3419 +
3420 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3421 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3422 +
3423 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3424 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3425 +
3426 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3427 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3428 +
3429 +            for (CompletableFuture<?> future : fs)
3430 +                checkIncomplete(future);
3431 +            futures.addAll(fs);
3432 +        }
3433 +
3434 +        {
3435 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3436 +
3437 +            fs.add(complete.applyToEitherAsync(incomplete, z -> z, e));
3438 +            fs.add(incomplete.applyToEitherAsync(complete, z -> z, e));
3439 +
3440 +            fs.add(complete.acceptEitherAsync(incomplete, z -> {}, e));
3441 +            fs.add(incomplete.acceptEitherAsync(complete, z -> {}, e));
3442 +
3443 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3444 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3445 +
3446 +            for (CompletableFuture<?> future : fs)
3447 +                checkCompletedWithWrappedException(future, e.ex);
3448 +            futures.addAll(fs);
3449 +        }
3450 +
3451 +        incomplete.complete(v);
3452 +
3453 +        for (CompletableFuture<?> future : futures)
3454 +            checkCompletedWithWrappedException(future, e.ex);
3455 +
3456 +        assertEquals(futures.size(), e.count.get());
3457 +    }}
3458 +
3459 +    /**
3460 +     * Test submissions to an executor that rejects all tasks, but
3461 +     * should never be invoked because the dependent future is
3462 +     * explicitly completed.
3463 +     */
3464 +    public void testRejectingExecutorNeverInvoked() {
3465 +        for (Integer v : new Integer[] { 1, null })
3466 +    {
3467 +        final CountingRejectingExecutor e = new CountingRejectingExecutor();
3468 +
3469 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3470 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3471 +
3472 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3473 +
3474 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3475 +        srcs.add(complete);
3476 +        srcs.add(incomplete);
3477 +
3478 +        List<CompletableFuture<?>> fs = new ArrayList<>();
3479 +        fs.add(incomplete.thenRunAsync(() -> {}, e));
3480 +        fs.add(incomplete.thenAcceptAsync(z -> {}, e));
3481 +        fs.add(incomplete.thenApplyAsync(z -> z, e));
3482 +
3483 +        fs.add(incomplete.thenCombineAsync(incomplete, (x, y) -> x, e));
3484 +        fs.add(incomplete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3485 +        fs.add(incomplete.runAfterBothAsync(incomplete, () -> {}, e));
3486 +
3487 +        fs.add(incomplete.applyToEitherAsync(incomplete, z -> z, e));
3488 +        fs.add(incomplete.acceptEitherAsync(incomplete, z -> {}, e));
3489 +        fs.add(incomplete.runAfterEitherAsync(incomplete, () -> {}, e));
3490 +
3491 +        fs.add(incomplete.thenComposeAsync(z -> null, e));
3492 +        fs.add(incomplete.whenCompleteAsync((z, t) -> {}, e));
3493 +        fs.add(incomplete.handleAsync((z, t) -> null, e));
3494 +
3495 +        fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3496 +        fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3497 +
3498 +        fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3499 +        fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3500 +
3501 +        fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3502 +        fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3503 +
3504 +        for (CompletableFuture<?> future : fs)
3505 +            checkIncomplete(future);
3506 +
3507 +        for (CompletableFuture<?> future : fs)
3508 +            future.complete(null);
3509 +
3510 +        incomplete.complete(v);
3511 +
3512 +        for (CompletableFuture<?> future : fs)
3513 +            checkCompletedNormally(future, null);
3514 +
3515 +        assertEquals(0, e.count.get());
3516 +    }}
3517 +
3518 +    /**
3519       * toCompletableFuture returns this CompletableFuture.
3520       */
3521      public void testToCompletableFuture() {
# Line 2791 | Line 3523 | public class CompletableFutureTest exten
3523          assertSame(f, f.toCompletableFuture());
3524      }
3525  
3526 +    // jdk9
3527 +
3528      /**
3529 <     * whenComplete action executes on normal completion, propagating
2796 <     * source result.
3529 >     * newIncompleteFuture returns an incomplete CompletableFuture
3530       */
3531 <    public void testWhenComplete_normalCompletion1() {
2799 <        for (ExecutionMode m : ExecutionMode.values())
2800 <        for (boolean createIncomplete : new boolean[] { true, false })
3531 >    public void testNewIncompleteFuture() {
3532          for (Integer v1 : new Integer[] { 1, null })
3533      {
3534 <        final AtomicInteger a = new AtomicInteger(0);
3535 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3536 <        if (!createIncomplete) f.complete(v1);
3537 <        final CompletableFuture<Integer> g = m.whenComplete
3538 <            (f,
2808 <             (Integer x, Throwable t) -> {
2809 <                threadAssertSame(x, v1);
2810 <                threadAssertNull(t);
2811 <                a.getAndIncrement();
2812 <            });
2813 <        if (createIncomplete) f.complete(v1);
2814 <
2815 <        checkCompletedNormally(g, v1);
3534 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3535 >        CompletableFuture<Integer> g = f.newIncompleteFuture();
3536 >        checkIncomplete(f);
3537 >        checkIncomplete(g);
3538 >        f.complete(v1);
3539          checkCompletedNormally(f, v1);
3540 <        assertEquals(1, a.get());
3540 >        checkIncomplete(g);
3541 >        g.complete(v1);
3542 >        checkCompletedNormally(g, v1);
3543 >        assertSame(g.getClass(), CompletableFuture.class);
3544      }}
3545  
3546      /**
3547 <     * whenComplete action executes on exceptional completion, propagating
2822 <     * source result.
3547 >     * completedStage returns a completed CompletionStage
3548       */
3549 <    public void testWhenComplete_exceptionalCompletion() {
3550 <        for (ExecutionMode m : ExecutionMode.values())
3549 >    public void testCompletedStage() {
3550 >        AtomicInteger x = new AtomicInteger(0);
3551 >        AtomicReference<Throwable> r = new AtomicReference<>();
3552 >        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3553 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3554 >        assertEquals(x.get(), 1);
3555 >        assertNull(r.get());
3556 >    }
3557 >
3558 >    /**
3559 >     * defaultExecutor by default returns the commonPool if
3560 >     * it supports more than one thread.
3561 >     */
3562 >    public void testDefaultExecutor() {
3563 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3564 >        Executor e = f.defaultExecutor();
3565 >        Executor c = ForkJoinPool.commonPool();
3566 >        if (ForkJoinPool.getCommonPoolParallelism() > 1)
3567 >            assertSame(e, c);
3568 >        else
3569 >            assertNotSame(e, c);
3570 >    }
3571 >
3572 >    /**
3573 >     * failedFuture returns a CompletableFuture completed
3574 >     * exceptionally with the given Exception
3575 >     */
3576 >    public void testFailedFuture() {
3577 >        CFException ex = new CFException();
3578 >        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3579 >        checkCompletedExceptionally(f, ex);
3580 >    }
3581 >
3582 >    /**
3583 >     * failedFuture(null) throws NPE
3584 >     */
3585 >    public void testFailedFuture_null() {
3586 >        try {
3587 >            CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
3588 >            shouldThrow();
3589 >        } catch (NullPointerException success) {}
3590 >    }
3591 >
3592 >    /**
3593 >     * copy returns a CompletableFuture that is completed normally,
3594 >     * with the same value, when source is.
3595 >     */
3596 >    public void testCopy_normalCompletion() {
3597          for (boolean createIncomplete : new boolean[] { true, false })
3598          for (Integer v1 : new Integer[] { 1, null })
3599      {
3600 <        final AtomicInteger a = new AtomicInteger(0);
3601 <        final CFException ex = new CFException();
3602 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3600 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3601 >        if (!createIncomplete) assertTrue(f.complete(v1));
3602 >        CompletableFuture<Integer> g = f.copy();
3603 >        if (createIncomplete) {
3604 >            checkIncomplete(f);
3605 >            checkIncomplete(g);
3606 >            assertTrue(f.complete(v1));
3607 >        }
3608 >        checkCompletedNormally(f, v1);
3609 >        checkCompletedNormally(g, v1);
3610 >    }}
3611 >
3612 >    /**
3613 >     * copy returns a CompletableFuture that is completed exceptionally
3614 >     * when source is.
3615 >     */
3616 >    public void testCopy_exceptionalCompletion() {
3617 >        for (boolean createIncomplete : new boolean[] { true, false })
3618 >    {
3619 >        CFException ex = new CFException();
3620 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3621          if (!createIncomplete) f.completeExceptionally(ex);
3622 <        final CompletableFuture<Integer> g = m.whenComplete
3623 <            (f,
3624 <             (Integer x, Throwable t) -> {
3625 <                threadAssertNull(x);
3626 <                threadAssertSame(t, ex);
3627 <                a.getAndIncrement();
3628 <            });
3629 <        if (createIncomplete) f.completeExceptionally(ex);
2841 <        checkCompletedWithWrappedCFException(f, ex);
2842 <        checkCompletedWithWrappedCFException(g, ex);
2843 <        assertEquals(1, a.get());
3622 >        CompletableFuture<Integer> g = f.copy();
3623 >        if (createIncomplete) {
3624 >            checkIncomplete(f);
3625 >            checkIncomplete(g);
3626 >            f.completeExceptionally(ex);
3627 >        }
3628 >        checkCompletedExceptionally(f, ex);
3629 >        checkCompletedWithWrappedException(g, ex);
3630      }}
3631  
3632      /**
3633 <     * whenComplete action executes on cancelled source, propagating
2848 <     * CancellationException.
3633 >     * Completion of a copy does not complete its source.
3634       */
3635 <    public void testWhenComplete_sourceCancelled() {
3635 >    public void testCopy_oneWayPropagation() {
3636 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3637 >        assertTrue(f.copy().complete(1));
3638 >        assertTrue(f.copy().complete(null));
3639 >        assertTrue(f.copy().cancel(true));
3640 >        assertTrue(f.copy().cancel(false));
3641 >        assertTrue(f.copy().completeExceptionally(new CFException()));
3642 >        checkIncomplete(f);
3643 >    }
3644 >
3645 >    /**
3646 >     * minimalCompletionStage returns a CompletableFuture that is
3647 >     * completed normally, with the same value, when source is.
3648 >     */
3649 >    public void testMinimalCompletionStage() {
3650 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3651 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3652 >        AtomicInteger x = new AtomicInteger(0);
3653 >        AtomicReference<Throwable> r = new AtomicReference<>();
3654 >        checkIncomplete(f);
3655 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3656 >        f.complete(1);
3657 >        checkCompletedNormally(f, 1);
3658 >        assertEquals(x.get(), 1);
3659 >        assertNull(r.get());
3660 >    }
3661 >
3662 >    /**
3663 >     * minimalCompletionStage returns a CompletableFuture that is
3664 >     * completed exceptionally when source is.
3665 >     */
3666 >    public void testMinimalCompletionStage2() {
3667 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3668 >        CompletionStage<Integer> g = f.minimalCompletionStage();
3669 >        AtomicInteger x = new AtomicInteger(0);
3670 >        AtomicReference<Throwable> r = new AtomicReference<>();
3671 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3672 >        checkIncomplete(f);
3673 >        CFException ex = new CFException();
3674 >        f.completeExceptionally(ex);
3675 >        checkCompletedExceptionally(f, ex);
3676 >        assertEquals(x.get(), 0);
3677 >        assertEquals(r.get().getCause(), ex);
3678 >    }
3679 >
3680 >    /**
3681 >     * failedStage returns a CompletionStage completed
3682 >     * exceptionally with the given Exception
3683 >     */
3684 >    public void testFailedStage() {
3685 >        CFException ex = new CFException();
3686 >        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3687 >        AtomicInteger x = new AtomicInteger(0);
3688 >        AtomicReference<Throwable> r = new AtomicReference<>();
3689 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3690 >        assertEquals(x.get(), 0);
3691 >        assertEquals(r.get(), ex);
3692 >    }
3693 >
3694 >    /**
3695 >     * completeAsync completes with value of given supplier
3696 >     */
3697 >    public void testCompleteAsync() {
3698 >        for (Integer v1 : new Integer[] { 1, null })
3699 >    {
3700 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3701 >        f.completeAsync(() -> v1);
3702 >        f.join();
3703 >        checkCompletedNormally(f, v1);
3704 >    }}
3705 >
3706 >    /**
3707 >     * completeAsync completes exceptionally if given supplier throws
3708 >     */
3709 >    public void testCompleteAsync2() {
3710 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3711 >        CFException ex = new CFException();
3712 >        f.completeAsync(() -> { throw ex; });
3713 >        try {
3714 >            f.join();
3715 >            shouldThrow();
3716 >        } catch (CompletionException success) {}
3717 >        checkCompletedWithWrappedException(f, ex);
3718 >    }
3719 >
3720 >    /**
3721 >     * completeAsync with given executor completes with value of given supplier
3722 >     */
3723 >    public void testCompleteAsync3() {
3724 >        for (Integer v1 : new Integer[] { 1, null })
3725 >    {
3726 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3727 >        ThreadExecutor executor = new ThreadExecutor();
3728 >        f.completeAsync(() -> v1, executor);
3729 >        assertSame(v1, f.join());
3730 >        checkCompletedNormally(f, v1);
3731 >        assertEquals(1, executor.count.get());
3732 >    }}
3733 >
3734 >    /**
3735 >     * completeAsync with given executor completes exceptionally if
3736 >     * given supplier throws
3737 >     */
3738 >    public void testCompleteAsync4() {
3739 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3740 >        CFException ex = new CFException();
3741 >        ThreadExecutor executor = new ThreadExecutor();
3742 >        f.completeAsync(() -> { throw ex; }, executor);
3743 >        try {
3744 >            f.join();
3745 >            shouldThrow();
3746 >        } catch (CompletionException success) {}
3747 >        checkCompletedWithWrappedException(f, ex);
3748 >        assertEquals(1, executor.count.get());
3749 >    }
3750 >
3751 >    /**
3752 >     * orTimeout completes with TimeoutException if not complete
3753 >     */
3754 >    public void testOrTimeout_timesOut() {
3755 >        long timeoutMillis = timeoutMillis();
3756 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3757 >        long startTime = System.nanoTime();
3758 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3759 >        checkCompletedWithTimeoutException(f);
3760 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3761 >    }
3762 >
3763 >    /**
3764 >     * orTimeout completes normally if completed before timeout
3765 >     */
3766 >    public void testOrTimeout_completed() {
3767 >        for (Integer v1 : new Integer[] { 1, null })
3768 >    {
3769 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3770 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3771 >        long startTime = System.nanoTime();
3772 >        f.complete(v1);
3773 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3774 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3775 >        g.complete(v1);
3776 >        checkCompletedNormally(f, v1);
3777 >        checkCompletedNormally(g, v1);
3778 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3779 >    }}
3780 >
3781 >    /**
3782 >     * completeOnTimeout completes with given value if not complete
3783 >     */
3784 >    public void testCompleteOnTimeout_timesOut() {
3785 >        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3786 >                       () -> testCompleteOnTimeout_timesOut(null));
3787 >    }
3788 >
3789 >    /**
3790 >     * completeOnTimeout completes with given value if not complete
3791 >     */
3792 >    public void testCompleteOnTimeout_timesOut(Integer v) {
3793 >        long timeoutMillis = timeoutMillis();
3794 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3795 >        long startTime = System.nanoTime();
3796 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3797 >        assertSame(v, f.join());
3798 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3799 >        f.complete(99);         // should have no effect
3800 >        checkCompletedNormally(f, v);
3801 >    }
3802 >
3803 >    /**
3804 >     * completeOnTimeout has no effect if completed within timeout
3805 >     */
3806 >    public void testCompleteOnTimeout_completed() {
3807 >        for (Integer v1 : new Integer[] { 1, null })
3808 >    {
3809 >        CompletableFuture<Integer> f = new CompletableFuture<>();
3810 >        CompletableFuture<Integer> g = new CompletableFuture<>();
3811 >        long startTime = System.nanoTime();
3812 >        f.complete(v1);
3813 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3814 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3815 >        g.complete(v1);
3816 >        checkCompletedNormally(f, v1);
3817 >        checkCompletedNormally(g, v1);
3818 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS / 2);
3819 >    }}
3820 >
3821 >    /**
3822 >     * delayedExecutor returns an executor that delays submission
3823 >     */
3824 >    public void testDelayedExecutor() {
3825 >        testInParallel(() -> testDelayedExecutor(null, null),
3826 >                       () -> testDelayedExecutor(null, 1),
3827 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
3828 >                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
3829 >    }
3830 >
3831 >    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
3832 >        long timeoutMillis = timeoutMillis();
3833 >        // Use an "unreasonably long" long timeout to catch lingering threads
3834 >        long longTimeoutMillis = 1000 * 60 * 60 * 24;
3835 >        final Executor delayer, longDelayer;
3836 >        if (executor == null) {
3837 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS);
3838 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS);
3839 >        } else {
3840 >            delayer = CompletableFuture.delayedExecutor(timeoutMillis, MILLISECONDS, executor);
3841 >            longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
3842 >        }
3843 >        long startTime = System.nanoTime();
3844 >        CompletableFuture<Integer> f =
3845 >            CompletableFuture.supplyAsync(() -> v, delayer);
3846 >        CompletableFuture<Integer> g =
3847 >            CompletableFuture.supplyAsync(() -> v, longDelayer);
3848 >
3849 >        assertNull(g.getNow(null));
3850 >
3851 >        assertSame(v, f.get(LONG_DELAY_MS, MILLISECONDS));
3852 >        long millisElapsed = millisElapsedSince(startTime);
3853 >        assertTrue(millisElapsed >= timeoutMillis);
3854 >        assertTrue(millisElapsed < LONG_DELAY_MS / 2);
3855 >
3856 >        checkCompletedNormally(f, v);
3857 >
3858 >        checkIncomplete(g);
3859 >        assertTrue(g.cancel(true));
3860 >    }
3861 >
3862 >    //--- tests of implementation details; not part of official tck ---
3863 >
3864 >    Object resultOf(CompletableFuture<?> f) {
3865 >        SecurityManager sm = System.getSecurityManager();
3866 >        if (sm != null) {
3867 >            try {
3868 >                System.setSecurityManager(null);
3869 >            } catch (SecurityException giveUp) {
3870 >                return "Reflection not available";
3871 >            }
3872 >        }
3873 >
3874 >        try {
3875 >            java.lang.reflect.Field resultField
3876 >                = CompletableFuture.class.getDeclaredField("result");
3877 >            resultField.setAccessible(true);
3878 >            return resultField.get(f);
3879 >        } catch (Throwable t) {
3880 >            throw new AssertionError(t);
3881 >        } finally {
3882 >            if (sm != null) System.setSecurityManager(sm);
3883 >        }
3884 >    }
3885 >
3886 >    public void testExceptionPropagationReusesResultObject() {
3887 >        if (!testImplementationDetails) return;
3888          for (ExecutionMode m : ExecutionMode.values())
2852        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2853        for (boolean createIncomplete : new boolean[] { true, false })
3889      {
3890 <        final AtomicInteger a = new AtomicInteger(0);
3891 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3892 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2858 <        final CompletableFuture<Integer> g = m.whenComplete
2859 <            (f,
2860 <             (Integer x, Throwable t) -> {
2861 <                threadAssertNull(x);
2862 <                threadAssertTrue(t instanceof CancellationException);
2863 <                a.getAndIncrement();
2864 <            });
2865 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3890 >        final CFException ex = new CFException();
3891 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3892 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3893  
3894 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
3895 <        checkCompletedWithWrappedCancellationException(g);
3896 <        checkCancelled(f);
3897 <        assertEquals(1, a.get());
3894 >        final Runnable noopRunnable = new Noop(m);
3895 >        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
3896 >        final Function<Integer, Integer> incFunction = new IncFunction(m);
3897 >
3898 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3899 >            = new ArrayList<>();
3900 >
3901 >        funs.add(y -> m.thenRun(y, noopRunnable));
3902 >        funs.add(y -> m.thenAccept(y, noopConsumer));
3903 >        funs.add(y -> m.thenApply(y, incFunction));
3904 >
3905 >        funs.add(y -> m.runAfterEither(y, incomplete, noopRunnable));
3906 >        funs.add(y -> m.acceptEither(y, incomplete, noopConsumer));
3907 >        funs.add(y -> m.applyToEither(y, incomplete, incFunction));
3908 >
3909 >        funs.add(y -> m.runAfterBoth(y, v42, noopRunnable));
3910 >        funs.add(y -> m.runAfterBoth(v42, y, noopRunnable));
3911 >        funs.add(y -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3912 >        funs.add(y -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3913 >        funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
3914 >        funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
3915 >
3916 >        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3917 >
3918 >        funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
3919 >
3920 >        funs.add(y -> CompletableFuture.allOf(y));
3921 >        funs.add(y -> CompletableFuture.allOf(y, v42));
3922 >        funs.add(y -> CompletableFuture.allOf(v42, y));
3923 >        funs.add(y -> CompletableFuture.anyOf(y));
3924 >        funs.add(y -> CompletableFuture.anyOf(y, incomplete));
3925 >        funs.add(y -> CompletableFuture.anyOf(incomplete, y));
3926 >
3927 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3928 >                 fun : funs) {
3929 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3930 >            f.completeExceptionally(ex);
3931 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3932 >            checkCompletedWithWrappedException(src, ex);
3933 >            CompletableFuture<?> dep = fun.apply(src);
3934 >            checkCompletedWithWrappedException(dep, ex);
3935 >            assertSame(resultOf(src), resultOf(dep));
3936 >        }
3937 >
3938 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3939 >                 fun : funs) {
3940 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3941 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3942 >            CompletableFuture<?> dep = fun.apply(src);
3943 >            f.completeExceptionally(ex);
3944 >            checkCompletedWithWrappedException(src, ex);
3945 >            checkCompletedWithWrappedException(dep, ex);
3946 >            assertSame(resultOf(src), resultOf(dep));
3947 >        }
3948 >
3949 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3950 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3951 >                 fun : funs) {
3952 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3953 >            f.cancel(mayInterruptIfRunning);
3954 >            checkCancelled(f);
3955 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3956 >            checkCompletedWithWrappedCancellationException(src);
3957 >            CompletableFuture<?> dep = fun.apply(src);
3958 >            checkCompletedWithWrappedCancellationException(dep);
3959 >            assertSame(resultOf(src), resultOf(dep));
3960 >        }
3961 >
3962 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3963 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3964 >                 fun : funs) {
3965 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3966 >            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
3967 >            CompletableFuture<?> dep = fun.apply(src);
3968 >            f.cancel(mayInterruptIfRunning);
3969 >            checkCancelled(f);
3970 >            checkCompletedWithWrappedCancellationException(src);
3971 >            checkCompletedWithWrappedCancellationException(dep);
3972 >            assertSame(resultOf(src), resultOf(dep));
3973 >        }
3974      }}
3975  
3976      /**
3977 <     * If a whenComplete action throws an exception when triggered by
3978 <     * a normal completion, it completes exceptionally
3977 >     * Minimal completion stages throw UOE for most non-CompletionStage methods
3978 >     */
3979 >    public void testMinimalCompletionStage_minimality() {
3980 >        if (!testImplementationDetails) return;
3981 >        Function<Method, String> toSignature =
3982 >            method -> method.getName() + Arrays.toString(method.getParameterTypes());
3983 >        Predicate<Method> isNotStatic =
3984 >            method -> (method.getModifiers() & Modifier.STATIC) == 0;
3985 >        List<Method> minimalMethods =
3986 >            Stream.of(Object.class, CompletionStage.class)
3987 >            .flatMap(klazz -> Stream.of(klazz.getMethods()))
3988 >            .filter(isNotStatic)
3989 >            .collect(Collectors.toList());
3990 >        // Methods from CompletableFuture permitted NOT to throw UOE
3991 >        String[] signatureWhitelist = {
3992 >            "newIncompleteFuture[]",
3993 >            "defaultExecutor[]",
3994 >            "minimalCompletionStage[]",
3995 >            "copy[]",
3996 >        };
3997 >        Set<String> permittedMethodSignatures =
3998 >            Stream.concat(minimalMethods.stream().map(toSignature),
3999 >                          Stream.of(signatureWhitelist))
4000 >            .collect(Collectors.toSet());
4001 >        List<Method> allMethods = Stream.of(CompletableFuture.class.getMethods())
4002 >            .filter(isNotStatic)
4003 >            .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4004 >            .collect(Collectors.toList());
4005 >
4006 >        List<CompletionStage<Integer>> stages = new ArrayList<>();
4007 >        CompletionStage<Integer> min =
4008 >            new CompletableFuture<Integer>().minimalCompletionStage();
4009 >        stages.add(min);
4010 >        stages.add(min.thenApply(x -> x));
4011 >        stages.add(CompletableFuture.completedStage(1));
4012 >        stages.add(CompletableFuture.failedStage(new CFException()));
4013 >
4014 >        List<Method> bugs = new ArrayList<>();
4015 >        for (Method method : allMethods) {
4016 >            Class<?>[] parameterTypes = method.getParameterTypes();
4017 >            Object[] args = new Object[parameterTypes.length];
4018 >            // Manufacture boxed primitives for primitive params
4019 >            for (int i = 0; i < args.length; i++) {
4020 >                Class<?> type = parameterTypes[i];
4021 >                if (parameterTypes[i] == boolean.class)
4022 >                    args[i] = false;
4023 >                else if (parameterTypes[i] == int.class)
4024 >                    args[i] = 0;
4025 >                else if (parameterTypes[i] == long.class)
4026 >                    args[i] = 0L;
4027 >            }
4028 >            for (CompletionStage<Integer> stage : stages) {
4029 >                try {
4030 >                    method.invoke(stage, args);
4031 >                    bugs.add(method);
4032 >                }
4033 >                catch (java.lang.reflect.InvocationTargetException expected) {
4034 >                    if (! (expected.getCause() instanceof UnsupportedOperationException)) {
4035 >                        bugs.add(method);
4036 >                        // expected.getCause().printStackTrace();
4037 >                    }
4038 >                }
4039 >                catch (ReflectiveOperationException bad) { throw new Error(bad); }
4040 >            }
4041 >        }
4042 >        if (!bugs.isEmpty())
4043 >            throw new Error("Methods did not throw UOE: " + bugs);
4044 >    }
4045 >
4046 >    /**
4047 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4048 >     * is completed normally, with the same value, when source is.
4049       */
4050 <    public void testWhenComplete_actionFailed() {
4050 >    public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4051          for (boolean createIncomplete : new boolean[] { true, false })
2879        for (ExecutionMode m : ExecutionMode.values())
4052          for (Integer v1 : new Integer[] { 1, null })
4053      {
4054 <        final AtomicInteger a = new AtomicInteger(0);
4055 <        final CFException ex = new CFException();
4056 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4057 <        if (!createIncomplete) f.complete(v1);
4058 <        final CompletableFuture<Integer> g = m.whenComplete
4059 <            (f,
4060 <             (Integer x, Throwable t) -> {
4061 <                threadAssertSame(x, v1);
4062 <                threadAssertNull(t);
2891 <                a.getAndIncrement();
2892 <                throw ex;
2893 <            });
2894 <        if (createIncomplete) f.complete(v1);
4054 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4055 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4056 >        if (!createIncomplete) assertTrue(f.complete(v1));
4057 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4058 >        if (createIncomplete) {
4059 >            checkIncomplete(f);
4060 >            checkIncomplete(g);
4061 >            assertTrue(f.complete(v1));
4062 >        }
4063          checkCompletedNormally(f, v1);
4064 <        checkCompletedWithWrappedCFException(g, ex);
2897 <        assertEquals(1, a.get());
4064 >        checkCompletedNormally(g, v1);
4065      }}
4066  
4067      /**
4068 <     * If a whenComplete action throws an exception when triggered by
4069 <     * a source completion that also throws an exception, the source
2903 <     * exception takes precedence.
4068 >     * minimalStage.toCompletableFuture() returns a CompletableFuture that
4069 >     * is completed exceptionally when source is.
4070       */
4071 <    public void testWhenComplete_actionFailedSourceFailed() {
4071 >    public void testMinimalCompletionStage_toCompletableFuture_exceptionalCompletion() {
4072          for (boolean createIncomplete : new boolean[] { true, false })
4073 <        for (ExecutionMode m : ExecutionMode.values())
4073 >    {
4074 >        CFException ex = new CFException();
4075 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4076 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4077 >        if (!createIncomplete) f.completeExceptionally(ex);
4078 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4079 >        if (createIncomplete) {
4080 >            checkIncomplete(f);
4081 >            checkIncomplete(g);
4082 >            f.completeExceptionally(ex);
4083 >        }
4084 >        checkCompletedExceptionally(f, ex);
4085 >        checkCompletedWithWrappedException(g, ex);
4086 >    }}
4087 >
4088 >    /**
4089 >     * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4090 >     */
4091 >    public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4092          for (Integer v1 : new Integer[] { 1, null })
4093      {
4094 <        final AtomicInteger a = new AtomicInteger(0);
4095 <        final CFException ex1 = new CFException();
4096 <        final CFException ex2 = new CFException();
4097 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4094 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4095 >        CompletionStage minimal = f.minimalCompletionStage();
4096 >        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4097 >        assertTrue(g.complete(v1));
4098 >        checkCompletedNormally(g, v1);
4099 >        checkIncomplete(f);
4100 >        checkIncomplete(minimal.toCompletableFuture());
4101 >    }}
4102  
4103 <        if (!createIncomplete) f.completeExceptionally(ex1);
4104 <        final CompletableFuture<Integer> g = m.whenComplete
4105 <            (f,
4106 <             (Integer x, Throwable t) -> {
4107 <                threadAssertSame(t, ex1);
4108 <                threadAssertNull(x);
4109 <                a.getAndIncrement();
4110 <                throw ex2;
4111 <            });
4112 <        if (createIncomplete) f.completeExceptionally(ex1);
4103 >    /**
4104 >     * minimalStage.toCompletableFuture().join() awaits completion
4105 >     */
4106 >    public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4107 >        for (boolean createIncomplete : new boolean[] { true, false })
4108 >        for (Integer v1 : new Integer[] { 1, null })
4109 >    {
4110 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4111 >        if (!createIncomplete) assertTrue(f.complete(v1));
4112 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4113 >        if (createIncomplete) assertTrue(f.complete(v1));
4114 >        assertEquals(v1, minimal.toCompletableFuture().join());
4115 >        assertEquals(v1, minimal.toCompletableFuture().get());
4116 >        checkCompletedNormally(minimal.toCompletableFuture(), v1);
4117 >    }}
4118  
4119 <        checkCompletedWithWrappedCFException(f, ex1);
4120 <        checkCompletedWithWrappedCFException(g, ex1);
4121 <        assertEquals(1, a.get());
4119 >    /**
4120 >     * Completion of a toCompletableFuture copy of a minimal stage
4121 >     * does not complete its source.
4122 >     */
4123 >    public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4124 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4125 >        CompletionStage<Integer> g = f.minimalCompletionStage();
4126 >        assertTrue(g.toCompletableFuture().complete(1));
4127 >        assertTrue(g.toCompletableFuture().complete(null));
4128 >        assertTrue(g.toCompletableFuture().cancel(true));
4129 >        assertTrue(g.toCompletableFuture().cancel(false));
4130 >        assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4131 >        checkIncomplete(g.toCompletableFuture());
4132 >        f.complete(1);
4133 >        checkCompletedNormally(g.toCompletableFuture(), 1);
4134 >    }
4135 >
4136 >    /** Demo utility method for external reliable toCompletableFuture */
4137 >    static <T> CompletableFuture<T> toCompletableFuture(CompletionStage<T> stage) {
4138 >        CompletableFuture<T> f = new CompletableFuture<>();
4139 >        stage.handle((T t, Throwable ex) -> {
4140 >                         if (ex != null) f.completeExceptionally(ex);
4141 >                         else f.complete(t);
4142 >                         return null;
4143 >                     });
4144 >        return f;
4145 >    }
4146 >
4147 >    /** Demo utility method to join a CompletionStage */
4148 >    static <T> T join(CompletionStage<T> stage) {
4149 >        return toCompletableFuture(stage).join();
4150 >    }
4151 >
4152 >    /**
4153 >     * Joining a minimal stage "by hand" works
4154 >     */
4155 >    public void testMinimalCompletionStage_join_by_hand() {
4156 >        for (boolean createIncomplete : new boolean[] { true, false })
4157 >        for (Integer v1 : new Integer[] { 1, null })
4158 >    {
4159 >        CompletableFuture<Integer> f = new CompletableFuture<>();
4160 >        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4161 >        CompletableFuture<Integer> g = new CompletableFuture<>();
4162 >        if (!createIncomplete) assertTrue(f.complete(v1));
4163 >        minimal.thenAccept(x -> g.complete(x));
4164 >        if (createIncomplete) assertTrue(f.complete(v1));
4165 >        g.join();
4166 >        checkCompletedNormally(g, v1);
4167 >        checkCompletedNormally(f, v1);
4168 >        assertEquals(v1, join(minimal));
4169      }}
4170  
4171 +    static class Monad {
4172 +        static class ZeroException extends RuntimeException {
4173 +            public ZeroException() { super("monadic zero"); }
4174 +        }
4175 +        // "return", "unit"
4176 +        static <T> CompletableFuture<T> unit(T value) {
4177 +            return completedFuture(value);
4178 +        }
4179 +        // monadic zero ?
4180 +        static <T> CompletableFuture<T> zero() {
4181 +            return failedFuture(new ZeroException());
4182 +        }
4183 +        // >=>
4184 +        static <T,U,V> Function<T, CompletableFuture<V>> compose
4185 +            (Function<T, CompletableFuture<U>> f,
4186 +             Function<U, CompletableFuture<V>> g) {
4187 +            return x -> f.apply(x).thenCompose(g);
4188 +        }
4189 +
4190 +        static void assertZero(CompletableFuture<?> f) {
4191 +            try {
4192 +                f.getNow(null);
4193 +                throw new AssertionFailedError("should throw");
4194 +            } catch (CompletionException success) {
4195 +                assertTrue(success.getCause() instanceof ZeroException);
4196 +            }
4197 +        }
4198 +
4199 +        static <T> void assertFutureEquals(CompletableFuture<T> f,
4200 +                                           CompletableFuture<T> g) {
4201 +            T fval = null, gval = null;
4202 +            Throwable fex = null, gex = null;
4203 +
4204 +            try { fval = f.get(); }
4205 +            catch (ExecutionException ex) { fex = ex.getCause(); }
4206 +            catch (Throwable ex) { fex = ex; }
4207 +
4208 +            try { gval = g.get(); }
4209 +            catch (ExecutionException ex) { gex = ex.getCause(); }
4210 +            catch (Throwable ex) { gex = ex; }
4211 +
4212 +            if (fex != null || gex != null)
4213 +                assertSame(fex.getClass(), gex.getClass());
4214 +            else
4215 +                assertEquals(fval, gval);
4216 +        }
4217 +
4218 +        static class PlusFuture<T> extends CompletableFuture<T> {
4219 +            AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
4220 +        }
4221 +
4222 +        /** Implements "monadic plus". */
4223 +        static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
4224 +                                             CompletableFuture<? extends T> g) {
4225 +            PlusFuture<T> plus = new PlusFuture<T>();
4226 +            BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
4227 +                try {
4228 +                    if (ex == null) {
4229 +                        if (plus.complete(result))
4230 +                            if (plus.firstFailure.get() != null)
4231 +                                plus.firstFailure.set(null);
4232 +                    }
4233 +                    else if (plus.firstFailure.compareAndSet(null, ex)) {
4234 +                        if (plus.isDone())
4235 +                            plus.firstFailure.set(null);
4236 +                    }
4237 +                    else {
4238 +                        // first failure has precedence
4239 +                        Throwable first = plus.firstFailure.getAndSet(null);
4240 +
4241 +                        // may fail with "Self-suppression not permitted"
4242 +                        try { first.addSuppressed(ex); }
4243 +                        catch (Exception ignored) {}
4244 +
4245 +                        plus.completeExceptionally(first);
4246 +                    }
4247 +                } catch (Throwable unexpected) {
4248 +                    plus.completeExceptionally(unexpected);
4249 +                }
4250 +            };
4251 +            f.whenComplete(action);
4252 +            g.whenComplete(action);
4253 +            return plus;
4254 +        }
4255 +    }
4256 +
4257 +    /**
4258 +     * CompletableFuture is an additive monad - sort of.
4259 +     * https://en.wikipedia.org/wiki/Monad_(functional_programming)#Additive_monads
4260 +     */
4261 +    public void testAdditiveMonad() throws Throwable {
4262 +        Function<Long, CompletableFuture<Long>> unit = Monad::unit;
4263 +        CompletableFuture<Long> zero = Monad.zero();
4264 +
4265 +        // Some mutually non-commutative functions
4266 +        Function<Long, CompletableFuture<Long>> triple
4267 +            = x -> Monad.unit(3 * x);
4268 +        Function<Long, CompletableFuture<Long>> inc
4269 +            = x -> Monad.unit(x + 1);
4270 +
4271 +        // unit is a right identity: m >>= unit === m
4272 +        Monad.assertFutureEquals(inc.apply(5L).thenCompose(unit),
4273 +                                 inc.apply(5L));
4274 +        // unit is a left identity: (unit x) >>= f === f x
4275 +        Monad.assertFutureEquals(unit.apply(5L).thenCompose(inc),
4276 +                                 inc.apply(5L));
4277 +
4278 +        // associativity: (m >>= f) >>= g === m >>= ( \x -> (f x >>= g) )
4279 +        Monad.assertFutureEquals(
4280 +            unit.apply(5L).thenCompose(inc).thenCompose(triple),
4281 +            unit.apply(5L).thenCompose(x -> inc.apply(x).thenCompose(triple)));
4282 +
4283 +        // The case for CompletableFuture as an additive monad is weaker...
4284 +
4285 +        // zero is a monadic zero
4286 +        Monad.assertZero(zero);
4287 +
4288 +        // left zero: zero >>= f === zero
4289 +        Monad.assertZero(zero.thenCompose(inc));
4290 +        // right zero: f >>= (\x -> zero) === zero
4291 +        Monad.assertZero(inc.apply(5L).thenCompose(x -> zero));
4292 +
4293 +        // f plus zero === f
4294 +        Monad.assertFutureEquals(Monad.unit(5L),
4295 +                                 Monad.plus(Monad.unit(5L), zero));
4296 +        // zero plus f === f
4297 +        Monad.assertFutureEquals(Monad.unit(5L),
4298 +                                 Monad.plus(zero, Monad.unit(5L)));
4299 +        // zero plus zero === zero
4300 +        Monad.assertZero(Monad.plus(zero, zero));
4301 +        {
4302 +            CompletableFuture<Long> f = Monad.plus(Monad.unit(5L),
4303 +                                                   Monad.unit(8L));
4304 +            // non-determinism
4305 +            assertTrue(f.get() == 5L || f.get() == 8L);
4306 +        }
4307 +
4308 +        CompletableFuture<Long> godot = new CompletableFuture<>();
4309 +        // f plus godot === f (doesn't wait for godot)
4310 +        Monad.assertFutureEquals(Monad.unit(5L),
4311 +                                 Monad.plus(Monad.unit(5L), godot));
4312 +        // godot plus f === f (doesn't wait for godot)
4313 +        Monad.assertFutureEquals(Monad.unit(5L),
4314 +                                 Monad.plus(godot, Monad.unit(5L)));
4315 +    }
4316 +
4317 +    /** Test long recursive chains of CompletableFutures with cascading completions */
4318 +    @SuppressWarnings("FutureReturnValueIgnored")
4319 +    public void testRecursiveChains() throws Throwable {
4320 +        for (ExecutionMode m : ExecutionMode.values())
4321 +        for (boolean addDeadEnds : new boolean[] { true, false })
4322 +    {
4323 +        final int val = 42;
4324 +        final int n = expensiveTests ? 1_000 : 2;
4325 +        CompletableFuture<Integer> head = new CompletableFuture<>();
4326 +        CompletableFuture<Integer> tail = head;
4327 +        for (int i = 0; i < n; i++) {
4328 +            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4329 +            tail = m.thenApply(tail, v -> v + 1);
4330 +            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4331 +            tail = m.applyToEither(tail, tail, v -> v + 1);
4332 +            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4333 +            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4334 +        }
4335 +        head.complete(val);
4336 +        assertEquals(val + 3 * n, (int) tail.join());
4337 +    }}
4338 +
4339 +    /**
4340 +     * A single CompletableFuture with many dependents.
4341 +     * A demo of scalability - runtime is O(n).
4342 +     */
4343 +    @SuppressWarnings("FutureReturnValueIgnored")
4344 +    public void testManyDependents() throws Throwable {
4345 +        final int n = expensiveTests ? 1_000_000 : 10;
4346 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4347 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4348 +        final AtomicInteger count = new AtomicInteger(0);
4349 +        for (int i = 0; i < n; i++) {
4350 +            head.thenRun(() -> count.getAndIncrement());
4351 +            head.thenAccept(x -> count.getAndIncrement());
4352 +            head.thenApply(x -> count.getAndIncrement());
4353 +
4354 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4355 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4356 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4357 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4358 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4359 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4360 +
4361 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4362 +            head.acceptEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4363 +            head.applyToEither(new CompletableFuture<Void>(), x -> count.getAndIncrement());
4364 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4365 +            new CompletableFuture<Void>().acceptEither(head, x -> count.getAndIncrement());
4366 +            new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4367 +        }
4368 +        head.complete(null);
4369 +        assertEquals(5 * 3 * n, count.get());
4370 +    }
4371 +
4372 +    /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4373 +    @SuppressWarnings("FutureReturnValueIgnored")
4374 +    public void testCoCompletionGarbageRetention() throws Throwable {
4375 +        final int n = expensiveTests ? 1_000_000 : 10;
4376 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4377 +        CompletableFuture<Integer> f;
4378 +        for (int i = 0; i < n; i++) {
4379 +            f = new CompletableFuture<>();
4380 +            f.runAfterEither(incomplete, () -> {});
4381 +            f.complete(null);
4382 +
4383 +            f = new CompletableFuture<>();
4384 +            f.acceptEither(incomplete, x -> {});
4385 +            f.complete(null);
4386 +
4387 +            f = new CompletableFuture<>();
4388 +            f.applyToEither(incomplete, x -> x);
4389 +            f.complete(null);
4390 +
4391 +            f = new CompletableFuture<>();
4392 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { f, incomplete });
4393 +            f.complete(null);
4394 +        }
4395 +
4396 +        for (int i = 0; i < n; i++) {
4397 +            f = new CompletableFuture<>();
4398 +            incomplete.runAfterEither(f, () -> {});
4399 +            f.complete(null);
4400 +
4401 +            f = new CompletableFuture<>();
4402 +            incomplete.acceptEither(f, x -> {});
4403 +            f.complete(null);
4404 +
4405 +            f = new CompletableFuture<>();
4406 +            incomplete.applyToEither(f, x -> x);
4407 +            f.complete(null);
4408 +
4409 +            f = new CompletableFuture<>();
4410 +            CompletableFuture.anyOf(new CompletableFuture<?>[] { incomplete, f });
4411 +            f.complete(null);
4412 +        }
4413 +    }
4414 +
4415 +    /**
4416 +     * Reproduction recipe for:
4417 +     * 8160402: Garbage retention with CompletableFuture.anyOf
4418 +     * 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
4419 +     */
4420 +    public void testAnyOfGarbageRetention() throws Throwable {
4421 +        for (Integer v : new Integer[] { 1, null })
4422 +    {
4423 +        final int n = expensiveTests ? 100_000 : 10;
4424 +        CompletableFuture<Integer>[] fs
4425 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4426 +        for (int i = 0; i < fs.length; i++)
4427 +            fs[i] = new CompletableFuture<>();
4428 +        fs[fs.length - 1].complete(v);
4429 +        for (int i = 0; i < n; i++)
4430 +            checkCompletedNormally(CompletableFuture.anyOf(fs), v);
4431 +    }}
4432 +
4433 +    /**
4434 +     * Checks for garbage retention with allOf.
4435 +     *
4436 +     * As of 2016-07, fails with OOME:
4437 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledAllOfGarbageRetention tck
4438 +     */
4439 +    public void testCancelledAllOfGarbageRetention() throws Throwable {
4440 +        final int n = expensiveTests ? 100_000 : 10;
4441 +        CompletableFuture<Integer>[] fs
4442 +            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4443 +        for (int i = 0; i < fs.length; i++)
4444 +            fs[i] = new CompletableFuture<>();
4445 +        for (int i = 0; i < n; i++)
4446 +            assertTrue(CompletableFuture.allOf(fs).cancel(false));
4447 +    }
4448 +
4449 +    /**
4450 +     * Checks for garbage retention when a dependent future is
4451 +     * cancelled and garbage-collected.
4452 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4453 +     *
4454 +     * As of 2016-07, fails with OOME:
4455 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testCancelledGarbageRetention tck
4456 +     */
4457 +    public void testCancelledGarbageRetention() throws Throwable {
4458 +        final int n = expensiveTests ? 100_000 : 10;
4459 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4460 +        for (int i = 0; i < n; i++)
4461 +            assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4462 +    }
4463 +
4464 +    /**
4465 +     * Checks for garbage retention when MinimalStage.toCompletableFuture()
4466 +     * is invoked many times.
4467 +     * 8161600: Garbage retention when source CompletableFutures are never completed
4468 +     *
4469 +     * As of 2016-07, fails with OOME:
4470 +     * ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testToCompletableFutureGarbageRetention tck
4471 +     */
4472 +    public void testToCompletableFutureGarbageRetention() throws Throwable {
4473 +        final int n = expensiveTests ? 900_000 : 10;
4474 +        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4475 +        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4476 +        for (int i = 0; i < n; i++)
4477 +            assertTrue(minimal.toCompletableFuture().cancel(true));
4478 +    }
4479 +
4480 + //     static <U> U join(CompletionStage<U> stage) {
4481 + //         CompletableFuture<U> f = new CompletableFuture<>();
4482 + //         stage.whenComplete((v, ex) -> {
4483 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4484 + //         });
4485 + //         return f.join();
4486 + //     }
4487 +
4488 + //     static <U> boolean isDone(CompletionStage<U> stage) {
4489 + //         CompletableFuture<U> f = new CompletableFuture<>();
4490 + //         stage.whenComplete((v, ex) -> {
4491 + //             if (ex != null) f.completeExceptionally(ex); else f.complete(v);
4492 + //         });
4493 + //         return f.isDone();
4494 + //     }
4495 +
4496 + //     static <U> U join2(CompletionStage<U> stage) {
4497 + //         return stage.toCompletableFuture().copy().join();
4498 + //     }
4499 +
4500 + //     static <U> boolean isDone2(CompletionStage<U> stage) {
4501 + //         return stage.toCompletableFuture().copy().isDone();
4502 + //     }
4503 +
4504   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines