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.7 by jsr166, Fri Mar 22 16:29:42 2013 UTC vs.
Revision 1.59 by jsr166, Tue Jun 3 03:54:14 2014 UTC

# Line 16 | Line 16 | import java.util.concurrent.ExecutionExc
16   import java.util.concurrent.Future;
17   import java.util.concurrent.CompletableFuture;
18   import java.util.concurrent.CompletionException;
19 + import java.util.concurrent.CompletionStage;
20 + import java.util.concurrent.ForkJoinPool;
21 + import java.util.concurrent.ForkJoinTask;
22   import java.util.concurrent.TimeoutException;
23   import java.util.concurrent.atomic.AtomicInteger;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 53 | Line 56 | public class CompletableFutureTest exten
56          catch (Throwable fail) { threadUnexpectedException(fail); }
57      }
58  
59 <    void checkCompletedNormally(CompletableFuture<?> f, Object value) {
59 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
60 >        try {
61 >            assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS));
62 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
63          try {
64              assertEquals(value, f.join());
65          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 63 | Line 69 | public class CompletableFutureTest exten
69          try {
70              assertEquals(value, f.get());
71          } catch (Throwable fail) { threadUnexpectedException(fail); }
66        try {
67            assertEquals(value, f.get(0L, SECONDS));
68        } catch (Throwable fail) { threadUnexpectedException(fail); }
72          assertTrue(f.isDone());
73          assertFalse(f.isCancelled());
74 +        assertFalse(f.isCompletedExceptionally());
75          assertTrue(f.toString().contains("[Completed normally]"));
76      }
77  
78      void checkCompletedWithWrappedCFException(CompletableFuture<?> f) {
79          try {
80 +            f.get(LONG_DELAY_MS, MILLISECONDS);
81 +            shouldThrow();
82 +        } catch (ExecutionException success) {
83 +            assertTrue(success.getCause() instanceof CFException);
84 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
85 +        try {
86              f.join();
87              shouldThrow();
88 <        } catch (Throwable ex) {
89 <            assertTrue(ex instanceof CompletionException &&
80 <                       ((CompletionException)ex).getCause() instanceof CFException);
88 >        } catch (CompletionException success) {
89 >            assertTrue(success.getCause() instanceof CFException);
90          }
91          try {
92              f.getNow(null);
93              shouldThrow();
94 <        } catch (Throwable ex) {
95 <            assertTrue(ex instanceof CompletionException &&
87 <                       ((CompletionException)ex).getCause() instanceof CFException);
94 >        } catch (CompletionException success) {
95 >            assertTrue(success.getCause() instanceof CFException);
96          }
97          try {
98              f.get();
99              shouldThrow();
100 <        } catch (Throwable ex) {
101 <            assertTrue(ex instanceof ExecutionException &&
102 <                       ((ExecutionException)ex).getCause() instanceof CFException);
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]"));
106 >    }
107 >
108 >    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 >                                              CFException ex) {
110 >        try {
111 >            f.get(LONG_DELAY_MS, MILLISECONDS);
112 >            shouldThrow();
113 >        } catch (ExecutionException success) {
114 >            assertSame(ex, success.getCause());
115 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
116 >        try {
117 >            f.join();
118 >            shouldThrow();
119 >        } catch (CompletionException success) {
120 >            assertSame(ex, success.getCause());
121          }
122          try {
123 <            f.get(0L, SECONDS);
123 >            f.getNow(null);
124              shouldThrow();
125 <        } catch (Throwable ex) {
126 <            assertTrue(ex instanceof ExecutionException &&
101 <                       ((ExecutionException)ex).getCause() instanceof CFException);
125 >        } catch (CompletionException success) {
126 >            assertSame(ex, success.getCause());
127          }
128 +        try {
129 +            f.get();
130 +            shouldThrow();
131 +        } catch (ExecutionException success) {
132 +            assertSame(ex, success.getCause());
133 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
134          assertTrue(f.isDone());
135          assertFalse(f.isCancelled());
136 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
137      }
138  
139      void checkCancelled(CompletableFuture<?> f) {
140          try {
141 +            f.get(LONG_DELAY_MS, MILLISECONDS);
142 +            shouldThrow();
143 +        } catch (CancellationException success) {
144 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
145 +        try {
146              f.join();
147              shouldThrow();
148 <        } catch (Throwable ex) {
112 <            assertTrue(ex instanceof CancellationException);
113 <        }
148 >        } catch (CancellationException success) {}
149          try {
150              f.getNow(null);
151              shouldThrow();
152 <        } catch (Throwable ex) {
118 <            assertTrue(ex instanceof CancellationException);
119 <        }
152 >        } catch (CancellationException success) {}
153          try {
154              f.get();
155              shouldThrow();
156 <        } catch (Throwable ex) {
157 <            assertTrue(ex instanceof CancellationException);
125 <        }
126 <        try {
127 <            f.get(0L, SECONDS);
128 <            shouldThrow();
129 <        } catch (Throwable ex) {
130 <            assertTrue(ex instanceof CancellationException);
131 <        }
156 >        } catch (CancellationException success) {
157 >        } 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      }
163  
164      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
165          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 (Throwable ex) {
175 <            assertTrue(ex instanceof CompletionException &&
142 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
174 >        } catch (CompletionException success) {
175 >            assertTrue(success.getCause() instanceof CancellationException);
176          }
177          try {
178              f.getNow(null);
179              shouldThrow();
180 <        } catch (Throwable ex) {
181 <            assertTrue(ex instanceof CompletionException &&
149 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
180 >        } catch (CompletionException success) {
181 >            assertTrue(success.getCause() instanceof CancellationException);
182          }
183          try {
184              f.get();
185              shouldThrow();
186 <        } catch (Throwable ex) {
187 <            assertTrue(ex instanceof ExecutionException &&
188 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
157 <        }
158 <        try {
159 <            f.get(0L, SECONDS);
160 <            shouldThrow();
161 <        } catch (Throwable ex) {
162 <            assertTrue(ex instanceof ExecutionException &&
163 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
164 <        }
186 >        } catch (ExecutionException success) {
187 >            assertTrue(success.getCause() instanceof CancellationException);
188 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
189          assertTrue(f.isDone());
190          assertFalse(f.isCancelled());
191 +        assertTrue(f.isCompletedExceptionally());
192 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
193      }
194  
195      /**
# Line 171 | Line 197 | public class CompletableFutureTest exten
197       * by methods isDone, isCancelled, and getNow
198       */
199      public void testConstructor() {
200 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
200 >        CompletableFuture<Integer> f = new CompletableFuture<>();
201          checkIncomplete(f);
202      }
203  
# Line 180 | Line 206 | public class CompletableFutureTest exten
206       * isCancelled, join, get, and getNow
207       */
208      public void testComplete() {
209 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
209 >        CompletableFuture<Integer> f = new CompletableFuture<>();
210          checkIncomplete(f);
211          f.complete(one);
212          checkCompletedNormally(f, one);
# Line 191 | Line 217 | public class CompletableFutureTest exten
217       * methods isDone, isCancelled, join, get, and getNow
218       */
219      public void testCompleteExceptionally() {
220 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
220 >        CompletableFuture<Integer> f = new CompletableFuture<>();
221          checkIncomplete(f);
222          f.completeExceptionally(new CFException());
223          checkCompletedWithWrappedCFException(f);
# Line 202 | Line 228 | public class CompletableFutureTest exten
228       * methods isDone, isCancelled, join, get, and getNow
229       */
230      public void testCancel() {
231 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
231 >        CompletableFuture<Integer> f = new CompletableFuture<>();
232          checkIncomplete(f);
233          assertTrue(f.cancel(true));
234          checkCancelled(f);
# Line 212 | Line 238 | public class CompletableFutureTest exten
238       * obtrudeValue forces completion with given value
239       */
240      public void testObtrudeValue() {
241 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
241 >        CompletableFuture<Integer> f = new CompletableFuture<>();
242          checkIncomplete(f);
243          f.complete(one);
244          checkCompletedNormally(f, one);
# Line 220 | Line 246 | public class CompletableFutureTest exten
246          checkCompletedNormally(f, three);
247          f.obtrudeValue(two);
248          checkCompletedNormally(f, two);
249 <        f = new CompletableFuture<Integer>();
249 >        f = new CompletableFuture<>();
250          f.obtrudeValue(three);
251          checkCompletedNormally(f, three);
252 <        f = new CompletableFuture<Integer>();
252 >        f.obtrudeValue(null);
253 >        checkCompletedNormally(f, null);
254 >        f = new CompletableFuture<>();
255          f.completeExceptionally(new CFException());
256          f.obtrudeValue(four);
257          checkCompletedNormally(f, four);
# Line 233 | Line 261 | public class CompletableFutureTest exten
261       * obtrudeException forces completion with given exception
262       */
263      public void testObtrudeException() {
264 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
264 >        CompletableFuture<Integer> f = new CompletableFuture<>();
265          checkIncomplete(f);
266          f.complete(one);
267          checkCompletedNormally(f, one);
268          f.obtrudeException(new CFException());
269          checkCompletedWithWrappedCFException(f);
270 <        f = new CompletableFuture<Integer>();
270 >        f = new CompletableFuture<>();
271          f.obtrudeException(new CFException());
272          checkCompletedWithWrappedCFException(f);
273 <        f = new CompletableFuture<Integer>();
273 >        f = new CompletableFuture<>();
274          f.completeExceptionally(new CFException());
275          f.obtrudeValue(four);
276          checkCompletedNormally(f, four);
# Line 254 | Line 282 | public class CompletableFutureTest exten
282       * getNumberOfDependents returns number of dependent tasks
283       */
284      public void testGetNumberOfDependents() {
285 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
286 <        assertEquals(f.getNumberOfDependents(), 0);
287 <        CompletableFuture g = f.thenRun(new Noop());
288 <        assertEquals(f.getNumberOfDependents(), 1);
289 <        assertEquals(g.getNumberOfDependents(), 0);
290 <        CompletableFuture h = f.thenRun(new Noop());
291 <        assertEquals(f.getNumberOfDependents(), 2);
285 >        CompletableFuture<Integer> f = new CompletableFuture<>();
286 >        assertEquals(0, f.getNumberOfDependents());
287 >        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
288 >        assertEquals(1, f.getNumberOfDependents());
289 >        assertEquals(0, g.getNumberOfDependents());
290 >        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
291 >        assertEquals(2, f.getNumberOfDependents());
292          f.complete(1);
293          checkCompletedNormally(g, null);
294 <        assertEquals(f.getNumberOfDependents(), 0);
295 <        assertEquals(g.getNumberOfDependents(), 0);
294 >        assertEquals(0, f.getNumberOfDependents());
295 >        assertEquals(0, g.getNumberOfDependents());
296      }
297  
270
298      /**
299       * toString indicates current completion state
300       */
# Line 285 | Line 312 | public class CompletableFutureTest exten
312          assertTrue(f.toString().contains("[Completed exceptionally]"));
313      }
314  
315 <    static final Supplier<Integer> supplyOne =
316 <        () -> Integer.valueOf(1);
317 <    static final Function<Integer, Integer> inc =
318 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
319 <    static final BiFunction<Integer, Integer, Integer> add =
320 <        (Integer x, Integer y) -> Integer.valueOf(x.intValue() + y.intValue());
321 <    static final class IncAction implements Consumer<Integer> {
322 <        int value;
323 <        public void accept(Integer x) { value = x.intValue() + 1; }
315 >    /**
316 >     * completedFuture returns a completed CompletableFuture with given value
317 >     */
318 >    public void testCompletedFuture() {
319 >        CompletableFuture<String> f = CompletableFuture.completedFuture("test");
320 >        checkCompletedNormally(f, "test");
321 >    }
322 >
323 >    // Choose non-commutative actions for better coverage
324 >
325 >    // A non-commutative function that handles and produces null values as well.
326 >    static Integer subtract(Integer x, Integer y) {
327 >        return (x == null && y == null) ? null :
328 >            ((x == null) ? 42 : x.intValue())
329 >            - ((y == null) ? 99 : y.intValue());
330 >    }
331 >
332 >    // A function that handles and produces null values as well.
333 >    static Integer inc(Integer x) {
334 >        return (x == null) ? null : x + 1;
335 >    }
336 >
337 >    static final class IntegerSupplier implements Supplier<Integer> {
338 >        final ExecutionMode m;
339 >        int invocationCount = 0;
340 >        final Integer value;
341 >        IntegerSupplier(ExecutionMode m, Integer value) {
342 >            this.m = m;
343 >            this.value = value;
344 >        }
345 >        public Integer get() {
346 >            m.checkExecutionMode();
347 >            invocationCount++;
348 >            return value;
349 >        }
350      }
351 <    static final class AddAction implements BiConsumer<Integer, Integer> {
352 <        int value;
351 >        
352 >    static final class IncAction implements Consumer<Integer> {
353 >        int invocationCount = 0;
354 >        Integer value;
355 >        public void accept(Integer x) {
356 >            invocationCount++;
357 >            value = inc(x);
358 >        }
359 >    }
360 >    static final class IncFunction implements Function<Integer,Integer> {
361 >        final ExecutionMode m;
362 >        int invocationCount = 0;
363 >        Integer value;
364 >        IncFunction(ExecutionMode m) { this.m = m; }
365 >        public Integer apply(Integer x) {
366 >            m.checkExecutionMode();
367 >            invocationCount++;
368 >            return value = inc(x);
369 >        }
370 >    }
371 >    static final class SubtractAction implements BiConsumer<Integer, Integer> {
372 >        final ExecutionMode m;
373 >        int invocationCount = 0;
374 >        Integer value;
375 >        // Check this action was invoked exactly once when result is computed.
376 >        SubtractAction(ExecutionMode m) { this.m = m; }
377          public void accept(Integer x, Integer y) {
378 <            value = x.intValue() + y.intValue();
378 >            m.checkExecutionMode();
379 >            invocationCount++;
380 >            value = subtract(x, y);
381 >        }
382 >    }
383 >    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
384 >        final ExecutionMode m;
385 >        int invocationCount = 0;
386 >        Integer value;
387 >        // Check this action was invoked exactly once when result is computed.
388 >        SubtractFunction(ExecutionMode m) { this.m = m; }
389 >        public Integer apply(Integer x, Integer y) {
390 >            m.checkExecutionMode();
391 >            invocationCount++;
392 >            return value = subtract(x, y);
393          }
394      }
395      static final class Noop implements Runnable {
396 <        boolean ran;
397 <        public void run() { ran = true; }
396 >        final ExecutionMode m;
397 >        int invocationCount = 0;
398 >        Noop(ExecutionMode m) { this.m = m; }
399 >        public void run() {
400 >            m.checkExecutionMode();
401 >            invocationCount++;
402 >        }
403      }
404  
405      static final class FailingSupplier implements Supplier<Integer> {
406 <        boolean ran;
407 <        public Integer get() { ran = true; throw new CFException(); }
406 >        final ExecutionMode m;
407 >        int invocationCount = 0;
408 >        FailingSupplier(ExecutionMode m) { this.m = m; }
409 >        public Integer get() {
410 >            m.checkExecutionMode();
411 >            invocationCount++;
412 >            throw new CFException();
413 >        }
414      }
415      static final class FailingConsumer implements Consumer<Integer> {
416 <        boolean ran;
417 <        public void accept(Integer x) { ran = true; throw new CFException(); }
416 >        final ExecutionMode m;
417 >        int invocationCount = 0;
418 >        FailingConsumer(ExecutionMode m) { this.m = m; }
419 >        public void accept(Integer x) {
420 >            m.checkExecutionMode();
421 >            invocationCount++;
422 >            throw new CFException();
423 >        }
424      }
425      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
426 <        boolean ran;
427 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
426 >        final ExecutionMode m;
427 >        int invocationCount = 0;
428 >        FailingBiConsumer(ExecutionMode m) { this.m = m; }
429 >        public void accept(Integer x, Integer y) {
430 >            m.checkExecutionMode();
431 >            invocationCount++;
432 >            throw new CFException();
433 >        }
434      }
435      static final class FailingFunction implements Function<Integer, Integer> {
436 <        boolean ran;
437 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
436 >        final ExecutionMode m;
437 >        int invocationCount = 0;
438 >        FailingFunction(ExecutionMode m) { this.m = m; }
439 >        public Integer apply(Integer x) {
440 >            m.checkExecutionMode();
441 >            invocationCount++;
442 >            throw new CFException();
443 >        }
444      }
445      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
446 <        boolean ran;
447 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
448 <    }
449 <    static final class FailingNoop implements Runnable {
450 <        boolean ran;
451 <        public void run() { ran = true; throw new CFException(); }
446 >        final ExecutionMode m;
447 >        int invocationCount = 0;
448 >        FailingBiFunction(ExecutionMode m) { this.m = m; }
449 >        public Integer apply(Integer x, Integer y) {
450 >            m.checkExecutionMode();
451 >            invocationCount++;
452 >            throw new CFException();
453 >        }
454 >    }
455 >    static final class FailingRunnable implements Runnable {
456 >        final ExecutionMode m;
457 >        int invocationCount = 0;
458 >        FailingRunnable(ExecutionMode m) { this.m = m; }
459 >        public void run() {
460 >            m.checkExecutionMode();
461 >            invocationCount++;
462 >            throw new CFException();
463 >        }
464      }
465  
466 <    static final class CompletableFutureInc implements Function<Integer, CompletableFuture<Integer>> {
466 >    static final class CompletableFutureInc
467 >        implements Function<Integer, CompletableFuture<Integer>> {
468 >        final ExecutionMode m;
469 >        int invocationCount = 0;
470 >        CompletableFutureInc(ExecutionMode m) { this.m = m; }
471          public CompletableFuture<Integer> apply(Integer x) {
472 <            CompletableFuture<Integer> f = new CompletableFuture<Integer>();
473 <            f.complete(Integer.valueOf(x.intValue() + 1));
472 >            m.checkExecutionMode();
473 >            invocationCount++;
474 >            CompletableFuture<Integer> f = new CompletableFuture<>();
475 >            f.complete(inc(x));
476              return f;
477          }
478      }
479  
480 <    static final class FailingCompletableFutureFunction implements Function<Integer, CompletableFuture<Integer>> {
481 <        boolean ran;
480 >    static final class FailingCompletableFutureFunction
481 >        implements Function<Integer, CompletableFuture<Integer>> {
482 >        final ExecutionMode m;
483 >        int invocationCount = 0;
484 >        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            ran = true; throw new CFException();
486 >            m.checkExecutionMode();
487 >            invocationCount++;
488 >            throw new CFException();
489          }
490      }
491  
492      // Used for explicit executor tests
493      static final class ThreadExecutor implements Executor {
494 +        final AtomicInteger count = new AtomicInteger(0);
495 +        static final ThreadGroup tg = new ThreadGroup("ThreadExecutor");
496 +        static boolean startedCurrentThread() {
497 +            return Thread.currentThread().getThreadGroup() == tg;
498 +        }
499 +
500          public void execute(Runnable r) {
501 <            new Thread(r).start();
501 >            count.getAndIncrement();
502 >            new Thread(tg, r).start();
503          }
504      }
505  
506 <    static final class ExceptionToInteger implements Function<Throwable, Integer> {
507 <        public Integer apply(Throwable x) { return Integer.valueOf(3); }
508 <    }
506 >    /**
507 >     * Permits the testing of parallel code for the 3 different
508 >     * execution modes without repeating all the testing code.
509 >     */
510 >    enum ExecutionMode {
511 >        DEFAULT {
512 >            public void checkExecutionMode() {
513 >                assertNull(ForkJoinTask.getPool());
514 >            }
515 >            public CompletableFuture<Void> runAsync(Runnable a) {
516 >                throw new UnsupportedOperationException();
517 >            }
518 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
519 >                throw new UnsupportedOperationException();
520 >            }
521 >            public <T> CompletableFuture<Void> thenRun
522 >                (CompletableFuture<T> f, Runnable a) {
523 >                return f.thenRun(a);
524 >            }
525 >            public <T> CompletableFuture<Void> thenAccept
526 >                (CompletableFuture<T> f, Consumer<? super T> a) {
527 >                return f.thenAccept(a);
528 >            }
529 >            public <T,U> CompletableFuture<U> thenApply
530 >                (CompletableFuture<T> f, Function<? super T,U> a) {
531 >                return f.thenApply(a);
532 >            }
533 >            public <T,U> CompletableFuture<U> thenCompose
534 >                (CompletableFuture<T> f,
535 >                 Function<? super T,? extends CompletionStage<U>> a) {
536 >                return f.thenCompose(a);
537 >            }
538 >            public <T,U> CompletableFuture<U> handle
539 >                (CompletableFuture<T> f,
540 >                 BiFunction<? super T,Throwable,? extends U> a) {
541 >                return f.handle(a);
542 >            }
543 >            public <T> CompletableFuture<T> whenComplete
544 >                (CompletableFuture<T> f,
545 >                 BiConsumer<? super T,? super Throwable> a) {
546 >                return f.whenComplete(a);
547 >            }
548 >            public <T,U> CompletableFuture<Void> runAfterBoth
549 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
550 >                return f.runAfterBoth(g, a);
551 >            }
552 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
553 >                (CompletableFuture<T> f,
554 >                 CompletionStage<? extends U> g,
555 >                 BiConsumer<? super T,? super U> a) {
556 >                return f.thenAcceptBoth(g, a);
557 >            }
558 >            public <T,U,V> CompletableFuture<V> thenCombine
559 >                (CompletableFuture<T> f,
560 >                 CompletionStage<? extends U> g,
561 >                 BiFunction<? super T,? super U,? extends V> a) {
562 >                return f.thenCombine(g, a);
563 >            }
564 >            public <T> CompletableFuture<Void> runAfterEither
565 >                (CompletableFuture<T> f,
566 >                 CompletionStage<?> g,
567 >                 java.lang.Runnable a) {
568 >                return f.runAfterEither(g, a);
569 >            }
570 >            public <T> CompletableFuture<Void> acceptEither
571 >                (CompletableFuture<T> f,
572 >                 CompletionStage<? extends T> g,
573 >                 Consumer<? super T> a) {
574 >                return f.acceptEither(g, a);
575 >            }
576 >            public <T,U> CompletableFuture<U> applyToEither
577 >                (CompletableFuture<T> f,
578 >                 CompletionStage<? extends T> g,
579 >                 Function<? super T,U> a) {
580 >                return f.applyToEither(g, a);
581 >            }
582 >        },
583  
584 <    static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
585 <        public Integer apply(Integer x, Throwable t) {
586 <            return (t == null) ? two : three;
587 <        }
588 <    }
584 >        ASYNC {
585 >            public void checkExecutionMode() {
586 >                assertSame(ForkJoinPool.commonPool(),
587 >                           ForkJoinTask.getPool());
588 >            }
589 >            public CompletableFuture<Void> runAsync(Runnable a) {
590 >                return CompletableFuture.runAsync(a);
591 >            }
592 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
593 >                return CompletableFuture.supplyAsync(a);
594 >            }
595 >            public <T> CompletableFuture<Void> thenRun
596 >                (CompletableFuture<T> f, Runnable a) {
597 >                return f.thenRunAsync(a);
598 >            }
599 >            public <T> CompletableFuture<Void> thenAccept
600 >                (CompletableFuture<T> f, Consumer<? super T> a) {
601 >                return f.thenAcceptAsync(a);
602 >            }
603 >            public <T,U> CompletableFuture<U> thenApply
604 >                (CompletableFuture<T> f, Function<? super T,U> a) {
605 >                return f.thenApplyAsync(a);
606 >            }
607 >            public <T,U> CompletableFuture<U> thenCompose
608 >                (CompletableFuture<T> f,
609 >                 Function<? super T,? extends CompletionStage<U>> a) {
610 >                return f.thenComposeAsync(a);
611 >            }
612 >            public <T,U> CompletableFuture<U> handle
613 >                (CompletableFuture<T> f,
614 >                 BiFunction<? super T,Throwable,? extends U> a) {
615 >                return f.handleAsync(a);
616 >            }
617 >            public <T> CompletableFuture<T> whenComplete
618 >                (CompletableFuture<T> f,
619 >                 BiConsumer<? super T,? super Throwable> a) {
620 >                return f.whenCompleteAsync(a);
621 >            }
622 >            public <T,U> CompletableFuture<Void> runAfterBoth
623 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
624 >                return f.runAfterBothAsync(g, a);
625 >            }
626 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
627 >                (CompletableFuture<T> f,
628 >                 CompletionStage<? extends U> g,
629 >                 BiConsumer<? super T,? super U> a) {
630 >                return f.thenAcceptBothAsync(g, a);
631 >            }
632 >            public <T,U,V> CompletableFuture<V> thenCombine
633 >                (CompletableFuture<T> f,
634 >                 CompletionStage<? extends U> g,
635 >                 BiFunction<? super T,? super U,? extends V> a) {
636 >                return f.thenCombineAsync(g, a);
637 >            }
638 >            public <T> CompletableFuture<Void> runAfterEither
639 >                (CompletableFuture<T> f,
640 >                 CompletionStage<?> g,
641 >                 java.lang.Runnable a) {
642 >                return f.runAfterEitherAsync(g, a);
643 >            }
644 >            public <T> CompletableFuture<Void> acceptEither
645 >                (CompletableFuture<T> f,
646 >                 CompletionStage<? extends T> g,
647 >                 Consumer<? super T> a) {
648 >                return f.acceptEitherAsync(g, a);
649 >            }
650 >            public <T,U> CompletableFuture<U> applyToEither
651 >                (CompletableFuture<T> f,
652 >                 CompletionStage<? extends T> g,
653 >                 Function<? super T,U> a) {
654 >                return f.applyToEitherAsync(g, a);
655 >            }
656 >        },
657 >
658 >        EXECUTOR {
659 >            public void checkExecutionMode() {
660 >                assertTrue(ThreadExecutor.startedCurrentThread());
661 >            }
662 >            public CompletableFuture<Void> runAsync(Runnable a) {
663 >                return CompletableFuture.runAsync(a, new ThreadExecutor());
664 >            }
665 >            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
666 >                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
667 >            }
668 >            public <T> CompletableFuture<Void> thenRun
669 >                (CompletableFuture<T> f, Runnable a) {
670 >                return f.thenRunAsync(a, new ThreadExecutor());
671 >            }
672 >            public <T> CompletableFuture<Void> thenAccept
673 >                (CompletableFuture<T> f, Consumer<? super T> a) {
674 >                return f.thenAcceptAsync(a, new ThreadExecutor());
675 >            }
676 >            public <T,U> CompletableFuture<U> thenApply
677 >                (CompletableFuture<T> f, Function<? super T,U> a) {
678 >                return f.thenApplyAsync(a, new ThreadExecutor());
679 >            }
680 >            public <T,U> CompletableFuture<U> thenCompose
681 >                (CompletableFuture<T> f,
682 >                 Function<? super T,? extends CompletionStage<U>> a) {
683 >                return f.thenComposeAsync(a, new ThreadExecutor());
684 >            }
685 >            public <T,U> CompletableFuture<U> handle
686 >                (CompletableFuture<T> f,
687 >                 BiFunction<? super T,Throwable,? extends U> a) {
688 >                return f.handleAsync(a, new ThreadExecutor());
689 >            }
690 >            public <T> CompletableFuture<T> whenComplete
691 >                (CompletableFuture<T> f,
692 >                 BiConsumer<? super T,? super Throwable> a) {
693 >                return f.whenCompleteAsync(a, new ThreadExecutor());
694 >            }
695 >            public <T,U> CompletableFuture<Void> runAfterBoth
696 >                (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a) {
697 >                return f.runAfterBothAsync(g, a, new ThreadExecutor());
698 >            }
699 >            public <T,U> CompletableFuture<Void> thenAcceptBoth
700 >                (CompletableFuture<T> f,
701 >                 CompletionStage<? extends U> g,
702 >                 BiConsumer<? super T,? super U> a) {
703 >                return f.thenAcceptBothAsync(g, a, new ThreadExecutor());
704 >            }
705 >            public <T,U,V> CompletableFuture<V> thenCombine
706 >                (CompletableFuture<T> f,
707 >                 CompletionStage<? extends U> g,
708 >                 BiFunction<? super T,? super U,? extends V> a) {
709 >                return f.thenCombineAsync(g, a, new ThreadExecutor());
710 >            }
711 >            public <T> CompletableFuture<Void> runAfterEither
712 >                (CompletableFuture<T> f,
713 >                 CompletionStage<?> g,
714 >                 java.lang.Runnable a) {
715 >                return f.runAfterEitherAsync(g, a, new ThreadExecutor());
716 >            }
717 >            public <T> CompletableFuture<Void> acceptEither
718 >                (CompletableFuture<T> f,
719 >                 CompletionStage<? extends T> g,
720 >                 Consumer<? super T> a) {
721 >                return f.acceptEitherAsync(g, a, new ThreadExecutor());
722 >            }
723 >            public <T,U> CompletableFuture<U> applyToEither
724 >                (CompletableFuture<T> f,
725 >                 CompletionStage<? extends T> g,
726 >                 Function<? super T,U> a) {
727 >                return f.applyToEitherAsync(g, a, new ThreadExecutor());
728 >            }
729 >        };
730 >
731 >        public abstract void checkExecutionMode();
732 >        public abstract CompletableFuture<Void> runAsync(Runnable a);
733 >        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
734 >        public abstract <T> CompletableFuture<Void> thenRun
735 >            (CompletableFuture<T> f, Runnable a);
736 >        public abstract <T> CompletableFuture<Void> thenAccept
737 >            (CompletableFuture<T> f, Consumer<? super T> a);
738 >        public abstract <T,U> CompletableFuture<U> thenApply
739 >            (CompletableFuture<T> f, Function<? super T,U> a);
740 >        public abstract <T,U> CompletableFuture<U> thenCompose
741 >            (CompletableFuture<T> f,
742 >             Function<? super T,? extends CompletionStage<U>> a);
743 >        public abstract <T,U> CompletableFuture<U> handle
744 >            (CompletableFuture<T> f,
745 >             BiFunction<? super T,Throwable,? extends U> a);
746 >        public abstract <T> CompletableFuture<T> whenComplete
747 >            (CompletableFuture<T> f,
748 >             BiConsumer<? super T,? super Throwable> a);
749 >        public abstract <T,U> CompletableFuture<Void> runAfterBoth
750 >            (CompletableFuture<T> f, CompletableFuture<U> g, Runnable a);
751 >        public abstract <T,U> CompletableFuture<Void> thenAcceptBoth
752 >            (CompletableFuture<T> f,
753 >             CompletionStage<? extends U> g,
754 >             BiConsumer<? super T,? super U> a);
755 >        public abstract <T,U,V> CompletableFuture<V> thenCombine
756 >            (CompletableFuture<T> f,
757 >             CompletionStage<? extends U> g,
758 >             BiFunction<? super T,? super U,? extends V> a);
759 >        public abstract <T> CompletableFuture<Void> runAfterEither
760 >            (CompletableFuture<T> f,
761 >             CompletionStage<?> g,
762 >             java.lang.Runnable a);
763 >        public abstract <T> CompletableFuture<Void> acceptEither
764 >            (CompletableFuture<T> f,
765 >             CompletionStage<? extends T> g,
766 >             Consumer<? super T> a);
767 >        public abstract <T,U> CompletableFuture<U> applyToEither
768 >            (CompletableFuture<T> f,
769 >             CompletionStage<? extends T> g,
770 >             Function<? super T,U> a);
771 >    }
772 >
773 >    /**
774 >     * exceptionally action is not invoked when source completes
775 >     * normally, and source result is propagated
776 >     */
777 >    public void testExceptionally_normalCompletion() {
778 >        for (boolean createIncomplete : new boolean[] { true, false })
779 >        for (Integer v1 : new Integer[] { 1, null })
780 >    {
781 >        final AtomicInteger a = new AtomicInteger(0);
782 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
783 >        if (!createIncomplete) f.complete(v1);
784 >        final CompletableFuture<Integer> g = f.exceptionally
785 >            ((Throwable t) -> {
786 >                // Should not be called
787 >                a.getAndIncrement();
788 >                throw new AssertionError();
789 >            });
790 >        if (createIncomplete) f.complete(v1);
791 >
792 >        checkCompletedNormally(g, v1);
793 >        checkCompletedNormally(f, v1);
794 >        assertEquals(0, a.get());
795 >    }}
796  
797  
798      /**
799       * exceptionally action completes with function value on source
800 <     * exception;  otherwise with source value
800 >     * exception
801       */
802 <    public void testExceptionally() {
803 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
804 <        ExceptionToInteger r = new ExceptionToInteger();
805 <        CompletableFuture<Integer> g = f.exceptionally(r);
806 <        f.completeExceptionally(new CFException());
807 <        checkCompletedNormally(g, three);
808 <
809 <        f = new CompletableFuture<Integer>();
810 <        r = new ExceptionToInteger();
811 <        g = f.exceptionally(r);
812 <        f.complete(one);
813 <        checkCompletedNormally(g, one);
814 <    }
802 >    public void testExceptionally_exceptionalCompletion() {
803 >        for (boolean createIncomplete : new boolean[] { true, false })
804 >        for (Integer v1 : new Integer[] { 1, null })
805 >    {
806 >        final AtomicInteger a = new AtomicInteger(0);
807 >        final CFException ex = new CFException();
808 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
809 >        if (!createIncomplete) f.completeExceptionally(ex);
810 >        final CompletableFuture<Integer> g = f.exceptionally
811 >            ((Throwable t) -> {
812 >                ExecutionMode.DEFAULT.checkExecutionMode();
813 >                threadAssertSame(t, ex);
814 >                a.getAndIncrement();
815 >                return v1;
816 >            });
817 >        if (createIncomplete) f.completeExceptionally(ex);
818 >
819 >        checkCompletedNormally(g, v1);
820 >        assertEquals(1, a.get());
821 >    }}
822 >
823 >    public void testExceptionally_exceptionalCompletionActionFailed() {
824 >        for (boolean createIncomplete : new boolean[] { true, false })
825 >        for (Integer v1 : new Integer[] { 1, null })
826 >    {
827 >        final AtomicInteger a = new AtomicInteger(0);
828 >        final CFException ex1 = new CFException();
829 >        final CFException ex2 = new CFException();
830 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
831 >        if (!createIncomplete) f.completeExceptionally(ex1);
832 >        final CompletableFuture<Integer> g = f.exceptionally
833 >            ((Throwable t) -> {
834 >                ExecutionMode.DEFAULT.checkExecutionMode();
835 >                threadAssertSame(t, ex1);
836 >                a.getAndIncrement();
837 >                throw ex2;
838 >            });
839 >        if (createIncomplete) f.completeExceptionally(ex1);
840 >
841 >        checkCompletedWithWrappedCFException(g, ex2);
842 >        assertEquals(1, a.get());
843 >    }}
844 >
845 >    /**
846 >     * handle action completes normally with function value on normal
847 >     * completion of source
848 >     */
849 >    public void testHandle_normalCompletion() {
850 >        for (ExecutionMode m : ExecutionMode.values())
851 >        for (boolean createIncomplete : new boolean[] { true, false })
852 >        for (Integer v1 : new Integer[] { 1, null })
853 >    {
854 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
855 >        final AtomicInteger a = new AtomicInteger(0);
856 >        if (!createIncomplete) f.complete(v1);
857 >        final CompletableFuture<Integer> g = m.handle
858 >            (f,
859 >             (Integer x, Throwable t) -> {
860 >                m.checkExecutionMode();
861 >                threadAssertSame(x, v1);
862 >                threadAssertNull(t);
863 >                a.getAndIncrement();
864 >                return inc(v1);
865 >            });
866 >        if (createIncomplete) f.complete(v1);
867 >
868 >        checkCompletedNormally(g, inc(v1));
869 >        checkCompletedNormally(f, v1);
870 >        assertEquals(1, a.get());
871 >    }}
872  
873      /**
874 <     * handle action completes normally with function value on either
875 <     * normal or exceptional completion of source
874 >     * handle action completes normally with function value on
875 >     * exceptional completion of source
876       */
877 <    public void testHandle() {
878 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
879 <        IntegerHandler r = new IntegerHandler();
880 <        CompletableFuture<Integer> g = f.handle(r);
881 <        f.completeExceptionally(new CFException());
882 <        checkCompletedNormally(g, three);
877 >    public void testHandle_exceptionalCompletion() {
878 >        for (ExecutionMode m : ExecutionMode.values())
879 >        for (boolean createIncomplete : new boolean[] { true, false })
880 >        for (Integer v1 : new Integer[] { 1, null })
881 >    {
882 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
883 >        final AtomicInteger a = new AtomicInteger(0);
884 >        final CFException ex = new CFException();
885 >        if (!createIncomplete) f.completeExceptionally(ex);
886 >        final CompletableFuture<Integer> g = m.handle
887 >            (f,
888 >             (Integer x, Throwable t) -> {
889 >                m.checkExecutionMode();
890 >                threadAssertNull(x);
891 >                threadAssertSame(t, ex);
892 >                a.getAndIncrement();
893 >                return v1;
894 >            });
895 >        if (createIncomplete) f.completeExceptionally(ex);
896 >
897 >        checkCompletedNormally(g, v1);
898 >        checkCompletedWithWrappedCFException(f, ex);
899 >        assertEquals(1, a.get());
900 >    }}
901 >
902 >    /**
903 >     * handle action completes normally with function value on
904 >     * cancelled source
905 >     */
906 >    public void testHandle_sourceCancelled() {
907 >        for (ExecutionMode m : ExecutionMode.values())
908 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
909 >        for (boolean createIncomplete : new boolean[] { true, false })
910 >        for (Integer v1 : new Integer[] { 1, null })
911 >    {
912 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
913 >        final AtomicInteger a = new AtomicInteger(0);
914 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
915 >        final CompletableFuture<Integer> g = m.handle
916 >            (f,
917 >             (Integer x, Throwable t) -> {
918 >                m.checkExecutionMode();
919 >                threadAssertNull(x);
920 >                threadAssertTrue(t instanceof CancellationException);
921 >                a.getAndIncrement();
922 >                return v1;
923 >            });
924 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
925  
926 <        f = new CompletableFuture<Integer>();
927 <        r = new IntegerHandler();
928 <        g = f.handle(r);
929 <        f.complete(one);
400 <        checkCompletedNormally(g, two);
401 <    }
926 >        checkCompletedNormally(g, v1);
927 >        checkCancelled(f);
928 >        assertEquals(1, a.get());
929 >    }}
930  
931      /**
932 <     * runAsync completes after running Runnable
932 >     * handle result completes exceptionally if action does
933       */
934 <    public void testRunAsync() {
935 <        Noop r = new Noop();
936 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
937 <        assertNull(f.join());
938 <        assertTrue(r.ran);
939 <    }
934 >    public void testHandle_sourceFailedActionFailed() {
935 >        for (ExecutionMode m : ExecutionMode.values())
936 >        for (boolean createIncomplete : new boolean[] { true, false })
937 >    {
938 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
939 >        final AtomicInteger a = new AtomicInteger(0);
940 >        final CFException ex1 = new CFException();
941 >        final CFException ex2 = new CFException();
942 >        if (!createIncomplete) f.completeExceptionally(ex1);
943 >        final CompletableFuture<Integer> g = m.handle
944 >            (f,
945 >             (Integer x, Throwable t) -> {
946 >                m.checkExecutionMode();
947 >                threadAssertNull(x);
948 >                threadAssertSame(ex1, t);
949 >                a.getAndIncrement();
950 >                throw ex2;
951 >            });
952 >        if (createIncomplete) f.completeExceptionally(ex1);
953 >
954 >        checkCompletedWithWrappedCFException(g, ex2);
955 >        checkCompletedWithWrappedCFException(f, ex1);
956 >        assertEquals(1, a.get());
957 >    }}
958 >
959 >    public void testHandle_sourceCompletedNormallyActionFailed() {
960 >        for (ExecutionMode m : ExecutionMode.values())
961 >        for (boolean createIncomplete : new boolean[] { true, false })
962 >        for (Integer v1 : new Integer[] { 1, null })
963 >    {
964 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CFException ex = new CFException();
967 >        if (!createIncomplete) f.complete(v1);
968 >        final CompletableFuture<Integer> g = m.handle
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertSame(x, v1);
973 >                threadAssertNull(t);
974 >                a.getAndIncrement();
975 >                throw ex;
976 >            });
977 >        if (createIncomplete) f.complete(v1);
978 >
979 >        checkCompletedWithWrappedCFException(g, ex);
980 >        checkCompletedNormally(f, v1);
981 >        assertEquals(1, a.get());
982 >    }}
983  
984      /**
985 <     * runAsync with executor completes after running Runnable
985 >     * runAsync completes after running Runnable
986       */
987 <    public void testRunAsync2() {
988 <        Noop r = new Noop();
989 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
987 >    public void testRunAsync_normalCompletion() {
988 >        ExecutionMode[] executionModes = {
989 >            ExecutionMode.ASYNC,
990 >            ExecutionMode.EXECUTOR,
991 >        };
992 >        for (ExecutionMode m : executionModes)
993 >    {
994 >        final Noop r = new Noop(m);
995 >        final CompletableFuture<Void> f = m.runAsync(r);
996          assertNull(f.join());
997 <        assertTrue(r.ran);
998 <    }
997 >        checkCompletedNormally(f, null);
998 >        assertEquals(1, r.invocationCount);
999 >    }}
1000  
1001      /**
1002       * failing runAsync completes exceptionally after running Runnable
1003       */
1004 <    public void testRunAsync3() {
1005 <        FailingNoop r = new FailingNoop();
1006 <        CompletableFuture<Void> f = CompletableFuture.runAsync(r);
1004 >    public void testRunAsync_exceptionalCompletion() {
1005 >        ExecutionMode[] executionModes = {
1006 >            ExecutionMode.ASYNC,
1007 >            ExecutionMode.EXECUTOR,
1008 >        };
1009 >        for (ExecutionMode m : executionModes)
1010 >    {
1011 >        final FailingRunnable r = new FailingRunnable(m);
1012 >        final CompletableFuture<Void> f = m.runAsync(r);
1013          checkCompletedWithWrappedCFException(f);
1014 <        assertTrue(r.ran);
1015 <    }
1014 >        assertEquals(1, r.invocationCount);
1015 >    }}
1016  
1017      /**
1018       * supplyAsync completes with result of supplier
1019       */
1020 <    public void testSupplyAsync() {
1021 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne);
1022 <        assertEquals(f.join(), one);
1023 <    }
1024 <
1025 <    /**
1026 <     * supplyAsync with executor completes with result of supplier
1027 <     */
1028 <    public void testSupplyAsync2() {
1029 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1030 <        assertEquals(f.join(), one);
1031 <    }
1020 >    public void testSupplyAsync_normalCompletion() {
1021 >        ExecutionMode[] executionModes = {
1022 >            ExecutionMode.ASYNC,
1023 >            ExecutionMode.EXECUTOR,
1024 >        };
1025 >        for (ExecutionMode m : executionModes)
1026 >        for (Integer v1 : new Integer[] { 1, null })
1027 >    {
1028 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1029 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1030 >        assertSame(v1, f.join());
1031 >        checkCompletedNormally(f, v1);
1032 >        assertEquals(1, r.invocationCount);
1033 >    }}
1034  
1035      /**
1036       * Failing supplyAsync completes exceptionally
1037       */
1038 <    public void testSupplyAsync3() {
1039 <        FailingSupplier r = new FailingSupplier();
1040 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1038 >    public void testSupplyAsync_exceptionalCompletion() {
1039 >        ExecutionMode[] executionModes = {
1040 >            ExecutionMode.ASYNC,
1041 >            ExecutionMode.EXECUTOR,
1042 >        };
1043 >        for (ExecutionMode m : executionModes)
1044 >    {
1045 >        FailingSupplier r = new FailingSupplier(m);
1046 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1047          checkCompletedWithWrappedCFException(f);
1048 <        assertTrue(r.ran);
1049 <    }
1048 >        assertEquals(1, r.invocationCount);
1049 >    }}
1050  
1051      // seq completion methods
1052  
1053      /**
1054       * thenRun result completes normally after normal completion of source
1055       */
1056 <    public void testThenRun() {
1057 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1058 <        Noop r = new Noop();
1059 <        CompletableFuture<Void> g = f.thenRun(r);
1060 <        f.complete(null);
1061 <        checkCompletedNormally(g, null);
1062 <        // reordered version
1063 <        f = new CompletableFuture<Integer>();
1064 <        f.complete(null);
1065 <        r = new Noop();
1066 <        g = f.thenRun(r);
1056 >    public void testThenRun_normalCompletion() {
1057 >        for (ExecutionMode m : ExecutionMode.values())
1058 >        for (boolean createIncomplete : new boolean[] { true, false })
1059 >        for (Integer v1 : new Integer[] { 1, null })
1060 >    {
1061 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1062 >        final Noop r = new Noop(m);
1063 >        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 >        }
1069 >
1070          checkCompletedNormally(g, null);
1071 <    }
1071 >        checkCompletedNormally(f, v1);
1072 >        assertEquals(1, r.invocationCount);
1073 >    }}
1074  
1075      /**
1076       * thenRun result completes exceptionally after exceptional
1077       * completion of source
1078       */
1079 <    public void testThenRun2() {
1080 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1081 <        Noop r = new Noop();
1082 <        CompletableFuture<Void> g = f.thenRun(r);
1083 <        f.completeExceptionally(new CFException());
1084 <        checkCompletedWithWrappedCFException(g);
1085 <    }
1079 >    public void testThenRun_exceptionalCompletion() {
1080 >        for (ExecutionMode m : ExecutionMode.values())
1081 >        for (boolean createIncomplete : new boolean[] { true, false })
1082 >    {
1083 >        final CFException ex = new CFException();
1084 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1085 >        final Noop r = new Noop(m);
1086 >        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 >        }
1092 >
1093 >        checkCompletedWithWrappedCFException(g, ex);
1094 >        checkCompletedWithWrappedCFException(f, ex);
1095 >        assertEquals(0, r.invocationCount);
1096 >    }}
1097  
1098      /**
1099 <     * thenRun result completes exceptionally if action does
1099 >     * thenRun result completes exceptionally if source cancelled
1100       */
1101 <    public void testThenRun3() {
1102 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1103 <        FailingNoop r = new FailingNoop();
1104 <        CompletableFuture<Void> g = f.thenRun(r);
1105 <        f.complete(null);
1106 <        checkCompletedWithWrappedCFException(g);
1107 <    }
1101 >    public void testThenRun_sourceCancelled() {
1102 >        for (ExecutionMode m : ExecutionMode.values())
1103 >        for (boolean createIncomplete : new boolean[] { true, false })
1104 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1105 >    {
1106 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1107 >        final Noop r = new Noop(m);
1108 >        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 >        }
1114 >
1115 >        checkCompletedWithWrappedCancellationException(g);
1116 >        checkCancelled(f);
1117 >        assertEquals(0, r.invocationCount);
1118 >    }}
1119  
1120      /**
1121 <     * thenRun result completes exceptionally if source cancelled
1121 >     * thenRun result completes exceptionally if action does
1122       */
1123 <    public void testThenRun4() {
1124 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1125 <        Noop r = new Noop();
1126 <        CompletableFuture<Void> g = f.thenRun(r);
1127 <        assertTrue(f.cancel(true));
1128 <        checkCompletedWithWrappedCancellationException(g);
1129 <    }
1123 >    public void testThenRun_actionFailed() {
1124 >        for (ExecutionMode m : ExecutionMode.values())
1125 >        for (boolean createIncomplete : new boolean[] { true, false })
1126 >        for (Integer v1 : new Integer[] { 1, null })
1127 >    {
1128 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1129 >        final FailingRunnable r = new FailingRunnable(m);
1130 >        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 >        }
1136 >
1137 >        checkCompletedWithWrappedCFException(g);
1138 >        checkCompletedNormally(f, v1);
1139 >    }}
1140  
1141      /**
1142       * thenApply result completes normally after normal completion of source
1143       */
1144 <    public void testThenApply() {
1145 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1146 <        CompletableFuture<Integer> g = f.thenApply(inc);
1147 <        f.complete(one);
1148 <        checkCompletedNormally(g, two);
1149 <    }
1144 >    public void testThenApply_normalCompletion() {
1145 >        for (ExecutionMode m : ExecutionMode.values())
1146 >        for (boolean createIncomplete : new boolean[] { true, false })
1147 >        for (Integer v1 : new Integer[] { 1, null })
1148 >    {
1149 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1150 >        final IncFunction r = new IncFunction(m);
1151 >        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 >        }
1157 >
1158 >        checkCompletedNormally(g, inc(v1));
1159 >        checkCompletedNormally(f, v1);
1160 >        assertEquals(1, r.invocationCount);
1161 >    }}
1162  
1163      /**
1164       * thenApply result completes exceptionally after exceptional
1165       * completion of source
1166       */
1167 <    public void testThenApply2() {
1168 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1169 <        CompletableFuture<Integer> g = f.thenApply(inc);
1170 <        f.completeExceptionally(new CFException());
1171 <        checkCompletedWithWrappedCFException(g);
1172 <    }
1167 >    public void testThenApply_exceptionalCompletion() {
1168 >        for (ExecutionMode m : ExecutionMode.values())
1169 >        for (boolean createIncomplete : new boolean[] { true, false })
1170 >    {
1171 >        final CFException ex = new CFException();
1172 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1173 >        final IncFunction r = new IncFunction(m);
1174 >        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 >        }
1180 >
1181 >        checkCompletedWithWrappedCFException(g, ex);
1182 >        checkCompletedWithWrappedCFException(f, ex);
1183 >        assertEquals(0, r.invocationCount);
1184 >    }}
1185  
1186      /**
1187 <     * thenApply result completes exceptionally if action does
1187 >     * thenApply result completes exceptionally if source cancelled
1188       */
1189 <    public void testThenApply3() {
1190 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1191 <        CompletableFuture<Integer> g = f.thenApply(new FailingFunction());
1192 <        f.complete(one);
1193 <        checkCompletedWithWrappedCFException(g);
1194 <    }
1189 >    public void testThenApply_sourceCancelled() {
1190 >        for (ExecutionMode m : ExecutionMode.values())
1191 >        for (boolean createIncomplete : new boolean[] { true, false })
1192 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1193 >    {
1194 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1195 >        final IncFunction r = new IncFunction(m);
1196 >        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 >        }
1202 >
1203 >        checkCompletedWithWrappedCancellationException(g);
1204 >        checkCancelled(f);
1205 >        assertEquals(0, r.invocationCount);
1206 >    }}
1207  
1208      /**
1209 <     * thenApply result completes exceptionally if source cancelled
1209 >     * thenApply result completes exceptionally if action does
1210       */
1211 <    public void testThenApply4() {
1212 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1213 <        CompletableFuture<Integer> g = f.thenApply(inc);
1214 <        assertTrue(f.cancel(true));
1215 <        checkCompletedWithWrappedCancellationException(g);
1216 <    }
1211 >    public void testThenApply_actionFailed() {
1212 >        for (ExecutionMode m : ExecutionMode.values())
1213 >        for (boolean createIncomplete : new boolean[] { true, false })
1214 >        for (Integer v1 : new Integer[] { 1, null })
1215 >    {
1216 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1217 >        final FailingFunction r = new FailingFunction(m);
1218 >        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 >        }
1224 >
1225 >        checkCompletedWithWrappedCFException(g);
1226 >        checkCompletedNormally(f, v1);
1227 >    }}
1228  
1229      /**
1230       * thenAccept result completes normally after normal completion of source
1231       */
1232 <    public void testThenAccept() {
1233 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1234 <        IncAction r = new IncAction();
1235 <        CompletableFuture<Void> g = f.thenAccept(r);
1236 <        f.complete(one);
1232 >    public void testThenAccept_normalCompletion() {
1233 >        for (ExecutionMode m : ExecutionMode.values())
1234 >        for (boolean createIncomplete : new boolean[] { true, false })
1235 >        for (Integer v1 : new Integer[] { 1, null })
1236 >    {
1237 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1238 >        final IncAction r = new IncAction();
1239 >        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 >        }
1245 >
1246          checkCompletedNormally(g, null);
1247 <        assertEquals(r.value, 2);
1248 <    }
1247 >        checkCompletedNormally(f, v1);
1248 >        assertEquals(1, r.invocationCount);
1249 >        assertEquals(inc(v1), r.value);
1250 >    }}
1251  
1252      /**
1253       * thenAccept result completes exceptionally after exceptional
1254       * completion of source
1255       */
1256 <    public void testThenAccept2() {
1257 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1258 <        IncAction r = new IncAction();
1259 <        CompletableFuture<Void> g = f.thenAccept(r);
1260 <        f.completeExceptionally(new CFException());
1261 <        checkCompletedWithWrappedCFException(g);
1262 <    }
1256 >    public void testThenAccept_exceptionalCompletion() {
1257 >        for (ExecutionMode m : ExecutionMode.values())
1258 >        for (boolean createIncomplete : new boolean[] { true, false })
1259 >    {
1260 >        final CFException ex = new CFException();
1261 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1262 >        final IncAction r = new IncAction();
1263 >        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 >        }
1269 >
1270 >        checkCompletedWithWrappedCFException(g, ex);
1271 >        checkCompletedWithWrappedCFException(f, ex);
1272 >        assertEquals(0, r.invocationCount);
1273 >    }}
1274  
1275      /**
1276       * thenAccept result completes exceptionally if action does
1277       */
1278 <    public void testThenAccept3() {
1279 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1280 <        FailingConsumer r = new FailingConsumer();
1281 <        CompletableFuture<Void> g = f.thenAccept(r);
1282 <        f.complete(one);
1278 >    public void testThenAccept_actionFailed() {
1279 >        for (ExecutionMode m : ExecutionMode.values())
1280 >        for (boolean createIncomplete : new boolean[] { true, false })
1281 >        for (Integer v1 : new Integer[] { 1, null })
1282 >    {
1283 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1284 >        final FailingConsumer r = new FailingConsumer(m);
1285 >        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 >        }
1291 >
1292          checkCompletedWithWrappedCFException(g);
1293 <        assertTrue(r.ran);
1294 <    }
1293 >        checkCompletedNormally(f, v1);
1294 >    }}
1295  
1296      /**
1297       * thenAccept result completes exceptionally if source cancelled
1298       */
1299 <    public void testThenAccept4() {
1300 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1301 <        IncAction r = new IncAction();
1302 <        CompletableFuture<Void> g = f.thenAccept(r);
1303 <        assertTrue(f.cancel(true));
1304 <        checkCompletedWithWrappedCancellationException(g);
1305 <    }
1299 >    public void testThenAccept_sourceCancelled() {
1300 >        for (ExecutionMode m : ExecutionMode.values())
1301 >        for (boolean createIncomplete : new boolean[] { true, false })
1302 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1303 >    {
1304 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1305 >        final IncAction r = new IncAction();
1306 >        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 >        }
1312  
1313 +        checkCompletedWithWrappedCancellationException(g);
1314 +        checkCancelled(f);
1315 +        assertEquals(0, r.invocationCount);
1316 +    }}
1317  
1318      /**
1319 <     * thenCombine result completes normally after normal completion of sources
1319 >     * thenCombine result completes normally after normal completion
1320 >     * of sources
1321       */
1322 <    public void testThenCombine() {
1323 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1324 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1325 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1326 <        f.complete(one);
1327 <        checkIncomplete(g);
1328 <        f2.complete(two);
1329 <        checkCompletedNormally(g, three);
1330 <
1331 <        f = new CompletableFuture<Integer>();
1332 <        f.complete(one);
1333 <        f2 = new CompletableFuture<Integer>();
1334 <        g = f.thenCombine(f2, add);
1335 <        checkIncomplete(g);
1336 <        f2.complete(two);
1337 <        checkCompletedNormally(g, three);
1338 <    }
1322 >    public void testThenCombine_normalCompletion() {
1323 >        for (ExecutionMode m : ExecutionMode.values())
1324 >        for (boolean createIncomplete : new boolean[] { true, false })
1325 >        for (boolean fFirst : new boolean[] { true, false })
1326 >        for (Integer v1 : new Integer[] { 1, null })
1327 >        for (Integer v2 : new Integer[] { 2, null })
1328 >    {
1329 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1330 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1331 >        final SubtractFunction r = new SubtractFunction(m);
1332 >
1333 >        if (fFirst) f.complete(v1); else g.complete(v2);
1334 >        if (!createIncomplete)
1335 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1336 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1337 >        if (createIncomplete) {
1338 >            checkIncomplete(h);
1339 >            assertEquals(0, r.invocationCount);
1340 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1341 >        }
1342 >
1343 >        checkCompletedNormally(h, subtract(v1, v2));
1344 >        checkCompletedNormally(f, v1);
1345 >        checkCompletedNormally(g, v2);
1346 >        assertEquals(1, r.invocationCount);
1347 >    }}
1348  
1349      /**
1350       * thenCombine result completes exceptionally after exceptional
1351       * completion of either source
1352       */
1353 <    public void testThenCombine2() {
1354 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1355 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1356 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1357 <        f.completeExceptionally(new CFException());
1358 <        f2.complete(two);
1359 <        checkCompletedWithWrappedCFException(g);
1360 <
1361 <        f = new CompletableFuture<Integer>();
1362 <        f.complete(one);
1363 <        f2 = new CompletableFuture<Integer>();
1364 <        g = f.thenCombine(f2, add);
1365 <        f2.completeExceptionally(new CFException());
1366 <        checkCompletedWithWrappedCFException(g);
1367 <    }
1353 >    public void testThenCombine_exceptionalCompletion() {
1354 >        for (ExecutionMode m : ExecutionMode.values())
1355 >        for (boolean createIncomplete : new boolean[] { true, false })
1356 >        for (boolean fFirst : new boolean[] { true, false })
1357 >        for (Integer v1 : new Integer[] { 1, null })
1358 >    {
1359 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1360 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1361 >        final CFException ex = new CFException();
1362 >        final SubtractFunction r = new SubtractFunction(m);
1363 >
1364 >        (fFirst ? f : g).complete(v1);
1365 >        if (!createIncomplete)
1366 >            (!fFirst ? f : g).completeExceptionally(ex);
1367 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1368 >        if (createIncomplete) {
1369 >            checkIncomplete(h);
1370 >            (!fFirst ? f : g).completeExceptionally(ex);
1371 >        }
1372 >
1373 >        checkCompletedWithWrappedCFException(h, ex);
1374 >        assertEquals(0, r.invocationCount);
1375 >        checkCompletedNormally(fFirst ? f : g, v1);
1376 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1377 >    }}
1378  
1379      /**
1380       * thenCombine result completes exceptionally if action does
1381       */
1382 <    public void testThenCombine3() {
1383 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1384 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1385 <        FailingBiFunction r = new FailingBiFunction();
1386 <        CompletableFuture<Integer> g = f.thenCombine(f2, r);
1387 <        f.complete(one);
1388 <        checkIncomplete(g);
1389 <        f2.complete(two);
1390 <        checkCompletedWithWrappedCFException(g);
1391 <    }
1382 >    public void testThenCombine_actionFailed() {
1383 >        for (ExecutionMode m : ExecutionMode.values())
1384 >        for (boolean fFirst : new boolean[] { true, false })
1385 >        for (Integer v1 : new Integer[] { 1, null })
1386 >        for (Integer v2 : new Integer[] { 2, null })
1387 >    {
1388 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1390 >        final FailingBiFunction r = new FailingBiFunction(m);
1391 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1392 >
1393 >        if (fFirst) {
1394 >            f.complete(v1);
1395 >            g.complete(v2);
1396 >        } else {
1397 >            g.complete(v2);
1398 >            f.complete(v1);
1399 >        }
1400 >
1401 >        checkCompletedWithWrappedCFException(h);
1402 >        checkCompletedNormally(f, v1);
1403 >        checkCompletedNormally(g, v2);
1404 >    }}
1405  
1406      /**
1407       * thenCombine result completes exceptionally if either source cancelled
1408       */
1409 <    public void testThenCombine4() {
1410 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1411 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1412 <        CompletableFuture<Integer> g = f.thenCombine(f2, add);
1413 <        assertTrue(f.cancel(true));
1414 <        f2.complete(two);
1415 <        checkCompletedWithWrappedCancellationException(g);
1416 <        f = new CompletableFuture<Integer>();
1417 <        f2 = new CompletableFuture<Integer>();
1418 <        g = f.thenCombine(f2, add);
1419 <        f.complete(one);
1420 <        assertTrue(f2.cancel(true));
1421 <        checkCompletedWithWrappedCancellationException(g);
1422 <    }
1409 >    public void testThenCombine_sourceCancelled() {
1410 >        for (ExecutionMode m : ExecutionMode.values())
1411 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1412 >        for (boolean createIncomplete : new boolean[] { true, false })
1413 >        for (boolean fFirst : new boolean[] { true, false })
1414 >        for (Integer v1 : new Integer[] { 1, null })
1415 >    {
1416 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1417 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1418 >        final SubtractFunction r = new SubtractFunction(m);
1419 >
1420 >        (fFirst ? f : g).complete(v1);
1421 >        if (!createIncomplete)
1422 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1423 >        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1424 >        if (createIncomplete) {
1425 >            checkIncomplete(h);
1426 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1427 >        }
1428 >
1429 >        checkCompletedWithWrappedCancellationException(h);
1430 >        checkCancelled(!fFirst ? f : g);
1431 >        assertEquals(0, r.invocationCount);
1432 >        checkCompletedNormally(fFirst ? f : g, v1);
1433 >    }}
1434  
1435      /**
1436       * thenAcceptBoth result completes normally after normal
1437       * completion of sources
1438       */
1439 <    public void testThenAcceptBoth() {
1440 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1441 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1442 <        AddAction r = new AddAction();
1443 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1444 <        f.complete(one);
1445 <        checkIncomplete(g);
1446 <        f2.complete(two);
1447 <        checkCompletedNormally(g, null);
1448 <        assertEquals(r.value, 3);
1449 <
1450 <        r = new AddAction();
1451 <        f = new CompletableFuture<Integer>();
1452 <        f.complete(one);
1453 <        f2 = new CompletableFuture<Integer>();
1454 <        g = f.thenAcceptBoth(f2, r);
1455 <        checkIncomplete(g);
1456 <        f2.complete(two);
1457 <        checkCompletedNormally(g, null);
1458 <        assertEquals(r.value, 3);
1459 <    }
1439 >    public void testThenAcceptBoth_normalCompletion() {
1440 >        for (ExecutionMode m : ExecutionMode.values())
1441 >        for (boolean createIncomplete : new boolean[] { true, false })
1442 >        for (boolean fFirst : new boolean[] { true, false })
1443 >        for (Integer v1 : new Integer[] { 1, null })
1444 >        for (Integer v2 : new Integer[] { 2, null })
1445 >    {
1446 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1448 >        final SubtractAction r = new SubtractAction(m);
1449 >
1450 >        if (fFirst) f.complete(v1); else g.complete(v2);
1451 >        if (!createIncomplete)
1452 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1453 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1454 >        if (createIncomplete) {
1455 >            checkIncomplete(h);
1456 >            assertEquals(0, r.invocationCount);
1457 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1458 >        }
1459 >
1460 >        checkCompletedNormally(h, null);
1461 >        assertEquals(subtract(v1, v2), r.value);
1462 >        checkCompletedNormally(f, v1);
1463 >        checkCompletedNormally(g, v2);
1464 >    }}
1465  
1466      /**
1467       * thenAcceptBoth result completes exceptionally after exceptional
1468       * completion of either source
1469       */
1470 <    public void testThenAcceptBoth2() {
1471 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1472 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1473 <        AddAction r = new AddAction();
1474 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1475 <        f.completeExceptionally(new CFException());
1476 <        f2.complete(two);
1477 <        checkCompletedWithWrappedCFException(g);
1478 <
1479 <        r = new AddAction();
1480 <        f = new CompletableFuture<Integer>();
1481 <        f.complete(one);
1482 <        f2 = new CompletableFuture<Integer>();
1483 <        g = f.thenAcceptBoth(f2, r);
1484 <        f2.completeExceptionally(new CFException());
1485 <        checkCompletedWithWrappedCFException(g);
1486 <    }
1470 >    public void testThenAcceptBoth_exceptionalCompletion() {
1471 >        for (ExecutionMode m : ExecutionMode.values())
1472 >        for (boolean createIncomplete : new boolean[] { true, false })
1473 >        for (boolean fFirst : new boolean[] { true, false })
1474 >        for (Integer v1 : new Integer[] { 1, null })
1475 >    {
1476 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1477 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1478 >        final CFException ex = new CFException();
1479 >        final SubtractAction r = new SubtractAction(m);
1480 >
1481 >        (fFirst ? f : g).complete(v1);
1482 >        if (!createIncomplete)
1483 >            (!fFirst ? f : g).completeExceptionally(ex);
1484 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1485 >        if (createIncomplete) {
1486 >            checkIncomplete(h);
1487 >            (!fFirst ? f : g).completeExceptionally(ex);
1488 >        }
1489 >
1490 >        checkCompletedWithWrappedCFException(h, ex);
1491 >        assertEquals(0, r.invocationCount);
1492 >        checkCompletedNormally(fFirst ? f : g, v1);
1493 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1494 >    }}
1495  
1496      /**
1497       * thenAcceptBoth result completes exceptionally if action does
1498       */
1499 <    public void testThenAcceptBoth3() {
1500 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1501 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1502 <        FailingBiConsumer r = new FailingBiConsumer();
1503 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1504 <        f.complete(one);
1505 <        checkIncomplete(g);
1506 <        f2.complete(two);
1507 <        checkCompletedWithWrappedCFException(g);
1508 <    }
1499 >    public void testThenAcceptBoth_actionFailed() {
1500 >        for (ExecutionMode m : ExecutionMode.values())
1501 >        for (boolean fFirst : new boolean[] { true, false })
1502 >        for (Integer v1 : new Integer[] { 1, null })
1503 >        for (Integer v2 : new Integer[] { 2, null })
1504 >    {
1505 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1506 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1507 >        final FailingBiConsumer r = new FailingBiConsumer(m);
1508 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 >
1510 >        if (fFirst) {
1511 >            f.complete(v1);
1512 >            g.complete(v2);
1513 >        } else {
1514 >            g.complete(v2);
1515 >            f.complete(v1);
1516 >        }
1517 >
1518 >        checkCompletedWithWrappedCFException(h);
1519 >        checkCompletedNormally(f, v1);
1520 >        checkCompletedNormally(g, v2);
1521 >    }}
1522  
1523      /**
1524       * thenAcceptBoth result completes exceptionally if either source cancelled
1525       */
1526 <    public void testThenAcceptBoth4() {
1527 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1528 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1529 <        AddAction r = new AddAction();
1530 <        CompletableFuture<Void> g = f.thenAcceptBoth(f2, r);
1531 <        assertTrue(f.cancel(true));
1532 <        f2.complete(two);
1533 <        checkCompletedWithWrappedCancellationException(g);
1534 <        f = new CompletableFuture<Integer>();
1535 <        f2 = new CompletableFuture<Integer>();
1536 <        r = new AddAction();
1537 <        g = f.thenAcceptBoth(f2, r);
1538 <        f.complete(one);
1539 <        assertTrue(f2.cancel(true));
1540 <        checkCompletedWithWrappedCancellationException(g);
1541 <    }
1526 >    public void testThenAcceptBoth_sourceCancelled() {
1527 >        for (ExecutionMode m : ExecutionMode.values())
1528 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1529 >        for (boolean createIncomplete : new boolean[] { true, false })
1530 >        for (boolean fFirst : new boolean[] { true, false })
1531 >        for (Integer v1 : new Integer[] { 1, null })
1532 >    {
1533 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1534 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1535 >        final SubtractAction r = new SubtractAction(m);
1536 >
1537 >        (fFirst ? f : g).complete(v1);
1538 >        if (!createIncomplete)
1539 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1540 >        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1541 >        if (createIncomplete) {
1542 >            checkIncomplete(h);
1543 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1544 >        }
1545 >
1546 >        checkCompletedWithWrappedCancellationException(h);
1547 >        checkCancelled(!fFirst ? f : g);
1548 >        assertEquals(0, r.invocationCount);
1549 >        checkCompletedNormally(fFirst ? f : g, v1);
1550 >    }}
1551  
1552      /**
1553       * runAfterBoth result completes normally after normal
1554       * completion of sources
1555       */
1556 <    public void testRunAfterBoth() {
1557 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1558 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1559 <        Noop r = new Noop();
1560 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1561 <        f.complete(one);
1562 <        checkIncomplete(g);
1563 <        f2.complete(two);
1564 <        checkCompletedNormally(g, null);
1565 <        assertTrue(r.ran);
1566 <
1567 <        r = new Noop();
1568 <        f = new CompletableFuture<Integer>();
1569 <        f.complete(one);
1570 <        f2 = new CompletableFuture<Integer>();
1571 <        g = f.runAfterBoth(f2, r);
1572 <        checkIncomplete(g);
1573 <        f2.complete(two);
1574 <        checkCompletedNormally(g, null);
1575 <        assertTrue(r.ran);
1576 <    }
1556 >    public void testRunAfterBoth_normalCompletion() {
1557 >        for (ExecutionMode m : ExecutionMode.values())
1558 >        for (boolean createIncomplete : new boolean[] { true, false })
1559 >        for (boolean fFirst : new boolean[] { true, false })
1560 >        for (Integer v1 : new Integer[] { 1, null })
1561 >        for (Integer v2 : new Integer[] { 2, null })
1562 >    {
1563 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1564 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1565 >        final Noop r = new Noop(m);
1566 >
1567 >        if (fFirst) f.complete(v1); else g.complete(v2);
1568 >        if (!createIncomplete)
1569 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1570 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1571 >        if (createIncomplete) {
1572 >            checkIncomplete(h);
1573 >            assertEquals(0, r.invocationCount);
1574 >            if (!fFirst) f.complete(v1); else g.complete(v2);
1575 >        }
1576 >
1577 >        checkCompletedNormally(h, null);
1578 >        assertEquals(1, r.invocationCount);
1579 >        checkCompletedNormally(f, v1);
1580 >        checkCompletedNormally(g, v2);
1581 >    }}
1582  
1583      /**
1584       * runAfterBoth result completes exceptionally after exceptional
1585       * completion of either source
1586       */
1587 <    public void testRunAfterBoth2() {
1588 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1589 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1590 <        Noop r = new Noop();
1591 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1592 <        f.completeExceptionally(new CFException());
1593 <        f2.complete(two);
1594 <        checkCompletedWithWrappedCFException(g);
1595 <
1596 <        r = new Noop();
1597 <        f = new CompletableFuture<Integer>();
1598 <        f.complete(one);
1599 <        f2 = new CompletableFuture<Integer>();
1600 <        g = f.runAfterBoth(f2, r);
1601 <        f2.completeExceptionally(new CFException());
1602 <        checkCompletedWithWrappedCFException(g);
1603 <    }
1587 >    public void testRunAfterBoth_exceptionalCompletion() {
1588 >        for (ExecutionMode m : ExecutionMode.values())
1589 >        for (boolean createIncomplete : new boolean[] { true, false })
1590 >        for (boolean fFirst : new boolean[] { true, false })
1591 >        for (Integer v1 : new Integer[] { 1, null })
1592 >    {
1593 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1594 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1595 >        final CFException ex = new CFException();
1596 >        final Noop r = new Noop(m);
1597 >
1598 >        (fFirst ? f : g).complete(v1);
1599 >        if (!createIncomplete)
1600 >            (!fFirst ? f : g).completeExceptionally(ex);
1601 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1602 >        if (createIncomplete) {
1603 >            checkIncomplete(h);
1604 >            (!fFirst ? f : g).completeExceptionally(ex);
1605 >        }
1606 >
1607 >        checkCompletedWithWrappedCFException(h, ex);
1608 >        assertEquals(0, r.invocationCount);
1609 >        checkCompletedNormally(fFirst ? f : g, v1);
1610 >        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1611 >    }}
1612  
1613      /**
1614       * runAfterBoth result completes exceptionally if action does
1615       */
1616 <    public void testRunAfterBoth3() {
1617 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1618 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1619 <        FailingNoop r = new FailingNoop();
1620 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1621 <        f.complete(one);
1622 <        checkIncomplete(g);
1623 <        f2.complete(two);
1624 <        checkCompletedWithWrappedCFException(g);
1625 <    }
1616 >    public void testRunAfterBoth_actionFailed() {
1617 >        for (ExecutionMode m : ExecutionMode.values())
1618 >        for (boolean fFirst : new boolean[] { true, false })
1619 >        for (Integer v1 : new Integer[] { 1, null })
1620 >        for (Integer v2 : new Integer[] { 2, null })
1621 >    {
1622 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 >        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);
1640 >    }}
1641  
1642      /**
1643       * runAfterBoth result completes exceptionally if either source cancelled
1644       */
1645 <    public void testRunAfterBoth4() {
1646 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1647 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1648 <        Noop r = new Noop();
1649 <        CompletableFuture<Void> g = f.runAfterBoth(f2, r);
1650 <        assertTrue(f.cancel(true));
1651 <        f2.complete(two);
1652 <        checkCompletedWithWrappedCancellationException(g);
1653 <        f = new CompletableFuture<Integer>();
1654 <        f2 = new CompletableFuture<Integer>();
1655 <        r = new Noop();
1656 <        g = f.runAfterBoth(f2, r);
1657 <        f.complete(one);
1658 <        assertTrue(f2.cancel(true));
1659 <        checkCompletedWithWrappedCancellationException(g);
1660 <    }
1645 >    public void testRunAfterBoth_sourceCancelled() {
1646 >        for (ExecutionMode m : ExecutionMode.values())
1647 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1648 >        for (boolean createIncomplete : new boolean[] { true, false })
1649 >        for (boolean fFirst : new boolean[] { true, false })
1650 >        for (Integer v1 : new Integer[] { 1, null })
1651 >    {
1652 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1653 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1654 >        final Noop r = new Noop(m);
1655 >
1656 >
1657 >        (fFirst ? f : g).complete(v1);
1658 >        if (!createIncomplete)
1659 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1660 >        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1661 >        if (createIncomplete) {
1662 >            checkIncomplete(h);
1663 >            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1664 >        }
1665 >
1666 >        checkCompletedWithWrappedCancellationException(h);
1667 >        checkCancelled(!fFirst ? f : g);
1668 >        assertEquals(0, r.invocationCount);
1669 >        checkCompletedNormally(fFirst ? f : g, v1);
1670 >    }}
1671  
1672      /**
1673       * applyToEither result completes normally after normal completion
1674       * of either source
1675       */
1676 <    public void testApplyToEither() {
1677 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1678 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1679 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1680 <        f.complete(one);
1681 <        checkCompletedNormally(g, two);
1682 <        f2.complete(one);
1683 <        checkCompletedNormally(g, two);
1684 <
1685 <        f = new CompletableFuture<Integer>();
1686 <        f.complete(one);
1687 <        f2 = new CompletableFuture<Integer>();
1688 <        g = f.applyToEither(f2, inc);
1689 <        checkCompletedNormally(g, two);
1690 <    }
1676 >    public void testApplyToEither_normalCompletion() {
1677 >        for (ExecutionMode m : ExecutionMode.values())
1678 >        for (boolean createIncomplete : new boolean[] { true, false })
1679 >        for (boolean fFirst : new boolean[] { true, false })
1680 >        for (Integer v1 : new Integer[] { 1, null })
1681 >        for (Integer v2 : new Integer[] { 2, null })
1682 >    {
1683 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1684 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1685 >        final IncFunction r = new IncFunction(m);
1686 >
1687 >        if (!createIncomplete)
1688 >            if (fFirst) f.complete(v1); else g.complete(v2);
1689 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1690 >        if (createIncomplete) {
1691 >            checkIncomplete(h);
1692 >            assertEquals(0, r.invocationCount);
1693 >            if (fFirst) f.complete(v1); else g.complete(v2);
1694 >        }
1695 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1696 >        if (!fFirst) f.complete(v1); else g.complete(v2);
1697 >
1698 >        checkCompletedNormally(f, v1);
1699 >        checkCompletedNormally(g, v2);
1700 >        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1701 >    }}
1702 >
1703 >    public void testApplyToEither_normalCompletionBothAvailable() {
1704 >        for (ExecutionMode m : ExecutionMode.values())
1705 >        for (boolean fFirst : new boolean[] { true, false })
1706 >        for (Integer v1 : new Integer[] { 1, null })
1707 >        for (Integer v2 : new Integer[] { 2, null })
1708 >    {
1709 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1710 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1711 >        final IncFunction r = new IncFunction(m);
1712 >
1713 >        if (fFirst) {
1714 >            f.complete(v1);
1715 >            g.complete(v2);
1716 >        } else {
1717 >            g.complete(v2);
1718 >            f.complete(v1);
1719 >        }
1720 >
1721 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1722 >
1723 >        checkCompletedNormally(f, v1);
1724 >        checkCompletedNormally(g, v2);
1725 >
1726 >        // unspecified behavior
1727 >        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1728 >                   Objects.equals(h.join(), inc(v2)));
1729 >        assertEquals(1, r.invocationCount);
1730 >    }}
1731  
1732      /**
1733       * applyToEither result completes exceptionally after exceptional
1734       * completion of either source
1735       */
1736 <    public void testApplyToEither2() {
1737 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1738 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1739 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
1740 <        f.completeExceptionally(new CFException());
1741 <        f2.complete(one);
1742 <        checkCompletedWithWrappedCFException(g);
1736 >    public void testApplyToEither_exceptionalCompletion1() {
1737 >        for (ExecutionMode m : ExecutionMode.values())
1738 >        for (boolean createIncomplete : new boolean[] { true, false })
1739 >        for (boolean fFirst : new boolean[] { true, false })
1740 >        for (Integer v1 : new Integer[] { 1, null })
1741 >    {
1742 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1743 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1744 >        final CFException ex = new CFException();
1745 >        final IncFunction r = new IncFunction(m);
1746 >
1747 >        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1748 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1749 >        if (createIncomplete) {
1750 >            checkIncomplete(h);
1751 >            assertEquals(0, r.invocationCount);
1752 >            (fFirst ? f : g).completeExceptionally(ex);
1753 >        }
1754 >
1755 >        checkCompletedWithWrappedCFException(h, ex);
1756 >        (!fFirst ? f : g).complete(v1);
1757 >
1758 >        assertEquals(0, r.invocationCount);
1759 >        checkCompletedNormally(!fFirst ? f : g, v1);
1760 >        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1761 >        checkCompletedWithWrappedCFException(h, ex);
1762 >    }}
1763 >
1764 >    public void testApplyToEither_exceptionalCompletion2() {
1765 >        for (ExecutionMode m : ExecutionMode.values())
1766 >        for (boolean reverseArgs : new boolean[] { true, false })
1767 >        for (boolean fFirst : new boolean[] { true, false })
1768 >        for (Integer v1 : new Integer[] { 1, null })
1769 >    {
1770 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1771 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1772 >        final IncFunction r1 = new IncFunction(m);
1773 >        final IncFunction r2 = new IncFunction(m);
1774 >        final CFException ex = new CFException();
1775 >        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1776 >        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1777 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1778 >        if (fFirst) {
1779 >            f.complete(v1);
1780 >            g.completeExceptionally(ex);
1781 >        } else {
1782 >            g.completeExceptionally(ex);
1783 >            f.complete(v1);
1784 >        }
1785 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1786  
1787 <        f = new CompletableFuture<Integer>();
1788 <        f2 = new CompletableFuture<Integer>();
1789 <        f2.completeExceptionally(new CFException());
1790 <        g = f.applyToEither(f2, inc);
1791 <        checkCompletedWithWrappedCFException(g);
1792 <    }
1787 >        // unspecified behavior
1788 >        try {
1789 >            assertEquals(inc(v1), h1.join());
1790 >            assertEquals(1, r1.invocationCount);
1791 >        } catch (CompletionException ok) {
1792 >            checkCompletedWithWrappedCFException(h1, ex);
1793 >            assertEquals(0, r1.invocationCount);
1794 >        }
1795  
1796 <    /**
1797 <     * applyToEither result completes exceptionally if action does
1798 <     */
1799 <    public void testApplyToEither3() {
1800 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1801 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1802 <        FailingFunction r = new FailingFunction();
884 <        CompletableFuture<Integer> g = f.applyToEither(f2, r);
885 <        f2.complete(two);
886 <        checkCompletedWithWrappedCFException(g);
887 <    }
1796 >        try {
1797 >            assertEquals(inc(v1), h2.join());
1798 >            assertEquals(1, r2.invocationCount);
1799 >        } catch (CompletionException ok) {
1800 >            checkCompletedWithWrappedCFException(h2, ex);
1801 >            assertEquals(0, r2.invocationCount);
1802 >        }
1803  
1804 <    /**
1805 <     * applyToEither result completes exceptionally if either source cancelled
1806 <     */
892 <    public void testApplyToEither4() {
893 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
894 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
895 <        CompletableFuture<Integer> g = f.applyToEither(f2, inc);
896 <        assertTrue(f.cancel(true));
897 <        checkCompletedWithWrappedCancellationException(g);
898 <        f = new CompletableFuture<Integer>();
899 <        f2 = new CompletableFuture<Integer>();
900 <        assertTrue(f2.cancel(true));
901 <        checkCompletedWithWrappedCancellationException(g);
902 <    }
1804 >        checkCompletedWithWrappedCFException(g, ex);
1805 >        checkCompletedNormally(f, v1);
1806 >    }}
1807  
1808      /**
1809 <     * acceptEither result completes normally after normal completion
906 <     * of either source
1809 >     * applyToEither result completes exceptionally if action does
1810       */
1811 <    public void testAcceptEither() {
1812 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1813 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1814 <        IncAction r = new IncAction();
1815 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1816 <        f.complete(one);
1817 <        checkCompletedNormally(g, null);
1818 <        f2.complete(one);
1819 <        checkCompletedNormally(g, null);
1820 <        assertEquals(r.value, 2);
1821 <
1822 <        r = new IncAction();
1823 <        f = new CompletableFuture<Integer>();
1824 <        f.complete(one);
1825 <        f2 = new CompletableFuture<Integer>();
1826 <        g = f.acceptEither(f2, r);
1827 <        checkCompletedNormally(g, null);
1828 <        assertEquals(r.value, 2);
1829 <    }
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);
1841 >        checkCompletedNormally(f, v1);
1842 >        checkCompletedNormally(g, v2);
1843 >    }}
1844  
1845      /**
1846 <     * acceptEither result completes exceptionally after exceptional
930 <     * completion of either source
1846 >     * applyToEither result completes exceptionally if either source cancelled
1847       */
1848 <    public void testAcceptEither2() {
1849 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1850 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1851 <        IncAction r = new IncAction();
1852 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
1853 <        f.completeExceptionally(new CFException());
1854 <        f2.complete(one);
1855 <        checkCompletedWithWrappedCFException(g);
1856 <
1857 <        r = new IncAction();
1858 <        f = new CompletableFuture<Integer>();
1859 <        f2 = new CompletableFuture<Integer>();
1860 <        f2.completeExceptionally(new CFException());
1861 <        g = f.acceptEither(f2, r);
1862 <        checkCompletedWithWrappedCFException(g);
1863 <    }
1848 >    public void testApplyToEither_sourceCancelled1() {
1849 >        for (ExecutionMode m : ExecutionMode.values())
1850 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851 >        for (boolean createIncomplete : new boolean[] { true, false })
1852 >        for (boolean fFirst : new boolean[] { true, false })
1853 >        for (Integer v1 : new Integer[] { 1, null })
1854 >    {
1855 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1856 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 >        final IncFunction r = new IncFunction(m);
1858 >
1859 >        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1860 >        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1861 >        if (createIncomplete) {
1862 >            checkIncomplete(h);
1863 >            assertEquals(0, r.invocationCount);
1864 >            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1865 >        }
1866 >
1867 >        checkCompletedWithWrappedCancellationException(h);
1868 >        (!fFirst ? f : g).complete(v1);
1869 >
1870 >        assertEquals(0, r.invocationCount);
1871 >        checkCompletedNormally(!fFirst ? f : g, v1);
1872 >        checkCancelled(fFirst ? f : g);
1873 >        checkCompletedWithWrappedCancellationException(h);
1874 >    }}
1875 >
1876 >    public void testApplyToEither_sourceCancelled2() {
1877 >        for (ExecutionMode m : ExecutionMode.values())
1878 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879 >        for (boolean reverseArgs : new boolean[] { true, false })
1880 >        for (boolean fFirst : new boolean[] { true, false })
1881 >        for (Integer v1 : new Integer[] { 1, null })
1882 >    {
1883 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1884 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1885 >        final IncFunction r1 = new IncFunction(m);
1886 >        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);
1890 >
1891 >        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1892 >        if (fFirst) {
1893 >            f.complete(v1);
1894 >            assertTrue(g.cancel(mayInterruptIfRunning));
1895 >        } else {
1896 >            assertTrue(g.cancel(mayInterruptIfRunning));
1897 >            f.complete(v1);
1898 >        }
1899 >        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1900  
1901 <    /**
1902 <     * acceptEither result completes exceptionally if action does
1903 <     */
1904 <    public void testAcceptEither3() {
1905 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1906 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1907 <        FailingConsumer r = new FailingConsumer();
1908 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
957 <        f2.complete(two);
958 <        checkCompletedWithWrappedCFException(g);
959 <    }
1901 >        // unspecified behavior
1902 >        try {
1903 >            assertEquals(inc(v1), h1.join());
1904 >            assertEquals(1, r1.invocationCount);
1905 >        } catch (CompletionException ok) {
1906 >            checkCompletedWithWrappedCancellationException(h1);
1907 >            assertEquals(0, r1.invocationCount);
1908 >        }
1909  
1910 <    /**
1911 <     * acceptEither result completes exceptionally if either source cancelled
1912 <     */
1913 <    public void testAcceptEither4() {
1914 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1915 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1916 <        IncAction r = new IncAction();
968 <        CompletableFuture<Void> g = f.acceptEither(f2, r);
969 <        assertTrue(f.cancel(true));
970 <        checkCompletedWithWrappedCancellationException(g);
971 <        f = new CompletableFuture<Integer>();
972 <        f2 = new CompletableFuture<Integer>();
973 <        assertTrue(f2.cancel(true));
974 <        checkCompletedWithWrappedCancellationException(g);
975 <    }
1910 >        try {
1911 >            assertEquals(inc(v1), h2.join());
1912 >            assertEquals(1, r2.invocationCount);
1913 >        } catch (CompletionException ok) {
1914 >            checkCompletedWithWrappedCancellationException(h2);
1915 >            assertEquals(0, r2.invocationCount);
1916 >        }
1917  
1918 +        checkCancelled(g);
1919 +        checkCompletedNormally(f, v1);
1920 +    }}
1921  
1922      /**
1923 <     * runAfterEither result completes normally after normal completion
1923 >     * acceptEither result completes normally after normal completion
1924       * of either source
1925       */
1926 <    public void testRunAfterEither() {
1927 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1928 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1929 <        Noop r = new Noop();
1930 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1931 <        f.complete(one);
1932 <        checkCompletedNormally(g, null);
1933 <        f2.complete(one);
1934 <        checkCompletedNormally(g, null);
1935 <        assertTrue(r.ran);
1936 <
1937 <        r = new Noop();
1938 <        f = new CompletableFuture<Integer>();
1939 <        f.complete(one);
1940 <        f2 = new CompletableFuture<Integer>();
1941 <        g = f.runAfterEither(f2, r);
1942 <        checkCompletedNormally(g, null);
1943 <        assertTrue(r.ran);
1944 <    }
1926 >    public void testAcceptEither_normalCompletion1() {
1927 >        for (ExecutionMode m : ExecutionMode.values())
1928 >        for (Integer v1 : new Integer[] { 1, null })
1929 >        for (Integer v2 : new Integer[] { 2, null })
1930 >    {
1931 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1933 >        final IncAction r = new IncAction();
1934 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1935 >
1936 >        f.complete(v1);
1937 >        checkCompletedNormally(h, null);
1938 >        assertEquals(inc(v1), r.value);
1939 >        g.complete(v2);
1940 >
1941 >        checkCompletedNormally(f, v1);
1942 >        checkCompletedNormally(g, v2);
1943 >        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);
1955 >
1956 >        g.complete(v2);
1957 >        checkCompletedNormally(h, null);
1958 >        assertEquals(inc(v2), r.value);
1959 >        f.complete(v1);
1960 >
1961 >        checkCompletedNormally(f, v1);
1962 >        checkCompletedNormally(g, v2);
1963 >        checkCompletedNormally(h, null);
1964 >    }}
1965 >
1966 >    public void testAcceptEither_normalCompletion3() {
1967 >        for (ExecutionMode m : ExecutionMode.values())
1968 >        for (Integer v1 : new Integer[] { 1, null })
1969 >        for (Integer v2 : new Integer[] { 2, null })
1970 >    {
1971 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1972 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1973 >        final IncAction r = new IncAction();
1974 >
1975 >        f.complete(v1);
1976 >        g.complete(v2);
1977 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1978 >
1979 >        checkCompletedNormally(h, null);
1980 >        checkCompletedNormally(f, v1);
1981 >        checkCompletedNormally(g, v2);
1982 >
1983 >        // unspecified behavior
1984 >        assertTrue(Objects.equals(r.value, inc(v1)) ||
1985 >                   Objects.equals(r.value, inc(v2)));
1986 >    }}
1987  
1988      /**
1989 <     * runAfterEither result completes exceptionally after exceptional
1989 >     * acceptEither result completes exceptionally after exceptional
1990       * completion of either source
1991       */
1992 <    public void testRunAfterEither2() {
1993 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1994 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1995 <        Noop r = new Noop();
1996 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
1997 <        f.completeExceptionally(new CFException());
1998 <        f2.complete(one);
1999 <        checkCompletedWithWrappedCFException(g);
2000 <
2001 <        r = new Noop();
2002 <        f = new CompletableFuture<Integer>();
2003 <        f2 = new CompletableFuture<Integer>();
2004 <        f2.completeExceptionally(new CFException());
2005 <        g = f.runAfterEither(f2, r);
2006 <        checkCompletedWithWrappedCFException(g);
2007 <    }
2008 <
2009 <    /**
2010 <     * runAfterEither result completes exceptionally if action does
2011 <     */
2012 <    public void testRunAfterEither3() {
2013 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2014 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2015 <        FailingNoop r = new FailingNoop();
2016 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2017 <        f2.complete(two);
2018 <        checkCompletedWithWrappedCFException(g);
2019 <    }
2020 <
2021 <    /**
2022 <     * runAfterEither result completes exceptionally if either source cancelled
2023 <     */
2024 <    public void testRunAfterEither4() {
2025 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2026 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2027 <        Noop r = new Noop();
2028 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2029 <        assertTrue(f.cancel(true));
2030 <        checkCompletedWithWrappedCancellationException(g);
2031 <        f = new CompletableFuture<Integer>();
2032 <        f2 = new CompletableFuture<Integer>();
2033 <        assertTrue(f2.cancel(true));
2034 <        checkCompletedWithWrappedCancellationException(g);
2035 <    }
1992 >    public void testAcceptEither_exceptionalCompletion1() {
1993 >        for (ExecutionMode m : ExecutionMode.values())
1994 >        for (Integer v1 : new Integer[] { 1, null })
1995 >    {
1996 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1997 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
1998 >        final IncAction r = new IncAction();
1999 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2000 >        final CFException ex = new CFException();
2001 >
2002 >        f.completeExceptionally(ex);
2003 >        checkCompletedWithWrappedCFException(h, ex);
2004 >        g.complete(v1);
2005 >
2006 >        assertEquals(0, r.invocationCount);
2007 >        checkCompletedNormally(g, v1);
2008 >        checkCompletedWithWrappedCFException(f, ex);
2009 >        checkCompletedWithWrappedCFException(h, ex);
2010 >    }}
2011 >
2012 >    public void testAcceptEither_exceptionalCompletion2() {
2013 >        for (ExecutionMode m : ExecutionMode.values())
2014 >        for (Integer v1 : new Integer[] { 1, null })
2015 >    {
2016 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2017 >        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();
2039 >        final CFException ex = new CFException();
2040 >
2041 >        g.completeExceptionally(ex);
2042 >        f.complete(v1);
2043 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2044  
2045 <    /**
2046 <     * thenCompose result completes normally after normal completion of source
2047 <     */
2048 <    public void testThenCompose() {
2049 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2050 <        CompletableFutureInc r = new CompletableFutureInc();
2051 <        CompletableFuture<Integer> g = f.thenCompose(r);
2052 <        f.complete(one);
2053 <        checkCompletedNormally(g, two);
2054 <    }
2055 <
2056 <    /**
2057 <     * thenCompose result completes exceptionally after exceptional
2058 <     * completion of source
2059 <     */
2060 <    public void testThenCompose2() {
2061 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2062 <        CompletableFutureInc r = new CompletableFutureInc();
2063 <        CompletableFuture<Integer> g = f.thenCompose(r);
2064 <        f.completeExceptionally(new CFException());
2065 <        checkCompletedWithWrappedCFException(g);
2066 <    }
2067 <
2068 <    /**
2069 <     * thenCompose result completes exceptionally if action does
2070 <     */
2071 <    public void testThenCompose3() {
1078 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1079 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
1080 <        CompletableFuture<Integer> g = f.thenCompose(r);
1081 <        f.complete(one);
1082 <        checkCompletedWithWrappedCFException(g);
1083 <    }
1084 <
1085 <    /**
1086 <     * thenCompose result completes exceptionally if source cancelled
1087 <     */
1088 <    public void testThenCompose4() {
1089 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1090 <        CompletableFutureInc r = new CompletableFutureInc();
1091 <        CompletableFuture<Integer> g = f.thenCompose(r);
1092 <        assertTrue(f.cancel(true));
1093 <        checkCompletedWithWrappedCancellationException(g);
1094 <    }
1095 <
1096 <
1097 <    // asyncs
1098 <
1099 <    /**
1100 <     * thenRunAsync result completes normally after normal completion of source
1101 <     */
1102 <    public void testThenRunAsync() {
1103 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1104 <        Noop r = new Noop();
1105 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1106 <        f.complete(null);
1107 <        checkCompletedNormally(g, null);
1108 <
1109 <        // reordered version
1110 <        f = new CompletableFuture<Integer>();
1111 <        f.complete(null);
1112 <        r = new Noop();
1113 <        g = f.thenRunAsync(r);
1114 <        checkCompletedNormally(g, null);
1115 <    }
2045 >        // unspecified behavior
2046 >        Integer v;
2047 >        try {
2048 >            assertNull(h.join());
2049 >            assertEquals(1, r.invocationCount);
2050 >            assertEquals(inc(v1), r.value);
2051 >        } catch (CompletionException ok) {
2052 >            checkCompletedWithWrappedCFException(h, ex);
2053 >            assertEquals(0, r.invocationCount);
2054 >        }
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 <    /**
2074 <     * thenRunAsync result completes exceptionally after exceptional
1119 <     * completion of source
1120 <     */
1121 <    public void testThenRunAsync2() {
1122 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1123 <        Noop r = new Noop();
1124 <        CompletableFuture<Void> g = f.thenRunAsync(r);
1125 <        f.completeExceptionally(new CFException());
2073 >        // unspecified behavior
2074 >        Integer v;
2075          try {
2076 <            g.join();
2077 <            shouldThrow();
2078 <        } catch (Exception ok) {
2076 >            assertNull(h.join());
2077 >            assertEquals(1, r.invocationCount);
2078 >            assertEquals(inc(v1), r.value);
2079 >        } catch (CompletionException ok) {
2080 >            checkCompletedWithWrappedCFException(h, ex);
2081 >            assertEquals(0, r.invocationCount);
2082          }
1131        checkCompletedWithWrappedCFException(g);
1132    }
1133
1134    /**
1135     * thenRunAsync result completes exceptionally if action does
1136     */
1137    public void testThenRunAsync3() {
1138        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1139        FailingNoop r = new FailingNoop();
1140        CompletableFuture<Void> g = f.thenRunAsync(r);
1141        f.complete(null);
1142        checkCompletedWithWrappedCFException(g);
1143    }
1144
1145    /**
1146     * thenRunAsync result completes exceptionally if source cancelled
1147     */
1148    public void testThenRunAsync4() {
1149        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1150        Noop r = new Noop();
1151        CompletableFuture<Void> g = f.thenRunAsync(r);
1152        assertTrue(f.cancel(true));
1153        checkCompletedWithWrappedCancellationException(g);
1154    }
1155
1156    /**
1157     * thenApplyAsync result completes normally after normal completion of source
1158     */
1159    public void testThenApplyAsync() {
1160        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1161        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1162        f.complete(one);
1163        checkCompletedNormally(g, two);
1164    }
1165
1166    /**
1167     * thenApplyAsync result completes exceptionally after exceptional
1168     * completion of source
1169     */
1170    public void testThenApplyAsync2() {
1171        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1172        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1173        f.completeExceptionally(new CFException());
1174        checkCompletedWithWrappedCFException(g);
1175    }
1176
1177    /**
1178     * thenApplyAsync result completes exceptionally if action does
1179     */
1180    public void testThenApplyAsync3() {
1181        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1182        FailingFunction r = new FailingFunction();
1183        CompletableFuture<Integer> g = f.thenApplyAsync(r);
1184        f.complete(null);
1185        checkCompletedWithWrappedCFException(g);
1186    }
1187
1188    /**
1189     * thenApplyAsync result completes exceptionally if source cancelled
1190     */
1191    public void testThenApplyAsync4() {
1192        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1193        CompletableFuture<Integer> g = f.thenApplyAsync(inc);
1194        assertTrue(f.cancel(true));
1195        checkCompletedWithWrappedCancellationException(g);
1196    }
2083  
2084 <    /**
2085 <     * thenAcceptAsync result completes normally after normal
2086 <     * completion of source
1201 <     */
1202 <    public void testThenAcceptAsync() {
1203 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1204 <        IncAction r = new IncAction();
1205 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1206 <        f.complete(one);
1207 <        checkCompletedNormally(g, null);
1208 <        assertEquals(r.value, 2);
1209 <    }
2084 >        checkCompletedWithWrappedCFException(f, ex);
2085 >        checkCompletedNormally(g, v1);
2086 >    }}
2087  
2088      /**
2089 <     * thenAcceptAsync result completes exceptionally after exceptional
1213 <     * completion of source
1214 <     */
1215 <    public void testThenAcceptAsync2() {
1216 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1217 <        IncAction r = new IncAction();
1218 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1219 <        f.completeExceptionally(new CFException());
1220 <        checkCompletedWithWrappedCFException(g);
1221 <    }
1222 <
1223 <    /**
1224 <     * thenAcceptAsync result completes exceptionally if action does
1225 <     */
1226 <    public void testThenAcceptAsync3() {
1227 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1228 <        FailingConsumer r = new FailingConsumer();
1229 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1230 <        f.complete(null);
1231 <        checkCompletedWithWrappedCFException(g);
1232 <    }
1233 <
1234 <    /**
1235 <     * thenAcceptAsync result completes exceptionally if source cancelled
1236 <     */
1237 <    public void testThenAcceptAsync4() {
1238 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1239 <        IncAction r = new IncAction();
1240 <        CompletableFuture<Void> g = f.thenAcceptAsync(r);
1241 <        assertTrue(f.cancel(true));
1242 <        checkCompletedWithWrappedCancellationException(g);
1243 <    }
1244 <    /**
1245 <     * thenCombineAsync result completes normally after normal
1246 <     * completion of sources
1247 <     */
1248 <    public void testThenCombineAsync() {
1249 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1250 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1251 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1252 <        f.complete(one);
1253 <        checkIncomplete(g);
1254 <        f2.complete(two);
1255 <        checkCompletedNormally(g, three);
1256 <    }
1257 <
1258 <    /**
1259 <     * thenCombineAsync result completes exceptionally after exceptional
1260 <     * completion of source
1261 <     */
1262 <    public void testThenCombineAsync2() {
1263 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1264 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1265 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1266 <        f.completeExceptionally(new CFException());
1267 <        f2.complete(two);
1268 <        checkCompletedWithWrappedCFException(g);
1269 <
1270 <        f = new CompletableFuture<Integer>();
1271 <        f2 = new CompletableFuture<Integer>();
1272 <        g = f.thenCombineAsync(f2, add);
1273 <        f.complete(one);
1274 <        f2.completeExceptionally(new CFException());
1275 <        checkCompletedWithWrappedCFException(g);
1276 <    }
1277 <
1278 <    /**
1279 <     * thenCombineAsync result completes exceptionally if action does
1280 <     */
1281 <    public void testThenCombineAsync3() {
1282 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1283 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1284 <        FailingBiFunction r = new FailingBiFunction();
1285 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r);
1286 <        f.complete(one);
1287 <        checkIncomplete(g);
1288 <        f2.complete(two);
1289 <        checkCompletedWithWrappedCFException(g);
1290 <    }
1291 <
1292 <    /**
1293 <     * thenCombineAsync result completes exceptionally if either source cancelled
1294 <     */
1295 <    public void testThenCombineAsync4() {
1296 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1297 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1298 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add);
1299 <        assertTrue(f.cancel(true));
1300 <        f2.complete(two);
1301 <        checkCompletedWithWrappedCancellationException(g);
1302 <
1303 <        f = new CompletableFuture<Integer>();
1304 <        f2 = new CompletableFuture<Integer>();
1305 <        g = f.thenCombineAsync(f2, add);
1306 <        f.complete(one);
1307 <        assertTrue(f2.cancel(true));
1308 <        checkCompletedWithWrappedCancellationException(g);
1309 <    }
1310 <
1311 <    /**
1312 <     * thenAcceptBothAsync result completes normally after normal
1313 <     * completion of sources
1314 <     */
1315 <    public void testThenAcceptBothAsync() {
1316 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1317 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1318 <        AddAction r = new AddAction();
1319 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1320 <        f.complete(one);
1321 <        checkIncomplete(g);
1322 <        f2.complete(two);
1323 <        checkCompletedNormally(g, null);
1324 <        assertEquals(r.value, 3);
1325 <    }
1326 <
1327 <    /**
1328 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1329 <     * completion of source
1330 <     */
1331 <    public void testThenAcceptBothAsync2() {
1332 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1333 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1334 <        AddAction r = new AddAction();
1335 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1336 <        f.completeExceptionally(new CFException());
1337 <        f2.complete(two);
1338 <        checkCompletedWithWrappedCFException(g);
1339 <
1340 <        r = new AddAction();
1341 <        f = new CompletableFuture<Integer>();
1342 <        f2 = new CompletableFuture<Integer>();
1343 <        g = f.thenAcceptBothAsync(f2, r);
1344 <        f.complete(one);
1345 <        f2.completeExceptionally(new CFException());
1346 <        checkCompletedWithWrappedCFException(g);
1347 <    }
1348 <
1349 <    /**
1350 <     * thenAcceptBothAsync result completes exceptionally if action does
1351 <     */
1352 <    public void testThenAcceptBothAsync3() {
1353 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1354 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1355 <        FailingBiConsumer r = new FailingBiConsumer();
1356 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1357 <        f.complete(one);
1358 <        checkIncomplete(g);
1359 <        f2.complete(two);
1360 <        checkCompletedWithWrappedCFException(g);
1361 <    }
1362 <
1363 <    /**
1364 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1365 <     */
1366 <    public void testThenAcceptBothAsync4() {
1367 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1368 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1369 <        AddAction r = new AddAction();
1370 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r);
1371 <        assertTrue(f.cancel(true));
1372 <        f2.complete(two);
1373 <        checkCompletedWithWrappedCancellationException(g);
1374 <
1375 <        r = new AddAction();
1376 <        f = new CompletableFuture<Integer>();
1377 <        f2 = new CompletableFuture<Integer>();
1378 <        g = f.thenAcceptBothAsync(f2, r);
1379 <        f.complete(one);
1380 <        assertTrue(f2.cancel(true));
1381 <        checkCompletedWithWrappedCancellationException(g);
1382 <    }
1383 <
1384 <    /**
1385 <     * runAfterBothAsync result completes normally after normal
1386 <     * completion of sources
1387 <     */
1388 <    public void testRunAfterBothAsync() {
1389 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1390 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1391 <        Noop r = new Noop();
1392 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1393 <        f.complete(one);
1394 <        checkIncomplete(g);
1395 <        f2.complete(two);
1396 <        checkCompletedNormally(g, null);
1397 <        assertTrue(r.ran);
1398 <    }
1399 <
1400 <    /**
1401 <     * runAfterBothAsync result completes exceptionally after exceptional
1402 <     * completion of source
1403 <     */
1404 <    public void testRunAfterBothAsync2() {
1405 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1406 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1407 <        Noop r = new Noop();
1408 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1409 <        f.completeExceptionally(new CFException());
1410 <        f2.complete(two);
1411 <        checkCompletedWithWrappedCFException(g);
1412 <
1413 <        r = new Noop();
1414 <        f = new CompletableFuture<Integer>();
1415 <        f2 = new CompletableFuture<Integer>();
1416 <        g = f.runAfterBothAsync(f2, r);
1417 <        f.complete(one);
1418 <        f2.completeExceptionally(new CFException());
1419 <        checkCompletedWithWrappedCFException(g);
1420 <    }
1421 <
1422 <    /**
1423 <     * runAfterBothAsync result completes exceptionally if action does
1424 <     */
1425 <    public void testRunAfterBothAsync3() {
1426 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1427 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1428 <        FailingNoop r = new FailingNoop();
1429 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1430 <        f.complete(one);
1431 <        checkIncomplete(g);
1432 <        f2.complete(two);
1433 <        checkCompletedWithWrappedCFException(g);
1434 <    }
1435 <
1436 <    /**
1437 <     * runAfterBothAsync result completes exceptionally if either source cancelled
1438 <     */
1439 <    public void testRunAfterBothAsync4() {
1440 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1441 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1442 <        Noop r = new Noop();
1443 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r);
1444 <        assertTrue(f.cancel(true));
1445 <        f2.complete(two);
1446 <        checkCompletedWithWrappedCancellationException(g);
1447 <
1448 <        r = new Noop();
1449 <        f = new CompletableFuture<Integer>();
1450 <        f2 = new CompletableFuture<Integer>();
1451 <        g = f.runAfterBothAsync(f2, r);
1452 <        f.complete(one);
1453 <        assertTrue(f2.cancel(true));
1454 <        checkCompletedWithWrappedCancellationException(g);
1455 <    }
1456 <
1457 <    /**
1458 <     * applyToEitherAsync result completes normally after normal
1459 <     * completion of sources
1460 <     */
1461 <    public void testApplyToEitherAsync() {
1462 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1463 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1464 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1465 <        f.complete(one);
1466 <        checkCompletedNormally(g, two);
1467 <
1468 <        f = new CompletableFuture<Integer>();
1469 <        f.complete(one);
1470 <        f2 = new CompletableFuture<Integer>();
1471 <        g = f.applyToEitherAsync(f2, inc);
1472 <        checkCompletedNormally(g, two);
1473 <    }
1474 <
1475 <    /**
1476 <     * applyToEitherAsync result completes exceptionally after exceptional
1477 <     * completion of source
1478 <     */
1479 <    public void testApplyToEitherAsync2() {
1480 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1481 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1482 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1483 <        f.completeExceptionally(new CFException());
1484 <        checkCompletedWithWrappedCFException(g);
1485 <
1486 <        f = new CompletableFuture<Integer>();
1487 <        f2 = new CompletableFuture<Integer>();
1488 <        f2.completeExceptionally(new CFException());
1489 <        g = f.applyToEitherAsync(f2, inc);
1490 <        f.complete(one);
1491 <        checkCompletedWithWrappedCFException(g);
1492 <    }
1493 <
1494 <    /**
1495 <     * applyToEitherAsync result completes exceptionally if action does
1496 <     */
1497 <    public void testApplyToEitherAsync3() {
1498 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1499 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1500 <        FailingFunction r = new FailingFunction();
1501 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r);
1502 <        f.complete(one);
1503 <        checkCompletedWithWrappedCFException(g);
1504 <    }
1505 <
1506 <    /**
1507 <     * applyToEitherAsync result completes exceptionally if either source cancelled
1508 <     */
1509 <    public void testApplyToEitherAsync4() {
1510 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1511 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1512 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc);
1513 <        assertTrue(f.cancel(true));
1514 <        checkCompletedWithWrappedCancellationException(g);
1515 <
1516 <        f = new CompletableFuture<Integer>();
1517 <        f2 = new CompletableFuture<Integer>();
1518 <        assertTrue(f2.cancel(true));
1519 <        g = f.applyToEitherAsync(f2, inc);
1520 <        checkCompletedWithWrappedCancellationException(g);
1521 <    }
1522 <
1523 <    /**
1524 <     * acceptEitherAsync result completes normally after normal
1525 <     * completion of sources
1526 <     */
1527 <    public void testAcceptEitherAsync() {
1528 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1529 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1530 <        IncAction r = new IncAction();
1531 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1532 <        f.complete(one);
1533 <        checkCompletedNormally(g, null);
1534 <        assertEquals(r.value, 2);
1535 <
1536 <        r = new IncAction();
1537 <        f = new CompletableFuture<Integer>();
1538 <        f.complete(one);
1539 <        f2 = new CompletableFuture<Integer>();
1540 <        g = f.acceptEitherAsync(f2, r);
1541 <        checkCompletedNormally(g, null);
1542 <        assertEquals(r.value, 2);
1543 <    }
1544 <
1545 <    /**
1546 <     * acceptEitherAsync result completes exceptionally after exceptional
1547 <     * completion of source
1548 <     */
1549 <    public void testAcceptEitherAsync2() {
1550 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1551 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1552 <        IncAction r = new IncAction();
1553 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1554 <        f.completeExceptionally(new CFException());
1555 <        checkCompletedWithWrappedCFException(g);
1556 <
1557 <        r = new IncAction();
1558 <        f = new CompletableFuture<Integer>();
1559 <        f2 = new CompletableFuture<Integer>();
1560 <        f2.completeExceptionally(new CFException());
1561 <        g = f.acceptEitherAsync(f2, r);
1562 <        f.complete(one);
1563 <        checkCompletedWithWrappedCFException(g);
1564 <    }
1565 <
1566 <    /**
1567 <     * acceptEitherAsync result completes exceptionally if action does
1568 <     */
1569 <    public void testAcceptEitherAsync3() {
1570 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1571 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1572 <        FailingConsumer r = new FailingConsumer();
1573 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1574 <        f.complete(one);
1575 <        checkCompletedWithWrappedCFException(g);
1576 <    }
1577 <
1578 <    /**
1579 <     * acceptEitherAsync result completes exceptionally if either
1580 <     * source cancelled
1581 <     */
1582 <    public void testAcceptEitherAsync4() {
1583 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1584 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1585 <        IncAction r = new IncAction();
1586 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r);
1587 <        assertTrue(f.cancel(true));
1588 <        checkCompletedWithWrappedCancellationException(g);
1589 <
1590 <        r = new IncAction();
1591 <        f = new CompletableFuture<Integer>();
1592 <        f2 = new CompletableFuture<Integer>();
1593 <        assertTrue(f2.cancel(true));
1594 <        g = f.acceptEitherAsync(f2, r);
1595 <        checkCompletedWithWrappedCancellationException(g);
1596 <    }
1597 <
1598 <    /**
1599 <     * runAfterEitherAsync result completes normally after normal
1600 <     * completion of sources
1601 <     */
1602 <    public void testRunAfterEitherAsync() {
1603 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1604 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1605 <        Noop r = new Noop();
1606 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1607 <        f.complete(one);
1608 <        checkCompletedNormally(g, null);
1609 <        assertTrue(r.ran);
1610 <
1611 <        r = new Noop();
1612 <        f = new CompletableFuture<Integer>();
1613 <        f.complete(one);
1614 <        f2 = new CompletableFuture<Integer>();
1615 <        g = f.runAfterEitherAsync(f2, r);
1616 <        checkCompletedNormally(g, null);
1617 <        assertTrue(r.ran);
1618 <    }
1619 <
1620 <    /**
1621 <     * runAfterEitherAsync result completes exceptionally after exceptional
1622 <     * completion of source
1623 <     */
1624 <    public void testRunAfterEitherAsync2() {
1625 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1626 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1627 <        Noop r = new Noop();
1628 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1629 <        f.completeExceptionally(new CFException());
1630 <        checkCompletedWithWrappedCFException(g);
1631 <
1632 <        r = new Noop();
1633 <        f = new CompletableFuture<Integer>();
1634 <        f2 = new CompletableFuture<Integer>();
1635 <        f2.completeExceptionally(new CFException());
1636 <        g = f.runAfterEitherAsync(f2, r);
1637 <        f.complete(one);
1638 <        checkCompletedWithWrappedCFException(g);
1639 <    }
1640 <
1641 <    /**
1642 <     * runAfterEitherAsync result completes exceptionally if action does
1643 <     */
1644 <    public void testRunAfterEitherAsync3() {
1645 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1646 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1647 <        FailingNoop r = new FailingNoop();
1648 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1649 <        f.complete(one);
1650 <        checkCompletedWithWrappedCFException(g);
1651 <    }
1652 <
1653 <    /**
1654 <     * runAfterEitherAsync result completes exceptionally if either
1655 <     * source cancelled
1656 <     */
1657 <    public void testRunAfterEitherAsync4() {
1658 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1659 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1660 <        Noop r = new Noop();
1661 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
1662 <        assertTrue(f.cancel(true));
1663 <        checkCompletedWithWrappedCancellationException(g);
1664 <
1665 <        r = new Noop();
1666 <        f = new CompletableFuture<Integer>();
1667 <        f2 = new CompletableFuture<Integer>();
1668 <        assertTrue(f2.cancel(true));
1669 <        g = f.runAfterEitherAsync(f2, r);
1670 <        checkCompletedWithWrappedCancellationException(g);
1671 <    }
1672 <
1673 <    /**
1674 <     * thenComposeAsync result completes normally after normal
1675 <     * completion of source
1676 <     */
1677 <    public void testThenComposeAsync() {
1678 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1679 <        CompletableFutureInc r = new CompletableFutureInc();
1680 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1681 <        f.complete(one);
1682 <        checkCompletedNormally(g, two);
1683 <    }
1684 <
1685 <    /**
1686 <     * thenComposeAsync result completes exceptionally after
1687 <     * exceptional completion of source
1688 <     */
1689 <    public void testThenComposeAsync2() {
1690 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1691 <        CompletableFutureInc r = new CompletableFutureInc();
1692 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
1693 <        f.completeExceptionally(new CFException());
1694 <        checkCompletedWithWrappedCFException(g);
1695 <    }
1696 <
1697 <    /**
1698 <     * thenComposeAsync result completes exceptionally if action does
2089 >     * acceptEither result completes exceptionally if action does
2090       */
2091 <    public void testThenComposeAsync3() {
2092 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2093 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2094 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2095 <        f.complete(one);
2096 <        checkCompletedWithWrappedCFException(g);
2097 <    }
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);
2121 >        checkCompletedNormally(f, v1);
2122 >        checkCompletedNormally(g, v2);
2123 >    }}
2124  
2125      /**
2126 <     * thenComposeAsync result completes exceptionally if source cancelled
2126 >     * acceptEither result completes exceptionally if either source cancelled
2127       */
2128 <    public void testThenComposeAsync4() {
2129 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2130 <        CompletableFutureInc r = new CompletableFutureInc();
2131 <        CompletableFuture<Integer> g = f.thenComposeAsync(r);
2132 <        assertTrue(f.cancel(true));
2133 <        checkCompletedWithWrappedCancellationException(g);
2134 <    }
2135 <
2136 <
2137 <    // async with explicit executors
2128 >    public void testAcceptEither_sourceCancelled1() {
2129 >        for (ExecutionMode m : ExecutionMode.values())
2130 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2131 >        for (Integer v1 : new Integer[] { 1, null })
2132 >    {
2133 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2134 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2135 >        final IncAction r = new IncAction();
2136 >        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2137 >
2138 >        assertTrue(f.cancel(mayInterruptIfRunning));
2139 >        checkCompletedWithWrappedCancellationException(h);
2140 >        g.complete(v1);
2141  
2142 <    /**
2143 <     * thenRunAsync result completes normally after normal completion of source
2144 <     */
2145 <    public void testThenRunAsyncE() {
2146 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2147 <        Noop r = new Noop();
2148 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
2149 <        f.complete(null);
2150 <        checkCompletedNormally(g, null);
2142 >        checkCancelled(f);
2143 >        assertEquals(0, r.invocationCount);
2144 >        checkCompletedNormally(g, v1);
2145 >        checkCompletedWithWrappedCancellationException(h);
2146 >    }}
2147 >
2148 >    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);
2180  
2181 <        // reordered version
2182 <        f = new CompletableFuture<Integer>();
2183 <        f.complete(null);
2184 <        r = new Noop();
2185 <        g = f.thenRunAsync(r, new ThreadExecutor());
2186 <        checkCompletedNormally(g, null);
2187 <    }
2181 >        // unspecified behavior
2182 >        Integer v;
2183 >        try {
2184 >            assertNull(h.join());
2185 >            assertEquals(1, r.invocationCount);
2186 >            assertEquals(inc(v1), r.value);
2187 >        } catch (CompletionException ok) {
2188 >            checkCompletedWithWrappedCancellationException(h);
2189 >            assertEquals(0, r.invocationCount);
2190 >        }
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 <    /**
2210 <     * thenRunAsync result completes exceptionally after exceptional
1742 <     * completion of source
1743 <     */
1744 <    public void testThenRunAsync2E() {
1745 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1746 <        Noop r = new Noop();
1747 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1748 <        f.completeExceptionally(new CFException());
2209 >        // unspecified behavior
2210 >        Integer v;
2211          try {
2212 <            g.join();
2213 <            shouldThrow();
2214 <        } catch (Exception ok) {
2212 >            assertNull(h.join());
2213 >            assertEquals(1, r.invocationCount);
2214 >            assertEquals(inc(v1), r.value);
2215 >        } catch (CompletionException ok) {
2216 >            checkCompletedWithWrappedCancellationException(h);
2217 >            assertEquals(0, r.invocationCount);
2218          }
1754        checkCompletedWithWrappedCFException(g);
1755    }
1756
1757    /**
1758     * thenRunAsync result completes exceptionally if action does
1759     */
1760    public void testThenRunAsync3E() {
1761        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1762        FailingNoop r = new FailingNoop();
1763        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1764        f.complete(null);
1765        checkCompletedWithWrappedCFException(g);
1766    }
2219  
2220 <    /**
2221 <     * thenRunAsync result completes exceptionally if source cancelled
2222 <     */
1771 <    public void testThenRunAsync4E() {
1772 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1773 <        Noop r = new Noop();
1774 <        CompletableFuture<Void> g = f.thenRunAsync(r, new ThreadExecutor());
1775 <        assertTrue(f.cancel(true));
1776 <        checkCompletedWithWrappedCancellationException(g);
1777 <    }
1778 <
1779 <    /**
1780 <     * thenApplyAsync result completes normally after normal completion of source
1781 <     */
1782 <    public void testThenApplyAsyncE() {
1783 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1784 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1785 <        f.complete(one);
1786 <        checkCompletedNormally(g, two);
1787 <    }
1788 <
1789 <    /**
1790 <     * thenApplyAsync result completes exceptionally after exceptional
1791 <     * completion of source
1792 <     */
1793 <    public void testThenApplyAsync2E() {
1794 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1795 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1796 <        f.completeExceptionally(new CFException());
1797 <        checkCompletedWithWrappedCFException(g);
1798 <    }
1799 <
1800 <    /**
1801 <     * thenApplyAsync result completes exceptionally if action does
1802 <     */
1803 <    public void testThenApplyAsync3E() {
1804 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1805 <        FailingFunction r = new FailingFunction();
1806 <        CompletableFuture<Integer> g = f.thenApplyAsync(r, new ThreadExecutor());
1807 <        f.complete(null);
1808 <        checkCompletedWithWrappedCFException(g);
1809 <    }
1810 <
1811 <    /**
1812 <     * thenApplyAsync result completes exceptionally if source cancelled
1813 <     */
1814 <    public void testThenApplyAsync4E() {
1815 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1816 <        CompletableFuture<Integer> g = f.thenApplyAsync(inc, new ThreadExecutor());
1817 <        assertTrue(f.cancel(true));
1818 <        checkCompletedWithWrappedCancellationException(g);
1819 <    }
1820 <
1821 <    /**
1822 <     * thenAcceptAsync result completes normally after normal
1823 <     * completion of source
1824 <     */
1825 <    public void testThenAcceptAsyncE() {
1826 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1827 <        IncAction r = new IncAction();
1828 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1829 <        f.complete(one);
1830 <        checkCompletedNormally(g, null);
1831 <        assertEquals(r.value, 2);
1832 <    }
1833 <
1834 <    /**
1835 <     * thenAcceptAsync result completes exceptionally after exceptional
1836 <     * completion of source
1837 <     */
1838 <    public void testThenAcceptAsync2E() {
1839 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1840 <        IncAction r = new IncAction();
1841 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1842 <        f.completeExceptionally(new CFException());
1843 <        checkCompletedWithWrappedCFException(g);
1844 <    }
1845 <
1846 <    /**
1847 <     * thenAcceptAsync result completes exceptionally if action does
1848 <     */
1849 <    public void testThenAcceptAsync3E() {
1850 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1851 <        FailingConsumer r = new FailingConsumer();
1852 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1853 <        f.complete(null);
1854 <        checkCompletedWithWrappedCFException(g);
1855 <    }
1856 <
1857 <    /**
1858 <     * thenAcceptAsync result completes exceptionally if source cancelled
1859 <     */
1860 <    public void testThenAcceptAsync4E() {
1861 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1862 <        IncAction r = new IncAction();
1863 <        CompletableFuture<Void> g = f.thenAcceptAsync(r, new ThreadExecutor());
1864 <        assertTrue(f.cancel(true));
1865 <        checkCompletedWithWrappedCancellationException(g);
1866 <    }
1867 <    /**
1868 <     * thenCombineAsync result completes normally after normal
1869 <     * completion of sources
1870 <     */
1871 <    public void testThenCombineAsyncE() {
1872 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1873 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1874 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1875 <        f.complete(one);
1876 <        checkIncomplete(g);
1877 <        f2.complete(two);
1878 <        checkCompletedNormally(g, three);
1879 <    }
1880 <
1881 <    /**
1882 <     * thenCombineAsync result completes exceptionally after exceptional
1883 <     * completion of source
1884 <     */
1885 <    public void testThenCombineAsync2E() {
1886 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1887 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1888 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1889 <        f.completeExceptionally(new CFException());
1890 <        f2.complete(two);
1891 <        checkCompletedWithWrappedCFException(g);
1892 <
1893 <        f = new CompletableFuture<Integer>();
1894 <        f2 = new CompletableFuture<Integer>();
1895 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1896 <        f.complete(one);
1897 <        f2.completeExceptionally(new CFException());
1898 <        checkCompletedWithWrappedCFException(g);
1899 <    }
1900 <
1901 <    /**
1902 <     * thenCombineAsync result completes exceptionally if action does
1903 <     */
1904 <    public void testThenCombineAsync3E() {
1905 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1906 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1907 <        FailingBiFunction r = new FailingBiFunction();
1908 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, r, new ThreadExecutor());
1909 <        f.complete(one);
1910 <        checkIncomplete(g);
1911 <        f2.complete(two);
1912 <        checkCompletedWithWrappedCFException(g);
1913 <    }
1914 <
1915 <    /**
1916 <     * thenCombineAsync result completes exceptionally if either source cancelled
1917 <     */
1918 <    public void testThenCombineAsync4E() {
1919 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1920 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1921 <        CompletableFuture<Integer> g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1922 <        assertTrue(f.cancel(true));
1923 <        f2.complete(two);
1924 <        checkCompletedWithWrappedCancellationException(g);
1925 <
1926 <        f = new CompletableFuture<Integer>();
1927 <        f2 = new CompletableFuture<Integer>();
1928 <        g = f.thenCombineAsync(f2, add, new ThreadExecutor());
1929 <        f.complete(one);
1930 <        assertTrue(f2.cancel(true));
1931 <        checkCompletedWithWrappedCancellationException(g);
1932 <    }
1933 <
1934 <    /**
1935 <     * thenAcceptBothAsync result completes normally after normal
1936 <     * completion of sources
1937 <     */
1938 <    public void testThenAcceptBothAsyncE() {
1939 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1940 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1941 <        AddAction r = new AddAction();
1942 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1943 <        f.complete(one);
1944 <        checkIncomplete(g);
1945 <        f2.complete(two);
1946 <        checkCompletedNormally(g, null);
1947 <        assertEquals(r.value, 3);
1948 <    }
1949 <
1950 <    /**
1951 <     * thenAcceptBothAsync result completes exceptionally after exceptional
1952 <     * completion of source
1953 <     */
1954 <    public void testThenAcceptBothAsync2E() {
1955 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1956 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1957 <        AddAction r = new AddAction();
1958 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1959 <        f.completeExceptionally(new CFException());
1960 <        f2.complete(two);
1961 <        checkCompletedWithWrappedCFException(g);
1962 <
1963 <        r = new AddAction();
1964 <        f = new CompletableFuture<Integer>();
1965 <        f2 = new CompletableFuture<Integer>();
1966 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1967 <        f.complete(one);
1968 <        f2.completeExceptionally(new CFException());
1969 <        checkCompletedWithWrappedCFException(g);
1970 <    }
1971 <
1972 <    /**
1973 <     * thenAcceptBothAsync result completes exceptionally if action does
1974 <     */
1975 <    public void testThenAcceptBothAsync3E() {
1976 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1977 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1978 <        FailingBiConsumer r = new FailingBiConsumer();
1979 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1980 <        f.complete(one);
1981 <        checkIncomplete(g);
1982 <        f2.complete(two);
1983 <        checkCompletedWithWrappedCFException(g);
1984 <    }
1985 <
1986 <    /**
1987 <     * thenAcceptBothAsync result completes exceptionally if either source cancelled
1988 <     */
1989 <    public void testThenAcceptBothAsync4E() {
1990 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
1991 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
1992 <        AddAction r = new AddAction();
1993 <        CompletableFuture<Void> g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
1994 <        assertTrue(f.cancel(true));
1995 <        f2.complete(two);
1996 <        checkCompletedWithWrappedCancellationException(g);
1997 <
1998 <        r = new AddAction();
1999 <        f = new CompletableFuture<Integer>();
2000 <        f2 = new CompletableFuture<Integer>();
2001 <        g = f.thenAcceptBothAsync(f2, r, new ThreadExecutor());
2002 <        f.complete(one);
2003 <        assertTrue(f2.cancel(true));
2004 <        checkCompletedWithWrappedCancellationException(g);
2005 <    }
2006 <
2007 <    /**
2008 <     * runAfterBothAsync result completes normally after normal
2009 <     * completion of sources
2010 <     */
2011 <    public void testRunAfterBothAsyncE() {
2012 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2013 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2014 <        Noop r = new Noop();
2015 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2016 <        f.complete(one);
2017 <        checkIncomplete(g);
2018 <        f2.complete(two);
2019 <        checkCompletedNormally(g, null);
2020 <        assertTrue(r.ran);
2021 <    }
2022 <
2023 <    /**
2024 <     * runAfterBothAsync result completes exceptionally after exceptional
2025 <     * completion of source
2026 <     */
2027 <    public void testRunAfterBothAsync2E() {
2028 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2029 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2030 <        Noop r = new Noop();
2031 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2032 <        f.completeExceptionally(new CFException());
2033 <        f2.complete(two);
2034 <        checkCompletedWithWrappedCFException(g);
2035 <
2036 <        r = new Noop();
2037 <        f = new CompletableFuture<Integer>();
2038 <        f2 = new CompletableFuture<Integer>();
2039 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2040 <        f.complete(one);
2041 <        f2.completeExceptionally(new CFException());
2042 <        checkCompletedWithWrappedCFException(g);
2043 <    }
2044 <
2045 <    /**
2046 <     * runAfterBothAsync result completes exceptionally if action does
2047 <     */
2048 <    public void testRunAfterBothAsync3E() {
2049 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2050 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2051 <        FailingNoop r = new FailingNoop();
2052 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2053 <        f.complete(one);
2054 <        checkIncomplete(g);
2055 <        f2.complete(two);
2056 <        checkCompletedWithWrappedCFException(g);
2057 <    }
2058 <
2059 <    /**
2060 <     * runAfterBothAsync result completes exceptionally if either source cancelled
2061 <     */
2062 <    public void testRunAfterBothAsync4E() {
2063 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2064 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2065 <        Noop r = new Noop();
2066 <        CompletableFuture<Void> g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2067 <        assertTrue(f.cancel(true));
2068 <        f2.complete(two);
2069 <        checkCompletedWithWrappedCancellationException(g);
2070 <
2071 <        r = new Noop();
2072 <        f = new CompletableFuture<Integer>();
2073 <        f2 = new CompletableFuture<Integer>();
2074 <        g = f.runAfterBothAsync(f2, r, new ThreadExecutor());
2075 <        f.complete(one);
2076 <        assertTrue(f2.cancel(true));
2077 <        checkCompletedWithWrappedCancellationException(g);
2078 <    }
2220 >        checkCancelled(f);
2221 >        checkCompletedNormally(g, v1);
2222 >    }}
2223  
2224      /**
2225 <     * applyToEitherAsync result completes normally after normal
2226 <     * completion of sources
2225 >     * runAfterEither result completes normally after normal completion
2226 >     * of either source
2227       */
2228 <    public void testApplyToEitherAsyncE() {
2229 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2230 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2231 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2232 <        f.complete(one);
2233 <        checkCompletedNormally(g, two);
2234 <
2235 <        f = new CompletableFuture<Integer>();
2236 <        f.complete(one);
2237 <        f2 = new CompletableFuture<Integer>();
2238 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2239 <        checkCompletedNormally(g, two);
2240 <    }
2228 >    public void testRunAfterEither_normalCompletion1() {
2229 >        for (ExecutionMode m : ExecutionMode.values())
2230 >        for (Integer v1 : new Integer[] { 1, null })
2231 >        for (Integer v2 : new Integer[] { 2, null })
2232 >    {
2233 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2234 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2235 >        final Noop r = new Noop(m);
2236 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2237 >
2238 >        f.complete(v1);
2239 >        checkCompletedNormally(h, null);
2240 >        assertEquals(1, r.invocationCount);
2241 >        g.complete(v2);
2242 >
2243 >        checkCompletedNormally(f, v1);
2244 >        checkCompletedNormally(g, v2);
2245 >        checkCompletedNormally(h, null);
2246 >        assertEquals(1, r.invocationCount);
2247 >    }}
2248 >
2249 >    public void testRunAfterEither_normalCompletion2() {
2250 >        for (ExecutionMode m : ExecutionMode.values())
2251 >        for (Integer v1 : new Integer[] { 1, null })
2252 >        for (Integer v2 : new Integer[] { 2, null })
2253 >    {
2254 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2255 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2256 >        final Noop r = new Noop(m);
2257 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2258 >
2259 >        g.complete(v2);
2260 >        checkCompletedNormally(h, null);
2261 >        assertEquals(1, r.invocationCount);
2262 >        f.complete(v1);
2263 >
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);
2280 >        g.complete(v2);
2281 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2282 >
2283 >        checkCompletedNormally(h, null);
2284 >        checkCompletedNormally(f, v1);
2285 >        checkCompletedNormally(g, v2);
2286 >        assertEquals(1, r.invocationCount);
2287 >    }}
2288  
2289      /**
2290 <     * applyToEitherAsync result completes exceptionally after exceptional
2291 <     * completion of source
2290 >     * runAfterEither result completes exceptionally after exceptional
2291 >     * completion of either source
2292       */
2293 <    public void testApplyToEitherAsync2E() {
2294 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2295 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2296 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2297 <        f.completeExceptionally(new CFException());
2298 <        checkCompletedWithWrappedCFException(g);
2293 >    public void testRunAfterEither_exceptionalCompletion1() {
2294 >        for (ExecutionMode m : ExecutionMode.values())
2295 >        for (Integer v1 : new Integer[] { 1, null })
2296 >    {
2297 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2298 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2299 >        final Noop r = new Noop(m);
2300 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2301 >        final CFException ex = new CFException();
2302 >
2303 >        f.completeExceptionally(ex);
2304 >        checkCompletedWithWrappedCFException(h, ex);
2305 >        g.complete(v1);
2306 >
2307 >        assertEquals(0, r.invocationCount);
2308 >        checkCompletedNormally(g, v1);
2309 >        checkCompletedWithWrappedCFException(f, ex);
2310 >        checkCompletedWithWrappedCFException(h, ex);
2311 >    }}
2312 >
2313 >    public void testRunAfterEither_exceptionalCompletion2() {
2314 >        for (ExecutionMode m : ExecutionMode.values())
2315 >        for (Integer v1 : new Integer[] { 1, null })
2316 >    {
2317 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2318 >        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);
2340 >        final CFException ex = new CFException();
2341 >
2342 >        g.completeExceptionally(ex);
2343 >        f.complete(v1);
2344 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2345  
2346 <        f = new CompletableFuture<Integer>();
2347 <        f2 = new CompletableFuture<Integer>();
2348 <        f2.completeExceptionally(new CFException());
2349 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2350 <        f.complete(one);
2351 <        checkCompletedWithWrappedCFException(g);
2352 <    }
2346 >        // unspecified behavior
2347 >        Integer v;
2348 >        try {
2349 >            assertNull(h.join());
2350 >            assertEquals(1, r.invocationCount);
2351 >        } catch (CompletionException ok) {
2352 >            checkCompletedWithWrappedCFException(h, ex);
2353 >            assertEquals(0, r.invocationCount);
2354 >        }
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 <    /**
2374 <     * applyToEitherAsync result completes exceptionally if action does
2375 <     */
2376 <    public void testApplyToEitherAsync3E() {
2377 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2378 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2379 <        FailingFunction r = new FailingFunction();
2380 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, r, new ThreadExecutor());
2381 <        f.complete(one);
2126 <        checkCompletedWithWrappedCFException(g);
2127 <    }
2373 >        // unspecified behavior
2374 >        Integer v;
2375 >        try {
2376 >            assertNull(h.join());
2377 >            assertEquals(1, r.invocationCount);
2378 >        } catch (CompletionException ok) {
2379 >            checkCompletedWithWrappedCFException(h, ex);
2380 >            assertEquals(0, r.invocationCount);
2381 >        }
2382  
2383 <    /**
2384 <     * applyToEitherAsync result completes exceptionally if either source cancelled
2385 <     */
2132 <    public void testApplyToEitherAsync4E() {
2133 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2134 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2135 <        CompletableFuture<Integer> g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2136 <        assertTrue(f.cancel(true));
2137 <        checkCompletedWithWrappedCancellationException(g);
2138 <
2139 <        f = new CompletableFuture<Integer>();
2140 <        f2 = new CompletableFuture<Integer>();
2141 <        assertTrue(f2.cancel(true));
2142 <        g = f.applyToEitherAsync(f2, inc, new ThreadExecutor());
2143 <        checkCompletedWithWrappedCancellationException(g);
2144 <    }
2383 >        checkCompletedWithWrappedCFException(f, ex);
2384 >        checkCompletedNormally(g, v1);
2385 >    }}
2386  
2387      /**
2388 <     * acceptEitherAsync result completes normally after normal
2148 <     * completion of sources
2388 >     * runAfterEither result completes exceptionally if action does
2389       */
2390 <    public void testAcceptEitherAsyncE() {
2391 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2392 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2393 <        IncAction r = new IncAction();
2394 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2395 <        f.complete(one);
2396 <        checkCompletedNormally(g, null);
2397 <        assertEquals(r.value, 2);
2398 <
2399 <        r = new IncAction();
2400 <        f = new CompletableFuture<Integer>();
2401 <        f.complete(one);
2402 <        f2 = new CompletableFuture<Integer>();
2403 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2404 <        checkCompletedNormally(g, null);
2405 <        assertEquals(r.value, 2);
2406 <    }
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);
2420 >        checkCompletedNormally(f, v1);
2421 >        checkCompletedNormally(g, v2);
2422 >    }}
2423  
2424      /**
2425 <     * acceptEitherAsync result completes exceptionally after exceptional
2170 <     * completion of source
2425 >     * runAfterEither result completes exceptionally if either source cancelled
2426       */
2427 <    public void testAcceptEitherAsync2E() {
2428 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2429 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2430 <        IncAction r = new IncAction();
2431 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2432 <        f.completeExceptionally(new CFException());
2433 <        checkCompletedWithWrappedCFException(g);
2427 >    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 <        r = new IncAction();
2442 <        f = new CompletableFuture<Integer>();
2443 <        f2 = new CompletableFuture<Integer>();
2444 <        f2.completeExceptionally(new CFException());
2445 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2446 <        f.complete(one);
2447 <        checkCompletedWithWrappedCFException(g);
2448 <    }
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() {
2468 >        for (ExecutionMode m : ExecutionMode.values())
2469 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2470 >        for (Integer v1 : new Integer[] { 1, null })
2471 >    {
2472 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 >        final Noop r = new Noop(m);
2475 >
2476 >        assertTrue(g.cancel(mayInterruptIfRunning));
2477 >        f.complete(v1);
2478 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2479  
2480 <    /**
2481 <     * acceptEitherAsync result completes exceptionally if action does
2482 <     */
2483 <    public void testAcceptEitherAsync3E() {
2484 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2485 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2486 <        FailingConsumer r = new FailingConsumer();
2487 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2488 <        f.complete(one);
2489 <        checkCompletedWithWrappedCFException(g);
2490 <    }
2480 >        // unspecified behavior
2481 >        Integer v;
2482 >        try {
2483 >            assertNull(h.join());
2484 >            assertEquals(1, r.invocationCount);
2485 >        } catch (CompletionException ok) {
2486 >            checkCompletedWithWrappedCancellationException(h);
2487 >            assertEquals(0, r.invocationCount);
2488 >        }
2489 >
2490 >        checkCancelled(g);
2491 >        checkCompletedNormally(f, v1);
2492 >    }}
2493 >
2494 >    public void testRunAfterEither_sourceCancelled4() {
2495 >        for (ExecutionMode m : ExecutionMode.values())
2496 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2497 >        for (Integer v1 : new Integer[] { 1, null })
2498 >    {
2499 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501 >        final Noop r = new Noop(m);
2502 >
2503 >        assertTrue(f.cancel(mayInterruptIfRunning));
2504 >        g.complete(v1);
2505 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2506  
2507 <    /**
2508 <     * acceptEitherAsync result completes exceptionally if either
2509 <     * source cancelled
2510 <     */
2511 <    public void testAcceptEitherAsync4E() {
2512 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2513 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2514 <        IncAction r = new IncAction();
2515 <        CompletableFuture<Void> g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2210 <        assertTrue(f.cancel(true));
2211 <        checkCompletedWithWrappedCancellationException(g);
2507 >        // unspecified behavior
2508 >        Integer v;
2509 >        try {
2510 >            assertNull(h.join());
2511 >            assertEquals(1, r.invocationCount);
2512 >        } catch (CompletionException ok) {
2513 >            checkCompletedWithWrappedCancellationException(h);
2514 >            assertEquals(0, r.invocationCount);
2515 >        }
2516  
2517 <        r = new IncAction();
2518 <        f = new CompletableFuture<Integer>();
2519 <        f2 = new CompletableFuture<Integer>();
2216 <        assertTrue(f2.cancel(true));
2217 <        g = f.acceptEitherAsync(f2, r, new ThreadExecutor());
2218 <        checkCompletedWithWrappedCancellationException(g);
2219 <    }
2517 >        checkCancelled(f);
2518 >        checkCompletedNormally(g, v1);
2519 >    }}
2520  
2521      /**
2522 <     * runAfterEitherAsync result completes normally after normal
2223 <     * completion of sources
2522 >     * thenCompose result completes normally after normal completion of source
2523       */
2524 <    public void testRunAfterEitherAsyncE() {
2525 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2526 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2527 <        Noop r = new Noop();
2528 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2529 <        f.complete(one);
2530 <        checkCompletedNormally(g, null);
2531 <        assertTrue(r.ran);
2532 <
2533 <        r = new Noop();
2534 <        f = new CompletableFuture<Integer>();
2535 <        f.complete(one);
2536 <        f2 = new CompletableFuture<Integer>();
2537 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2538 <        checkCompletedNormally(g, null);
2240 <        assertTrue(r.ran);
2241 <    }
2524 >    public void testThenCompose_normalCompletion() {
2525 >        for (ExecutionMode m : ExecutionMode.values())
2526 >        for (boolean createIncomplete : new boolean[] { true, false })
2527 >        for (Integer v1 : new Integer[] { 1, null })
2528 >    {
2529 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2530 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2531 >        if (!createIncomplete) f.complete(v1);
2532 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2533 >        if (createIncomplete) f.complete(v1);
2534 >
2535 >        checkCompletedNormally(g, inc(v1));
2536 >        checkCompletedNormally(f, v1);
2537 >        assertEquals(1, r.invocationCount);
2538 >    }}
2539  
2540      /**
2541 <     * runAfterEitherAsync result completes exceptionally after exceptional
2541 >     * thenCompose result completes exceptionally after exceptional
2542       * completion of source
2543       */
2544 <    public void testRunAfterEitherAsync2E() {
2545 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2546 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2547 <        Noop r = new Noop();
2548 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2549 <        f.completeExceptionally(new CFException());
2550 <        checkCompletedWithWrappedCFException(g);
2551 <
2552 <        r = new Noop();
2553 <        f = new CompletableFuture<Integer>();
2554 <        f2 = new CompletableFuture<Integer>();
2555 <        f2.completeExceptionally(new CFException());
2556 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2557 <        f.complete(one);
2558 <        checkCompletedWithWrappedCFException(g);
2262 <    }
2263 <
2264 <    /**
2265 <     * runAfterEitherAsync result completes exceptionally if action does
2266 <     */
2267 <    public void testRunAfterEitherAsync3E() {
2268 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2269 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2270 <        FailingNoop r = new FailingNoop();
2271 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2272 <        f.complete(one);
2273 <        checkCompletedWithWrappedCFException(g);
2274 <    }
2544 >    public void testThenCompose_exceptionalCompletion() {
2545 >        for (ExecutionMode m : ExecutionMode.values())
2546 >        for (boolean createIncomplete : new boolean[] { true, false })
2547 >    {
2548 >        final CFException ex = new CFException();
2549 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2550 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2551 >        if (!createIncomplete) f.completeExceptionally(ex);
2552 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2553 >        if (createIncomplete) f.completeExceptionally(ex);
2554 >
2555 >        checkCompletedWithWrappedCFException(g, ex);
2556 >        checkCompletedWithWrappedCFException(f, ex);
2557 >        assertEquals(0, r.invocationCount);
2558 >    }}
2559  
2560      /**
2561 <     * runAfterEitherAsync result completes exceptionally if either
2278 <     * source cancelled
2279 <     */
2280 <    public void testRunAfterEitherAsync4E() {
2281 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2282 <        CompletableFuture<Integer> f2 = new CompletableFuture<Integer>();
2283 <        Noop r = new Noop();
2284 <        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2285 <        assertTrue(f.cancel(true));
2286 <        checkCompletedWithWrappedCancellationException(g);
2287 <
2288 <        r = new Noop();
2289 <        f = new CompletableFuture<Integer>();
2290 <        f2 = new CompletableFuture<Integer>();
2291 <        assertTrue(f2.cancel(true));
2292 <        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
2293 <        checkCompletedWithWrappedCancellationException(g);
2294 <    }
2295 <
2296 <    /**
2297 <     * thenComposeAsync result completes normally after normal
2298 <     * completion of source
2561 >     * thenCompose result completes exceptionally if action does
2562       */
2563 <    public void testThenComposeAsyncE() {
2564 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2565 <        CompletableFutureInc r = new CompletableFutureInc();
2566 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2567 <        f.complete(one);
2568 <        checkCompletedNormally(g, two);
2569 <    }
2563 >    public void testThenCompose_actionFailed() {
2564 >        for (ExecutionMode m : ExecutionMode.values())
2565 >        for (boolean createIncomplete : new boolean[] { true, false })
2566 >        for (Integer v1 : new Integer[] { 1, null })
2567 >    {
2568 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2569 >        final FailingCompletableFutureFunction r
2570 >            = new FailingCompletableFutureFunction(m);
2571 >        if (!createIncomplete) f.complete(v1);
2572 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2573 >        if (createIncomplete) f.complete(v1);
2574  
2308    /**
2309     * thenComposeAsync result completes exceptionally after
2310     * exceptional completion of source
2311     */
2312    public void testThenComposeAsync2E() {
2313        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2314        CompletableFutureInc r = new CompletableFutureInc();
2315        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2316        f.completeExceptionally(new CFException());
2575          checkCompletedWithWrappedCFException(g);
2576 <    }
2576 >        checkCompletedNormally(f, v1);
2577 >    }}
2578  
2579      /**
2580 <     * thenComposeAsync result completes exceptionally if action does
2580 >     * thenCompose result completes exceptionally if source cancelled
2581       */
2582 <    public void testThenComposeAsync3E() {
2583 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2584 <        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
2585 <        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2586 <        f.complete(one);
2587 <        checkCompletedWithWrappedCFException(g);
2588 <    }
2582 >    public void testThenCompose_sourceCancelled() {
2583 >        for (ExecutionMode m : ExecutionMode.values())
2584 >        for (boolean createIncomplete : new boolean[] { true, false })
2585 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2586 >    {
2587 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2588 >        final CompletableFutureInc r = new CompletableFutureInc(m);
2589 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2590 >        final CompletableFuture<Integer> g = m.thenCompose(f, r);
2591 >        if (createIncomplete) {
2592 >            checkIncomplete(g);
2593 >            assertTrue(f.cancel(mayInterruptIfRunning));
2594 >        }
2595  
2331    /**
2332     * thenComposeAsync result completes exceptionally if source cancelled
2333     */
2334    public void testThenComposeAsync4E() {
2335        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2336        CompletableFutureInc r = new CompletableFutureInc();
2337        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
2338        assertTrue(f.cancel(true));
2596          checkCompletedWithWrappedCancellationException(g);
2597 <    }
2597 >        checkCancelled(f);
2598 >    }}
2599  
2600      // other static methods
2601  
# Line 2346 | Line 2604 | public class CompletableFutureTest exten
2604       * with the value null
2605       */
2606      public void testAllOf_empty() throws Exception {
2607 <        CompletableFuture<?> f = CompletableFuture.allOf();
2607 >        CompletableFuture<Void> f = CompletableFuture.allOf();
2608          checkCompletedNormally(f, null);
2609      }
2610  
2611      /**
2612 <     * allOf returns a future completed when all components complete
2612 >     * allOf returns a future completed normally with the value null
2613 >     * when all components complete normally
2614       */
2615 <    public void testAllOf() throws Exception {
2615 >    public void testAllOf_normal() throws Exception {
2616          for (int k = 1; k < 20; ++k) {
2617 <            CompletableFuture[] fs = new CompletableFuture[k];
2617 >            CompletableFuture<Integer>[] fs
2618 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2619              for (int i = 0; i < k; ++i)
2620 <                fs[i] = new CompletableFuture<Integer>();
2621 <            CompletableFuture<?> f = CompletableFuture.allOf(fs);
2620 >                fs[i] = new CompletableFuture<>();
2621 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2622              for (int i = 0; i < k; ++i) {
2623                  checkIncomplete(f);
2624 +                checkIncomplete(CompletableFuture.allOf(fs));
2625                  fs[i].complete(one);
2626              }
2627 <            assertTrue(f.isDone());
2628 <            assertFalse(f.isCancelled());
2627 >            checkCompletedNormally(f, null);
2628 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2629 >        }
2630 >    }
2631 >
2632 >    public void testAllOf_backwards() throws Exception {
2633 >        for (int k = 1; k < 20; ++k) {
2634 >            CompletableFuture<Integer>[] fs
2635 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2636 >            for (int i = 0; i < k; ++i)
2637 >                fs[i] = new CompletableFuture<>();
2638 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2639 >            for (int i = k - 1; i >= 0; i--) {
2640 >                checkIncomplete(f);
2641 >                checkIncomplete(CompletableFuture.allOf(fs));
2642 >                fs[i].complete(one);
2643 >            }
2644 >            checkCompletedNormally(f, null);
2645 >            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2646          }
2647      }
2648  
# Line 2372 | Line 2650 | public class CompletableFutureTest exten
2650       * anyOf(no component futures) returns an incomplete future
2651       */
2652      public void testAnyOf_empty() throws Exception {
2653 <        CompletableFuture<?> f = CompletableFuture.anyOf();
2653 >        CompletableFuture<Object> f = CompletableFuture.anyOf();
2654          checkIncomplete(f);
2655      }
2656  
2657      /**
2658 <     * allOf returns a future completed when any components complete
2658 >     * anyOf returns a future completed normally with a value when
2659 >     * a component future does
2660       */
2661 <    public void testAnyOf() throws Exception {
2662 <        for (int k = 1; k < 20; ++k) {
2661 >    public void testAnyOf_normal() throws Exception {
2662 >        for (int k = 0; k < 10; ++k) {
2663              CompletableFuture[] fs = new CompletableFuture[k];
2664              for (int i = 0; i < k; ++i)
2665 <                fs[i] = new CompletableFuture<Integer>();
2666 <            CompletableFuture<?> f = CompletableFuture.anyOf(fs);
2665 >                fs[i] = new CompletableFuture<>();
2666 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2667              checkIncomplete(f);
2668              for (int i = 0; i < k; ++i) {
2669                  fs[i].complete(one);
2670 <                assertTrue(f.isDone());
2670 >                checkCompletedNormally(f, one);
2671 >                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
2672 >            }
2673 >        }
2674 >    }
2675 >
2676 >    /**
2677 >     * anyOf result completes exceptionally when any component does.
2678 >     */
2679 >    public void testAnyOf_exceptional() throws Exception {
2680 >        for (int k = 0; k < 10; ++k) {
2681 >            CompletableFuture[] fs = new CompletableFuture[k];
2682 >            for (int i = 0; i < k; ++i)
2683 >                fs[i] = new CompletableFuture<>();
2684 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2685 >            checkIncomplete(f);
2686 >            for (int i = 0; i < k; ++i) {
2687 >                fs[i].completeExceptionally(new CFException());
2688 >                checkCompletedWithWrappedCFException(f);
2689 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
2690              }
2691          }
2692      }
# Line 2397 | Line 2695 | public class CompletableFutureTest exten
2695       * Completion methods throw NullPointerException with null arguments
2696       */
2697      public void testNPE() {
2698 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2699 <        CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2700 <        CompletableFuture h;
2701 <        try { h = f.thenApply(null); } catch (NullPointerException ok) {}
2702 <        try { h = f.thenAccept(null); } catch (NullPointerException ok) {}
2703 <        try { h = f.thenRun(null); } catch (NullPointerException ok) {}
2704 <        try { h = f.thenCombine(g, null); } catch (NullPointerException ok) {}
2705 <        try { h = f.thenCombine(null, null); } catch (NullPointerException ok) {}
2706 <        try { h = f.applyToEither(g, null); } catch (NullPointerException ok) {}
2707 <        try { h = f.applyToEither(null, null); } catch (NullPointerException ok) {}
2708 <        try { h = f.thenAcceptBoth(g, null); } catch (NullPointerException ok) {}
2709 <        try { h = f.thenAcceptBoth(null, null); } catch (NullPointerException ok) {}
2710 <        try { h = f.runAfterEither(g, null); } catch (NullPointerException ok) {}
2711 <        try { h = f.runAfterEither(null, null); } catch (NullPointerException ok) {}
2712 <        try { h = f.runAfterBoth(g, null); } catch (NullPointerException ok) {}
2713 <        try { h = f.runAfterBoth(null, null); } catch (NullPointerException ok) {}
2714 <        try { h = f.exceptionally(null); } catch (NullPointerException ok) {}
2715 <        try { h = f.handle(null); } catch (NullPointerException ok) {}
2716 <        try { h = f.thenCompose(null); } catch (NullPointerException ok) {}
2717 <
2718 <        try { h = f.thenApplyAsync(null); } catch (NullPointerException ok) {}
2719 <        try { h = f.thenAcceptAsync(null); } catch (NullPointerException ok) {}
2720 <        try { h = f.thenRunAsync(null); } catch (NullPointerException ok) {}
2721 <        try { h = f.thenCombineAsync(g, null); } catch (NullPointerException ok) {}
2722 <        try { h = f.thenCombineAsync(null, null); } catch (NullPointerException ok) {}
2723 <        try { h = f.applyToEitherAsync(g, null); } catch (NullPointerException ok) {}
2724 <        try { h = f.applyToEitherAsync(null, null); } catch (NullPointerException ok) {}
2725 <        try { h = f.thenAcceptBothAsync(g, null); } catch (NullPointerException ok) {}
2726 <        try { h = f.thenAcceptBothAsync(null, null); } catch (NullPointerException ok) {}
2727 <        try { h = f.runAfterEitherAsync(g, null); } catch (NullPointerException ok) {}
2728 <        try { h = f.runAfterEitherAsync(null, null); } catch (NullPointerException ok) {}
2729 <        try { h = f.runAfterBothAsync(g, null); } catch (NullPointerException ok) {}
2730 <        try { h = f.runAfterBothAsync(null, null); } catch (NullPointerException ok) {}
2698 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2699 >        CompletableFuture<Integer> g = new CompletableFuture<>();
2700 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2701 >        CompletableFuture<?> h;
2702 >        ThreadExecutor exec = new ThreadExecutor();
2703 >
2704 >        Runnable[] throwingActions = {
2705 >            () -> CompletableFuture.supplyAsync(null),
2706 >            () -> CompletableFuture.supplyAsync(null, exec),
2707 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2708 >
2709 >            () -> CompletableFuture.runAsync(null),
2710 >            () -> CompletableFuture.runAsync(null, exec),
2711 >            () -> CompletableFuture.runAsync(() -> {}, null),
2712 >
2713 >            () -> f.completeExceptionally(null),
2714 >
2715 >            () -> f.thenApply(null),
2716 >            () -> f.thenApplyAsync(null),
2717 >            () -> f.thenApplyAsync((x) -> x, null),
2718 >            () -> f.thenApplyAsync(null, exec),
2719 >
2720 >            () -> f.thenAccept(null),
2721 >            () -> f.thenAcceptAsync(null),
2722 >            () -> f.thenAcceptAsync((x) -> {} , null),
2723 >            () -> f.thenAcceptAsync(null, exec),
2724 >
2725 >            () -> f.thenRun(null),
2726 >            () -> f.thenRunAsync(null),
2727 >            () -> f.thenRunAsync(() -> {} , null),
2728 >            () -> f.thenRunAsync(null, exec),
2729 >
2730 >            () -> f.thenCombine(g, null),
2731 >            () -> f.thenCombineAsync(g, null),
2732 >            () -> f.thenCombineAsync(g, null, exec),
2733 >            () -> f.thenCombine(nullFuture, (x, y) -> x),
2734 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x),
2735 >            () -> f.thenCombineAsync(nullFuture, (x, y) -> x, exec),
2736 >            () -> f.thenCombineAsync(g, (x, y) -> x, null),
2737 >
2738 >            () -> f.thenAcceptBoth(g, null),
2739 >            () -> f.thenAcceptBothAsync(g, null),
2740 >            () -> f.thenAcceptBothAsync(g, null, exec),
2741 >            () -> f.thenAcceptBoth(nullFuture, (x, y) -> {}),
2742 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}),
2743 >            () -> f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec),
2744 >            () -> f.thenAcceptBothAsync(g, (x, y) -> {}, null),
2745 >
2746 >            () -> f.runAfterBoth(g, null),
2747 >            () -> f.runAfterBothAsync(g, null),
2748 >            () -> f.runAfterBothAsync(g, null, exec),
2749 >            () -> f.runAfterBoth(nullFuture, () -> {}),
2750 >            () -> f.runAfterBothAsync(nullFuture, () -> {}),
2751 >            () -> f.runAfterBothAsync(nullFuture, () -> {}, exec),
2752 >            () -> f.runAfterBothAsync(g, () -> {}, null),
2753 >
2754 >            () -> f.applyToEither(g, null),
2755 >            () -> f.applyToEitherAsync(g, null),
2756 >            () -> f.applyToEitherAsync(g, null, exec),
2757 >            () -> f.applyToEither(nullFuture, (x) -> x),
2758 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x),
2759 >            () -> f.applyToEitherAsync(nullFuture, (x) -> x, exec),
2760 >            () -> f.applyToEitherAsync(g, (x) -> x, null),
2761 >
2762 >            () -> f.acceptEither(g, null),
2763 >            () -> f.acceptEitherAsync(g, null),
2764 >            () -> f.acceptEitherAsync(g, null, exec),
2765 >            () -> f.acceptEither(nullFuture, (x) -> {}),
2766 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}),
2767 >            () -> f.acceptEitherAsync(nullFuture, (x) -> {}, exec),
2768 >            () -> f.acceptEitherAsync(g, (x) -> {}, null),
2769 >
2770 >            () -> f.runAfterEither(g, null),
2771 >            () -> f.runAfterEitherAsync(g, null),
2772 >            () -> f.runAfterEitherAsync(g, null, exec),
2773 >            () -> f.runAfterEither(nullFuture, () -> {}),
2774 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}),
2775 >            () -> f.runAfterEitherAsync(nullFuture, () -> {}, exec),
2776 >            () -> f.runAfterEitherAsync(g, () -> {}, null),
2777 >
2778 >            () -> f.thenCompose(null),
2779 >            () -> f.thenComposeAsync(null),
2780 >            () -> f.thenComposeAsync(new CompletableFutureInc(ExecutionMode.EXECUTOR), null),
2781 >            () -> f.thenComposeAsync(null, exec),
2782 >
2783 >            () -> f.exceptionally(null),
2784 >
2785 >            () -> f.handle(null),
2786 >
2787 >            () -> CompletableFuture.allOf((CompletableFuture<?>)null),
2788 >            () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
2789 >            () -> CompletableFuture.allOf(f, null),
2790 >            () -> CompletableFuture.allOf(null, f),
2791 >
2792 >            () -> CompletableFuture.anyOf((CompletableFuture<?>)null),
2793 >            () -> CompletableFuture.anyOf((CompletableFuture<?>[])null),
2794 >            () -> CompletableFuture.anyOf(f, null),
2795 >            () -> CompletableFuture.anyOf(null, f),
2796 >
2797 >            () -> f.obtrudeException(null),
2798 >        };
2799 >
2800 >        assertThrows(NullPointerException.class, throwingActions);
2801 >        assertEquals(0, exec.count.get());
2802 >    }
2803 >
2804 >    /**
2805 >     * toCompletableFuture returns this CompletableFuture.
2806 >     */
2807 >    public void testToCompletableFuture() {
2808 >        CompletableFuture<Integer> f = new CompletableFuture<>();
2809 >        assertSame(f, f.toCompletableFuture());
2810 >    }
2811 >
2812 >    /**
2813 >     * whenComplete action executes on normal completion, propagating
2814 >     * source result.
2815 >     */
2816 >    public void testWhenComplete_normalCompletion1() {
2817 >        for (ExecutionMode m : ExecutionMode.values())
2818 >        for (boolean createIncomplete : new boolean[] { true, false })
2819 >        for (Integer v1 : new Integer[] { 1, null })
2820 >    {
2821 >        final AtomicInteger a = new AtomicInteger(0);
2822 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2823 >        if (!createIncomplete) f.complete(v1);
2824 >        final CompletableFuture<Integer> g = m.whenComplete
2825 >            (f,
2826 >             (Integer x, Throwable t) -> {
2827 >                threadAssertSame(x, v1);
2828 >                threadAssertNull(t);
2829 >                a.getAndIncrement();
2830 >            });
2831 >        if (createIncomplete) f.complete(v1);
2832 >
2833 >        checkCompletedNormally(g, v1);
2834 >        checkCompletedNormally(f, v1);
2835 >        assertEquals(1, a.get());
2836 >    }}
2837 >
2838 >    /**
2839 >     * whenComplete action executes on exceptional completion, propagating
2840 >     * source result.
2841 >     */
2842 >    public void testWhenComplete_exceptionalCompletion() {
2843 >        for (ExecutionMode m : ExecutionMode.values())
2844 >        for (boolean createIncomplete : new boolean[] { true, false })
2845 >        for (Integer v1 : new Integer[] { 1, null })
2846 >    {
2847 >        final AtomicInteger a = new AtomicInteger(0);
2848 >        final CFException ex = new CFException();
2849 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2850 >        if (!createIncomplete) f.completeExceptionally(ex);
2851 >        final CompletableFuture<Integer> g = m.whenComplete
2852 >            (f,
2853 >             (Integer x, Throwable t) -> {
2854 >                threadAssertNull(x);
2855 >                threadAssertSame(t, ex);
2856 >                a.getAndIncrement();
2857 >            });
2858 >        if (createIncomplete) f.completeExceptionally(ex);
2859 >        checkCompletedWithWrappedCFException(f, ex);
2860 >        checkCompletedWithWrappedCFException(g, ex);
2861 >        assertEquals(1, a.get());
2862 >    }}
2863 >
2864 >    /**
2865 >     * whenComplete action executes on cancelled source, propagating
2866 >     * CancellationException.
2867 >     */
2868 >    public void testWhenComplete_sourceCancelled() {
2869 >        for (ExecutionMode m : ExecutionMode.values())
2870 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2871 >        for (boolean createIncomplete : new boolean[] { true, false })
2872 >    {
2873 >        final AtomicInteger a = new AtomicInteger(0);
2874 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2876 >        final CompletableFuture<Integer> g = m.whenComplete
2877 >            (f,
2878 >             (Integer x, Throwable t) -> {
2879 >                threadAssertNull(x);
2880 >                threadAssertTrue(t instanceof CancellationException);
2881 >                a.getAndIncrement();
2882 >            });
2883 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2884  
2885 <    }
2885 >        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2886 >        checkCompletedWithWrappedCancellationException(g);
2887 >        checkCancelled(f);
2888 >        assertEquals(1, a.get());
2889 >    }}
2890  
2891 +    /**
2892 +     * If a whenComplete action throws an exception when triggered by
2893 +     * a normal completion, it completes exceptionally
2894 +     */
2895 +    public void testWhenComplete_actionFailed() {
2896 +        for (boolean createIncomplete : new boolean[] { true, false })
2897 +        for (ExecutionMode m : ExecutionMode.values())
2898 +        for (Integer v1 : new Integer[] { 1, null })
2899 +    {
2900 +        final AtomicInteger a = new AtomicInteger(0);
2901 +        final CFException ex = new CFException();
2902 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2903 +        if (!createIncomplete) f.complete(v1);
2904 +        final CompletableFuture<Integer> g = m.whenComplete
2905 +            (f,
2906 +             (Integer x, Throwable t) -> {
2907 +                threadAssertSame(x, v1);
2908 +                threadAssertNull(t);
2909 +                a.getAndIncrement();
2910 +                throw ex;
2911 +            });
2912 +        if (createIncomplete) f.complete(v1);
2913 +        checkCompletedNormally(f, v1);
2914 +        checkCompletedWithWrappedCFException(g, ex);
2915 +        assertEquals(1, a.get());
2916 +    }}
2917 +
2918 +    /**
2919 +     * If a whenComplete action throws an exception when triggered by
2920 +     * a source completion that also throws an exception, the source
2921 +     * exception takes precedence.
2922 +     */
2923 +    public void testWhenComplete_actionFailedSourceFailed() {
2924 +        for (boolean createIncomplete : new boolean[] { true, false })
2925 +        for (ExecutionMode m : ExecutionMode.values())
2926 +        for (Integer v1 : new Integer[] { 1, null })
2927 +    {
2928 +        final AtomicInteger a = new AtomicInteger(0);
2929 +        final CFException ex1 = new CFException();
2930 +        final CFException ex2 = new CFException();
2931 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
2932 +
2933 +        if (!createIncomplete) f.completeExceptionally(ex1);
2934 +        final CompletableFuture<Integer> g = m.whenComplete
2935 +            (f,
2936 +             (Integer x, Throwable t) -> {
2937 +                threadAssertSame(t, ex1);
2938 +                threadAssertNull(x);
2939 +                a.getAndIncrement();
2940 +                throw ex2;
2941 +            });
2942 +        if (createIncomplete) f.completeExceptionally(ex1);
2943 +
2944 +        checkCompletedWithWrappedCFException(f, ex1);
2945 +        checkCompletedWithWrappedCFException(g, ex1);
2946 +        assertEquals(1, a.get());
2947 +    }}
2948  
2949   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines