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.60 by jsr166, Tue Jun 3 06:16:41 2014 UTC vs.
Revision 1.79 by jsr166, Mon Jun 16 17:08:15 2014 UTC

# Line 105 | Line 105 | public class CompletableFutureTest exten
105          assertTrue(f.toString().contains("[Completed exceptionally]"));
106      }
107  
108 <    void checkCompletedWithWrappedCFException(CompletableFuture<?> f,
109 <                                              CFException ex) {
108 >    <U> void checkCompletedExceptionallyWithRootCause(CompletableFuture<U> f,
109 >                                                      Throwable ex) {
110          try {
111              f.get(LONG_DELAY_MS, MILLISECONDS);
112              shouldThrow();
# Line 131 | Line 131 | public class CompletableFutureTest exten
131          } catch (ExecutionException success) {
132              assertSame(ex, success.getCause());
133          } catch (Throwable fail) { threadUnexpectedException(fail); }
134 +
135          assertTrue(f.isDone());
136          assertFalse(f.isCancelled());
137          assertTrue(f.toString().contains("[Completed exceptionally]"));
138      }
139  
140 +    <U> void checkCompletedWithWrappedException(CompletableFuture<U> f,
141 +                                                Throwable ex) {
142 +        checkCompletedExceptionallyWithRootCause(f, ex);
143 +        try {
144 +            CompletableFuture<Throwable> spy = f.handle
145 +                ((U u, Throwable t) -> t);
146 +            assertTrue(spy.join() instanceof CompletionException);
147 +            assertSame(ex, spy.join().getCause());
148 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
149 +    }
150 +
151 +    <U> void checkCompletedExceptionally(CompletableFuture<U> f, Throwable ex) {
152 +        checkCompletedExceptionallyWithRootCause(f, ex);
153 +        try {
154 +            CompletableFuture<Throwable> spy = f.handle
155 +                ((U u, Throwable t) -> t);
156 +            assertSame(ex, spy.join());
157 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
158 +    }
159 +
160      void checkCancelled(CompletableFuture<?> f) {
161          try {
162              f.get(LONG_DELAY_MS, MILLISECONDS);
# Line 206 | Line 227 | public class CompletableFutureTest exten
227       * isCancelled, join, get, and getNow
228       */
229      public void testComplete() {
230 +        for (Integer v1 : new Integer[] { 1, null })
231 +    {
232          CompletableFuture<Integer> f = new CompletableFuture<>();
233          checkIncomplete(f);
234 <        f.complete(one);
235 <        checkCompletedNormally(f, one);
236 <    }
234 >        assertTrue(f.complete(v1));
235 >        assertFalse(f.complete(v1));
236 >        checkCompletedNormally(f, v1);
237 >    }}
238  
239      /**
240       * completeExceptionally completes exceptionally, as indicated by
# Line 218 | Line 242 | public class CompletableFutureTest exten
242       */
243      public void testCompleteExceptionally() {
244          CompletableFuture<Integer> f = new CompletableFuture<>();
245 +        CFException ex = new CFException();
246          checkIncomplete(f);
247 <        f.completeExceptionally(new CFException());
248 <        checkCompletedWithWrappedCFException(f);
247 >        f.completeExceptionally(ex);
248 >        checkCompletedExceptionally(f, ex);
249      }
250  
251      /**
# Line 228 | Line 253 | public class CompletableFutureTest exten
253       * methods isDone, isCancelled, join, get, and getNow
254       */
255      public void testCancel() {
256 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
257 +    {
258          CompletableFuture<Integer> f = new CompletableFuture<>();
259          checkIncomplete(f);
260          assertTrue(f.cancel(true));
261 +        assertTrue(f.cancel(true));
262          checkCancelled(f);
263 <    }
263 >    }}
264  
265      /**
266       * obtrudeValue forces completion with given value
# Line 240 | Line 268 | public class CompletableFutureTest exten
268      public void testObtrudeValue() {
269          CompletableFuture<Integer> f = new CompletableFuture<>();
270          checkIncomplete(f);
271 <        f.complete(one);
271 >        assertTrue(f.complete(one));
272          checkCompletedNormally(f, one);
273          f.obtrudeValue(three);
274          checkCompletedNormally(f, three);
# Line 261 | Line 289 | public class CompletableFutureTest exten
289       * obtrudeException forces completion with given exception
290       */
291      public void testObtrudeException() {
292 <        CompletableFuture<Integer> f = new CompletableFuture<>();
293 <        checkIncomplete(f);
294 <        f.complete(one);
295 <        checkCompletedNormally(f, one);
296 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
292 >        for (Integer v1 : new Integer[] { 1, null })
293 >    {
294 >        CFException ex;
295 >        CompletableFuture<Integer> f;
296 >
297          f = new CompletableFuture<>();
298 <        f.obtrudeException(new CFException());
299 <        checkCompletedWithWrappedCFException(f);
298 >        assertTrue(f.complete(v1));
299 >        for (int i = 0; i < 2; i++) {
300 >            f.obtrudeException(ex = new CFException());
301 >            checkCompletedExceptionally(f, ex);
302 >        }
303 >
304 >        f = new CompletableFuture<>();
305 >        for (int i = 0; i < 2; i++) {
306 >            f.obtrudeException(ex = new CFException());
307 >            checkCompletedExceptionally(f, ex);
308 >        }
309 >
310          f = new CompletableFuture<>();
311 +        f.completeExceptionally(ex = new CFException());
312 +        f.obtrudeValue(v1);
313 +        checkCompletedNormally(f, v1);
314 +        f.obtrudeException(ex = new CFException());
315 +        checkCompletedExceptionally(f, ex);
316          f.completeExceptionally(new CFException());
317 <        f.obtrudeValue(four);
318 <        checkCompletedNormally(f, four);
319 <        f.obtrudeException(new CFException());
320 <        checkCompletedWithWrappedCFException(f);
279 <    }
317 >        checkCompletedExceptionally(f, ex);
318 >        assertFalse(f.complete(v1));
319 >        checkCompletedExceptionally(f, ex);
320 >    }}
321  
322      /**
323       * getNumberOfDependents returns number of dependent tasks
324       */
325      public void testGetNumberOfDependents() {
326 +        for (ExecutionMode m : ExecutionMode.values())
327 +        for (Integer v1 : new Integer[] { 1, null })
328 +    {
329          CompletableFuture<Integer> f = new CompletableFuture<>();
330          assertEquals(0, f.getNumberOfDependents());
331 <        CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT));
331 >        final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
332          assertEquals(1, f.getNumberOfDependents());
333          assertEquals(0, g.getNumberOfDependents());
334 <        CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT));
334 >        final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
335          assertEquals(2, f.getNumberOfDependents());
336 <        f.complete(1);
336 >        assertEquals(0, h.getNumberOfDependents());
337 >        assertTrue(f.complete(v1));
338          checkCompletedNormally(g, null);
339 +        checkCompletedNormally(h, null);
340          assertEquals(0, f.getNumberOfDependents());
341          assertEquals(0, g.getNumberOfDependents());
342 <    }
342 >        assertEquals(0, h.getNumberOfDependents());
343 >    }}
344  
345      /**
346       * toString indicates current completion state
# Line 304 | Line 351 | public class CompletableFutureTest exten
351          f = new CompletableFuture<String>();
352          assertTrue(f.toString().contains("[Not completed]"));
353  
354 <        f.complete("foo");
354 >        assertTrue(f.complete("foo"));
355          assertTrue(f.toString().contains("[Completed normally]"));
356  
357          f = new CompletableFuture<String>();
358 <        f.completeExceptionally(new IndexOutOfBoundsException());
358 >        assertTrue(f.completeExceptionally(new IndexOutOfBoundsException()));
359          assertTrue(f.toString().contains("[Completed exceptionally]"));
360 +
361 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
362 +            f = new CompletableFuture<String>();
363 +            assertTrue(f.cancel(mayInterruptIfRunning));
364 +            assertTrue(f.toString().contains("[Completed exceptionally]"));
365 +        }
366      }
367  
368      /**
# Line 320 | Line 373 | public class CompletableFutureTest exten
373          checkCompletedNormally(f, "test");
374      }
375  
376 <    static final class IntegerSupplier implements Supplier<Integer> {
324 <        final ExecutionMode m;
376 >    abstract class CheckedAction {
377          int invocationCount = 0;
378 +        final ExecutionMode m;
379 +        CheckedAction(ExecutionMode m) { this.m = m; }
380 +        void invoked() {
381 +            m.checkExecutionMode();
382 +            assertEquals(0, invocationCount++);
383 +        }
384 +        void assertNotInvoked() { assertEquals(0, invocationCount); }
385 +        void assertInvoked() { assertEquals(1, invocationCount); }
386 +    }
387 +
388 +    abstract class CheckedIntegerAction extends CheckedAction {
389 +        Integer value;
390 +        CheckedIntegerAction(ExecutionMode m) { super(m); }
391 +        void assertValue(Integer expected) {
392 +            assertInvoked();
393 +            assertEquals(expected, value);
394 +        }
395 +    }
396 +
397 +    class IntegerSupplier extends CheckedAction
398 +        implements Supplier<Integer>
399 +    {
400          final Integer value;
401          IntegerSupplier(ExecutionMode m, Integer value) {
402 <            this.m = m;
402 >            super(m);
403              this.value = value;
404          }
405          public Integer get() {
406 <            m.checkExecutionMode();
333 <            invocationCount++;
406 >            invoked();
407              return value;
408          }
409      }
# Line 340 | Line 413 | public class CompletableFutureTest exten
413          return (x == null) ? null : x + 1;
414      }
415  
416 <    static final class IncAction implements Consumer<Integer> {
417 <        int invocationCount = 0;
418 <        Integer value;
416 >    class NoopConsumer extends CheckedIntegerAction
417 >        implements Consumer<Integer>
418 >    {
419 >        NoopConsumer(ExecutionMode m) { super(m); }
420          public void accept(Integer x) {
421 <            invocationCount++;
422 <            value = inc(x);
421 >            invoked();
422 >            value = x;
423          }
424      }
425 <    static final class IncFunction implements Function<Integer,Integer> {
426 <        final ExecutionMode m;
427 <        int invocationCount = 0;
428 <        Integer value;
429 <        IncFunction(ExecutionMode m) { this.m = m; }
425 >
426 >    class IncFunction extends CheckedIntegerAction
427 >        implements Function<Integer,Integer>
428 >    {
429 >        IncFunction(ExecutionMode m) { super(m); }
430          public Integer apply(Integer x) {
431 <            m.checkExecutionMode();
358 <            invocationCount++;
431 >            invoked();
432              return value = inc(x);
433          }
434      }
# Line 368 | Line 441 | public class CompletableFutureTest exten
441              - ((y == null) ? 99 : y.intValue());
442      }
443  
444 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
445 <        final ExecutionMode m;
446 <        int invocationCount = 0;
447 <        Integer value;
375 <        // Check this action was invoked exactly once when result is computed.
376 <        SubtractAction(ExecutionMode m) { this.m = m; }
444 >    class SubtractAction extends CheckedIntegerAction
445 >        implements BiConsumer<Integer, Integer>
446 >    {
447 >        SubtractAction(ExecutionMode m) { super(m); }
448          public void accept(Integer x, Integer y) {
449 <            m.checkExecutionMode();
379 <            invocationCount++;
449 >            invoked();
450              value = subtract(x, y);
451          }
452      }
453 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
454 <        final ExecutionMode m;
455 <        int invocationCount = 0;
456 <        Integer value;
457 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
453 >
454 >    class SubtractFunction extends CheckedIntegerAction
455 >        implements BiFunction<Integer, Integer, Integer>
456 >    {
457 >        SubtractFunction(ExecutionMode m) { super(m); }
458          public Integer apply(Integer x, Integer y) {
459 <            m.checkExecutionMode();
391 <            invocationCount++;
459 >            invoked();
460              return value = subtract(x, y);
461          }
462      }
463  
464 <    static final class Noop implements Runnable {
465 <        final ExecutionMode m;
398 <        int invocationCount = 0;
399 <        Noop(ExecutionMode m) { this.m = m; }
464 >    class Noop extends CheckedAction implements Runnable {
465 >        Noop(ExecutionMode m) { super(m); }
466          public void run() {
467 <            m.checkExecutionMode();
402 <            invocationCount++;
467 >            invoked();
468          }
469      }
470  
471 <    static final class FailingSupplier implements Supplier<Integer> {
472 <        final ExecutionMode m;
473 <        int invocationCount = 0;
474 <        FailingSupplier(ExecutionMode m) { this.m = m; }
471 >    class FailingSupplier extends CheckedAction
472 >        implements Supplier<Integer>
473 >    {
474 >        FailingSupplier(ExecutionMode m) { super(m); }
475          public Integer get() {
476 <            m.checkExecutionMode();
412 <            invocationCount++;
476 >            invoked();
477              throw new CFException();
478          }
479      }
480 <    static final class FailingConsumer implements Consumer<Integer> {
481 <        final ExecutionMode m;
482 <        int invocationCount = 0;
483 <        FailingConsumer(ExecutionMode m) { this.m = m; }
480 >
481 >    class FailingConsumer extends CheckedIntegerAction
482 >        implements Consumer<Integer>
483 >    {
484 >        FailingConsumer(ExecutionMode m) { super(m); }
485          public void accept(Integer x) {
486 <            m.checkExecutionMode();
487 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              throw new CFException();
489          }
490      }
491 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
492 <        final ExecutionMode m;
493 <        int invocationCount = 0;
494 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
491 >
492 >    class FailingBiConsumer extends CheckedIntegerAction
493 >        implements BiConsumer<Integer, Integer>
494 >    {
495 >        FailingBiConsumer(ExecutionMode m) { super(m); }
496          public void accept(Integer x, Integer y) {
497 <            m.checkExecutionMode();
498 <            invocationCount++;
497 >            invoked();
498 >            value = subtract(x, y);
499              throw new CFException();
500          }
501      }
502 <    static final class FailingFunction implements Function<Integer, Integer> {
503 <        final ExecutionMode m;
504 <        int invocationCount = 0;
505 <        FailingFunction(ExecutionMode m) { this.m = m; }
502 >
503 >    class FailingFunction extends CheckedIntegerAction
504 >        implements Function<Integer, Integer>
505 >    {
506 >        FailingFunction(ExecutionMode m) { super(m); }
507          public Integer apply(Integer x) {
508 <            m.checkExecutionMode();
509 <            invocationCount++;
508 >            invoked();
509 >            value = x;
510              throw new CFException();
511          }
512      }
513 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
514 <        final ExecutionMode m;
515 <        int invocationCount = 0;
516 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
513 >
514 >    class FailingBiFunction extends CheckedIntegerAction
515 >        implements BiFunction<Integer, Integer, Integer>
516 >    {
517 >        FailingBiFunction(ExecutionMode m) { super(m); }
518          public Integer apply(Integer x, Integer y) {
519 <            m.checkExecutionMode();
520 <            invocationCount++;
519 >            invoked();
520 >            value = subtract(x, y);
521              throw new CFException();
522          }
523      }
524 <    static final class FailingRunnable implements Runnable {
525 <        final ExecutionMode m;
526 <        int invocationCount = 0;
459 <        FailingRunnable(ExecutionMode m) { this.m = m; }
524 >
525 >    class FailingRunnable extends CheckedAction implements Runnable {
526 >        FailingRunnable(ExecutionMode m) { super(m); }
527          public void run() {
528 <            m.checkExecutionMode();
462 <            invocationCount++;
528 >            invoked();
529              throw new CFException();
530          }
531      }
532  
533 <    static final class CompletableFutureInc
534 <        implements Function<Integer, CompletableFuture<Integer>> {
535 <        final ExecutionMode m;
536 <        int invocationCount = 0;
537 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
533 >
534 >    class CompletableFutureInc extends CheckedIntegerAction
535 >        implements Function<Integer, CompletableFuture<Integer>>
536 >    {
537 >        CompletableFutureInc(ExecutionMode m) { super(m); }
538          public CompletableFuture<Integer> apply(Integer x) {
539 <            m.checkExecutionMode();
540 <            invocationCount++;
539 >            invoked();
540 >            value = x;
541              CompletableFuture<Integer> f = new CompletableFuture<>();
542 <            f.complete(inc(x));
542 >            assertTrue(f.complete(inc(x)));
543              return f;
544          }
545      }
546  
547 <    static final class FailingCompletableFutureFunction
548 <        implements Function<Integer, CompletableFuture<Integer>> {
549 <        final ExecutionMode m;
550 <        int invocationCount = 0;
485 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
547 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
548 >        implements Function<Integer, CompletableFuture<Integer>>
549 >    {
550 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
551          public CompletableFuture<Integer> apply(Integer x) {
552 <            m.checkExecutionMode();
553 <            invocationCount++;
552 >            invoked();
553 >            value = x;
554              throw new CFException();
555          }
556      }
# Line 782 | Line 847 | public class CompletableFutureTest exten
847      {
848          final AtomicInteger a = new AtomicInteger(0);
849          final CompletableFuture<Integer> f = new CompletableFuture<>();
850 <        if (!createIncomplete) f.complete(v1);
850 >        if (!createIncomplete) assertTrue(f.complete(v1));
851          final CompletableFuture<Integer> g = f.exceptionally
852              ((Throwable t) -> {
853                  // Should not be called
854                  a.getAndIncrement();
855                  throw new AssertionError();
856              });
857 <        if (createIncomplete) f.complete(v1);
857 >        if (createIncomplete) assertTrue(f.complete(v1));
858  
859          checkCompletedNormally(g, v1);
860          checkCompletedNormally(f, v1);
861          assertEquals(0, a.get());
862      }}
863  
799
864      /**
865       * exceptionally action completes with function value on source
866       * exception
# Line 840 | Line 904 | public class CompletableFutureTest exten
904              });
905          if (createIncomplete) f.completeExceptionally(ex1);
906  
907 <        checkCompletedWithWrappedCFException(g, ex2);
907 >        checkCompletedWithWrappedException(g, ex2);
908 >        assertEquals(1, a.get());
909 >    }}
910 >
911 >    /**
912 >     * whenComplete action executes on normal completion, propagating
913 >     * source result.
914 >     */
915 >    public void testWhenComplete_normalCompletion1() {
916 >        for (ExecutionMode m : ExecutionMode.values())
917 >        for (boolean createIncomplete : new boolean[] { true, false })
918 >        for (Integer v1 : new Integer[] { 1, null })
919 >    {
920 >        final AtomicInteger a = new AtomicInteger(0);
921 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
922 >        if (!createIncomplete) assertTrue(f.complete(v1));
923 >        final CompletableFuture<Integer> g = m.whenComplete
924 >            (f,
925 >             (Integer x, Throwable t) -> {
926 >                m.checkExecutionMode();
927 >                threadAssertSame(x, v1);
928 >                threadAssertNull(t);
929 >                a.getAndIncrement();
930 >            });
931 >        if (createIncomplete) assertTrue(f.complete(v1));
932 >
933 >        checkCompletedNormally(g, v1);
934 >        checkCompletedNormally(f, v1);
935 >        assertEquals(1, a.get());
936 >    }}
937 >
938 >    /**
939 >     * whenComplete action executes on exceptional completion, propagating
940 >     * source result.
941 >     */
942 >    public void testWhenComplete_exceptionalCompletion() {
943 >        for (ExecutionMode m : ExecutionMode.values())
944 >        for (boolean createIncomplete : new boolean[] { true, false })
945 >        for (Integer v1 : new Integer[] { 1, null })
946 >    {
947 >        final AtomicInteger a = new AtomicInteger(0);
948 >        final CFException ex = new CFException();
949 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
950 >        if (!createIncomplete) f.completeExceptionally(ex);
951 >        final CompletableFuture<Integer> g = m.whenComplete
952 >            (f,
953 >             (Integer x, Throwable t) -> {
954 >                m.checkExecutionMode();
955 >                threadAssertNull(x);
956 >                threadAssertSame(t, ex);
957 >                a.getAndIncrement();
958 >            });
959 >        if (createIncomplete) f.completeExceptionally(ex);
960 >
961 >        checkCompletedWithWrappedException(g, ex);
962 >        checkCompletedExceptionally(f, ex);
963 >        assertEquals(1, a.get());
964 >    }}
965 >
966 >    /**
967 >     * whenComplete action executes on cancelled source, propagating
968 >     * CancellationException.
969 >     */
970 >    public void testWhenComplete_sourceCancelled() {
971 >        for (ExecutionMode m : ExecutionMode.values())
972 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
973 >        for (boolean createIncomplete : new boolean[] { true, false })
974 >    {
975 >        final AtomicInteger a = new AtomicInteger(0);
976 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
977 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
978 >        final CompletableFuture<Integer> g = m.whenComplete
979 >            (f,
980 >             (Integer x, Throwable t) -> {
981 >                m.checkExecutionMode();
982 >                threadAssertNull(x);
983 >                threadAssertTrue(t instanceof CancellationException);
984 >                a.getAndIncrement();
985 >            });
986 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
987 >
988 >        checkCompletedWithWrappedCancellationException(g);
989 >        checkCancelled(f);
990 >        assertEquals(1, a.get());
991 >    }}
992 >
993 >    /**
994 >     * If a whenComplete action throws an exception when triggered by
995 >     * a normal completion, it completes exceptionally
996 >     */
997 >    public void testWhenComplete_actionFailed() {
998 >        for (boolean createIncomplete : new boolean[] { true, false })
999 >        for (ExecutionMode m : ExecutionMode.values())
1000 >        for (Integer v1 : new Integer[] { 1, null })
1001 >    {
1002 >        final AtomicInteger a = new AtomicInteger(0);
1003 >        final CFException ex = new CFException();
1004 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1005 >        if (!createIncomplete) assertTrue(f.complete(v1));
1006 >        final CompletableFuture<Integer> g = m.whenComplete
1007 >            (f,
1008 >             (Integer x, Throwable t) -> {
1009 >                m.checkExecutionMode();
1010 >                threadAssertSame(x, v1);
1011 >                threadAssertNull(t);
1012 >                a.getAndIncrement();
1013 >                throw ex;
1014 >            });
1015 >        if (createIncomplete) assertTrue(f.complete(v1));
1016 >
1017 >        checkCompletedWithWrappedException(g, ex);
1018 >        checkCompletedNormally(f, v1);
1019 >        assertEquals(1, a.get());
1020 >    }}
1021 >
1022 >    /**
1023 >     * If a whenComplete action throws an exception when triggered by
1024 >     * a source completion that also throws an exception, the source
1025 >     * exception takes precedence.
1026 >     */
1027 >    public void testWhenComplete_actionFailedSourceFailed() {
1028 >        for (boolean createIncomplete : new boolean[] { true, false })
1029 >        for (ExecutionMode m : ExecutionMode.values())
1030 >        for (Integer v1 : new Integer[] { 1, null })
1031 >    {
1032 >        final AtomicInteger a = new AtomicInteger(0);
1033 >        final CFException ex1 = new CFException();
1034 >        final CFException ex2 = new CFException();
1035 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1036 >
1037 >        if (!createIncomplete) f.completeExceptionally(ex1);
1038 >        final CompletableFuture<Integer> g = m.whenComplete
1039 >            (f,
1040 >             (Integer x, Throwable t) -> {
1041 >                m.checkExecutionMode();
1042 >                threadAssertSame(t, ex1);
1043 >                threadAssertNull(x);
1044 >                a.getAndIncrement();
1045 >                throw ex2;
1046 >            });
1047 >        if (createIncomplete) f.completeExceptionally(ex1);
1048 >
1049 >        checkCompletedWithWrappedException(g, ex1);
1050 >        checkCompletedExceptionally(f, ex1);
1051          assertEquals(1, a.get());
1052      }}
1053  
# Line 855 | Line 1062 | public class CompletableFutureTest exten
1062      {
1063          final CompletableFuture<Integer> f = new CompletableFuture<>();
1064          final AtomicInteger a = new AtomicInteger(0);
1065 <        if (!createIncomplete) f.complete(v1);
1065 >        if (!createIncomplete) assertTrue(f.complete(v1));
1066          final CompletableFuture<Integer> g = m.handle
1067              (f,
1068               (Integer x, Throwable t) -> {
# Line 865 | Line 1072 | public class CompletableFutureTest exten
1072                  a.getAndIncrement();
1073                  return inc(v1);
1074              });
1075 <        if (createIncomplete) f.complete(v1);
1075 >        if (createIncomplete) assertTrue(f.complete(v1));
1076  
1077          checkCompletedNormally(g, inc(v1));
1078          checkCompletedNormally(f, v1);
# Line 897 | Line 1104 | public class CompletableFutureTest exten
1104          if (createIncomplete) f.completeExceptionally(ex);
1105  
1106          checkCompletedNormally(g, v1);
1107 <        checkCompletedWithWrappedCFException(f, ex);
1107 >        checkCompletedExceptionally(f, ex);
1108          assertEquals(1, a.get());
1109      }}
1110  
# Line 953 | Line 1160 | public class CompletableFutureTest exten
1160              });
1161          if (createIncomplete) f.completeExceptionally(ex1);
1162  
1163 <        checkCompletedWithWrappedCFException(g, ex2);
1164 <        checkCompletedWithWrappedCFException(f, ex1);
1163 >        checkCompletedWithWrappedException(g, ex2);
1164 >        checkCompletedExceptionally(f, ex1);
1165          assertEquals(1, a.get());
1166      }}
1167  
# Line 966 | Line 1173 | public class CompletableFutureTest exten
1173          final CompletableFuture<Integer> f = new CompletableFuture<>();
1174          final AtomicInteger a = new AtomicInteger(0);
1175          final CFException ex = new CFException();
1176 <        if (!createIncomplete) f.complete(v1);
1176 >        if (!createIncomplete) assertTrue(f.complete(v1));
1177          final CompletableFuture<Integer> g = m.handle
1178              (f,
1179               (Integer x, Throwable t) -> {
# Line 976 | Line 1183 | public class CompletableFutureTest exten
1183                  a.getAndIncrement();
1184                  throw ex;
1185              });
1186 <        if (createIncomplete) f.complete(v1);
1186 >        if (createIncomplete) assertTrue(f.complete(v1));
1187  
1188 <        checkCompletedWithWrappedCFException(g, ex);
1188 >        checkCompletedWithWrappedException(g, ex);
1189          checkCompletedNormally(f, v1);
1190          assertEquals(1, a.get());
1191      }}
# Line 997 | Line 1204 | public class CompletableFutureTest exten
1204          final CompletableFuture<Void> f = m.runAsync(r);
1205          assertNull(f.join());
1206          checkCompletedNormally(f, null);
1207 <        assertEquals(1, r.invocationCount);
1207 >        r.assertInvoked();
1208      }}
1209  
1210      /**
# Line 1013 | Line 1220 | public class CompletableFutureTest exten
1220          final FailingRunnable r = new FailingRunnable(m);
1221          final CompletableFuture<Void> f = m.runAsync(r);
1222          checkCompletedWithWrappedCFException(f);
1223 <        assertEquals(1, r.invocationCount);
1223 >        r.assertInvoked();
1224      }}
1225  
1226      /**
# Line 1031 | Line 1238 | public class CompletableFutureTest exten
1238          final CompletableFuture<Integer> f = m.supplyAsync(r);
1239          assertSame(v1, f.join());
1240          checkCompletedNormally(f, v1);
1241 <        assertEquals(1, r.invocationCount);
1241 >        r.assertInvoked();
1242      }}
1243  
1244      /**
# Line 1047 | Line 1254 | public class CompletableFutureTest exten
1254          FailingSupplier r = new FailingSupplier(m);
1255          CompletableFuture<Integer> f = m.supplyAsync(r);
1256          checkCompletedWithWrappedCFException(f);
1257 <        assertEquals(1, r.invocationCount);
1257 >        r.assertInvoked();
1258      }}
1259  
1260      // seq completion methods
# Line 1062 | Line 1269 | public class CompletableFutureTest exten
1269      {
1270          final CompletableFuture<Integer> f = new CompletableFuture<>();
1271          final Noop r = new Noop(m);
1272 <        if (!createIncomplete) f.complete(v1);
1272 >        if (!createIncomplete) assertTrue(f.complete(v1));
1273          final CompletableFuture<Void> g = m.thenRun(f, r);
1274          if (createIncomplete) {
1275              checkIncomplete(g);
1276 <            f.complete(v1);
1276 >            assertTrue(f.complete(v1));
1277          }
1278  
1279          checkCompletedNormally(g, null);
1280          checkCompletedNormally(f, v1);
1281 <        assertEquals(1, r.invocationCount);
1281 >        r.assertInvoked();
1282      }}
1283  
1284      /**
# Line 1092 | Line 1299 | public class CompletableFutureTest exten
1299              f.completeExceptionally(ex);
1300          }
1301  
1302 <        checkCompletedWithWrappedCFException(g, ex);
1303 <        checkCompletedWithWrappedCFException(f, ex);
1304 <        assertEquals(0, r.invocationCount);
1302 >        checkCompletedWithWrappedException(g, ex);
1303 >        checkCompletedExceptionally(f, ex);
1304 >        r.assertNotInvoked();
1305      }}
1306  
1307      /**
# Line 1116 | Line 1323 | public class CompletableFutureTest exten
1323  
1324          checkCompletedWithWrappedCancellationException(g);
1325          checkCancelled(f);
1326 <        assertEquals(0, r.invocationCount);
1326 >        r.assertNotInvoked();
1327      }}
1328  
1329      /**
# Line 1129 | Line 1336 | public class CompletableFutureTest exten
1336      {
1337          final CompletableFuture<Integer> f = new CompletableFuture<>();
1338          final FailingRunnable r = new FailingRunnable(m);
1339 <        if (!createIncomplete) f.complete(v1);
1339 >        if (!createIncomplete) assertTrue(f.complete(v1));
1340          final CompletableFuture<Void> g = m.thenRun(f, r);
1341          if (createIncomplete) {
1342              checkIncomplete(g);
1343 <            f.complete(v1);
1343 >            assertTrue(f.complete(v1));
1344          }
1345  
1346          checkCompletedWithWrappedCFException(g);
# Line 1150 | Line 1357 | public class CompletableFutureTest exten
1357      {
1358          final CompletableFuture<Integer> f = new CompletableFuture<>();
1359          final IncFunction r = new IncFunction(m);
1360 <        if (!createIncomplete) f.complete(v1);
1360 >        if (!createIncomplete) assertTrue(f.complete(v1));
1361          final CompletableFuture<Integer> g = m.thenApply(f, r);
1362          if (createIncomplete) {
1363              checkIncomplete(g);
1364 <            f.complete(v1);
1364 >            assertTrue(f.complete(v1));
1365          }
1366  
1367          checkCompletedNormally(g, inc(v1));
1368          checkCompletedNormally(f, v1);
1369 <        assertEquals(1, r.invocationCount);
1369 >        r.assertValue(inc(v1));
1370      }}
1371  
1372      /**
# Line 1180 | Line 1387 | public class CompletableFutureTest exten
1387              f.completeExceptionally(ex);
1388          }
1389  
1390 <        checkCompletedWithWrappedCFException(g, ex);
1391 <        checkCompletedWithWrappedCFException(f, ex);
1392 <        assertEquals(0, r.invocationCount);
1390 >        checkCompletedWithWrappedException(g, ex);
1391 >        checkCompletedExceptionally(f, ex);
1392 >        r.assertNotInvoked();
1393      }}
1394  
1395      /**
# Line 1204 | Line 1411 | public class CompletableFutureTest exten
1411  
1412          checkCompletedWithWrappedCancellationException(g);
1413          checkCancelled(f);
1414 <        assertEquals(0, r.invocationCount);
1414 >        r.assertNotInvoked();
1415      }}
1416  
1417      /**
# Line 1217 | Line 1424 | public class CompletableFutureTest exten
1424      {
1425          final CompletableFuture<Integer> f = new CompletableFuture<>();
1426          final FailingFunction r = new FailingFunction(m);
1427 <        if (!createIncomplete) f.complete(v1);
1427 >        if (!createIncomplete) assertTrue(f.complete(v1));
1428          final CompletableFuture<Integer> g = m.thenApply(f, r);
1429          if (createIncomplete) {
1430              checkIncomplete(g);
1431 <            f.complete(v1);
1431 >            assertTrue(f.complete(v1));
1432          }
1433  
1434          checkCompletedWithWrappedCFException(g);
# Line 1237 | Line 1444 | public class CompletableFutureTest exten
1444          for (Integer v1 : new Integer[] { 1, null })
1445      {
1446          final CompletableFuture<Integer> f = new CompletableFuture<>();
1447 <        final IncAction r = new IncAction();
1448 <        if (!createIncomplete) f.complete(v1);
1447 >        final NoopConsumer r = new NoopConsumer(m);
1448 >        if (!createIncomplete) assertTrue(f.complete(v1));
1449          final CompletableFuture<Void> g = m.thenAccept(f, r);
1450          if (createIncomplete) {
1451              checkIncomplete(g);
1452 <            f.complete(v1);
1452 >            assertTrue(f.complete(v1));
1453          }
1454  
1455          checkCompletedNormally(g, null);
1456 +        r.assertValue(v1);
1457          checkCompletedNormally(f, v1);
1250        assertEquals(1, r.invocationCount);
1251        assertEquals(inc(v1), r.value);
1458      }}
1459  
1460      /**
# Line 1261 | Line 1467 | public class CompletableFutureTest exten
1467      {
1468          final CFException ex = new CFException();
1469          final CompletableFuture<Integer> f = new CompletableFuture<>();
1470 <        final IncAction r = new IncAction();
1470 >        final NoopConsumer r = new NoopConsumer(m);
1471          if (!createIncomplete) f.completeExceptionally(ex);
1472          final CompletableFuture<Void> g = m.thenAccept(f, r);
1473          if (createIncomplete) {
# Line 1269 | Line 1475 | public class CompletableFutureTest exten
1475              f.completeExceptionally(ex);
1476          }
1477  
1478 <        checkCompletedWithWrappedCFException(g, ex);
1479 <        checkCompletedWithWrappedCFException(f, ex);
1480 <        assertEquals(0, r.invocationCount);
1478 >        checkCompletedWithWrappedException(g, ex);
1479 >        checkCompletedExceptionally(f, ex);
1480 >        r.assertNotInvoked();
1481      }}
1482  
1483      /**
1484 <     * thenAccept result completes exceptionally if action does
1484 >     * thenAccept result completes exceptionally if source cancelled
1485       */
1486 <    public void testThenAccept_actionFailed() {
1486 >    public void testThenAccept_sourceCancelled() {
1487          for (ExecutionMode m : ExecutionMode.values())
1488          for (boolean createIncomplete : new boolean[] { true, false })
1489 <        for (Integer v1 : new Integer[] { 1, null })
1489 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1490      {
1491          final CompletableFuture<Integer> f = new CompletableFuture<>();
1492 <        final FailingConsumer r = new FailingConsumer(m);
1493 <        if (!createIncomplete) f.complete(v1);
1492 >        final NoopConsumer r = new NoopConsumer(m);
1493 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1494          final CompletableFuture<Void> g = m.thenAccept(f, r);
1495          if (createIncomplete) {
1496              checkIncomplete(g);
1497 <            f.complete(v1);
1497 >            assertTrue(f.cancel(mayInterruptIfRunning));
1498          }
1499  
1500 <        checkCompletedWithWrappedCFException(g);
1501 <        checkCompletedNormally(f, v1);
1500 >        checkCompletedWithWrappedCancellationException(g);
1501 >        checkCancelled(f);
1502 >        r.assertNotInvoked();
1503      }}
1504  
1505      /**
1506 <     * thenAccept result completes exceptionally if source cancelled
1506 >     * thenAccept result completes exceptionally if action does
1507       */
1508 <    public void testThenAccept_sourceCancelled() {
1508 >    public void testThenAccept_actionFailed() {
1509          for (ExecutionMode m : ExecutionMode.values())
1510          for (boolean createIncomplete : new boolean[] { true, false })
1511 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1511 >        for (Integer v1 : new Integer[] { 1, null })
1512      {
1513          final CompletableFuture<Integer> f = new CompletableFuture<>();
1514 <        final IncAction r = new IncAction();
1515 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1514 >        final FailingConsumer r = new FailingConsumer(m);
1515 >        if (!createIncomplete) f.complete(v1);
1516          final CompletableFuture<Void> g = m.thenAccept(f, r);
1517          if (createIncomplete) {
1518              checkIncomplete(g);
1519 <            assertTrue(f.cancel(mayInterruptIfRunning));
1519 >            f.complete(v1);
1520          }
1521  
1522 <        checkCompletedWithWrappedCancellationException(g);
1523 <        checkCancelled(f);
1317 <        assertEquals(0, r.invocationCount);
1522 >        checkCompletedWithWrappedCFException(g);
1523 >        checkCompletedNormally(f, v1);
1524      }}
1525  
1526      /**
# Line 1323 | Line 1529 | public class CompletableFutureTest exten
1529       */
1530      public void testThenCombine_normalCompletion() {
1531          for (ExecutionMode m : ExecutionMode.values())
1326        for (boolean createIncomplete : new boolean[] { true, false })
1532          for (boolean fFirst : new boolean[] { true, false })
1533          for (Integer v1 : new Integer[] { 1, null })
1534          for (Integer v2 : new Integer[] { 2, null })
1535      {
1536          final CompletableFuture<Integer> f = new CompletableFuture<>();
1537          final CompletableFuture<Integer> g = new CompletableFuture<>();
1538 <        final SubtractFunction r = new SubtractFunction(m);
1539 <
1540 <        if (fFirst) f.complete(v1); else g.complete(v2);
1541 <        if (!createIncomplete)
1542 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1543 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1544 <        if (createIncomplete) {
1545 <            checkIncomplete(h);
1546 <            assertEquals(0, r.invocationCount);
1547 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1548 <        }
1549 <
1550 <        checkCompletedNormally(h, subtract(v1, v2));
1538 >        final SubtractFunction r1 = new SubtractFunction(m);
1539 >        final SubtractFunction r2 = new SubtractFunction(m);
1540 >        final SubtractFunction r3 = new SubtractFunction(m);
1541 >
1542 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1543 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1544 >        final Integer w1 =  fFirst ? v1 : v2;
1545 >        final Integer w2 = !fFirst ? v1 : v2;
1546 >
1547 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1548 >        assertTrue(fst.complete(w1));
1549 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1550 >        checkIncomplete(h1);
1551 >        checkIncomplete(h2);
1552 >        r1.assertNotInvoked();
1553 >        r2.assertNotInvoked();
1554 >        assertTrue(snd.complete(w2));
1555 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1556 >
1557 >        checkCompletedNormally(h1, subtract(v1, v2));
1558 >        checkCompletedNormally(h2, subtract(v1, v2));
1559 >        checkCompletedNormally(h3, subtract(v1, v2));
1560 >        r1.assertValue(subtract(v1, v2));
1561 >        r2.assertValue(subtract(v1, v2));
1562 >        r3.assertValue(subtract(v1, v2));
1563          checkCompletedNormally(f, v1);
1564          checkCompletedNormally(g, v2);
1348        assertEquals(1, r.invocationCount);
1565      }}
1566  
1567      /**
1568       * thenCombine result completes exceptionally after exceptional
1569       * completion of either source
1570       */
1571 <    public void testThenCombine_exceptionalCompletion() {
1571 >    public void testThenCombine_exceptionalCompletion() throws Throwable {
1572          for (ExecutionMode m : ExecutionMode.values())
1357        for (boolean createIncomplete : new boolean[] { true, false })
1573          for (boolean fFirst : new boolean[] { true, false })
1574 +        for (boolean failFirst : new boolean[] { true, false })
1575          for (Integer v1 : new Integer[] { 1, null })
1576      {
1577          final CompletableFuture<Integer> f = new CompletableFuture<>();
1578          final CompletableFuture<Integer> g = new CompletableFuture<>();
1579          final CFException ex = new CFException();
1580 <        final SubtractFunction r = new SubtractFunction(m);
1581 <
1582 <        (fFirst ? f : g).complete(v1);
1583 <        if (!createIncomplete)
1584 <            (!fFirst ? f : g).completeExceptionally(ex);
1585 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1586 <        if (createIncomplete) {
1587 <            checkIncomplete(h);
1588 <            (!fFirst ? f : g).completeExceptionally(ex);
1589 <        }
1590 <
1591 <        checkCompletedWithWrappedCFException(h, ex);
1592 <        assertEquals(0, r.invocationCount);
1593 <        checkCompletedNormally(fFirst ? f : g, v1);
1594 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1580 >        final SubtractFunction r1 = new SubtractFunction(m);
1581 >        final SubtractFunction r2 = new SubtractFunction(m);
1582 >        final SubtractFunction r3 = new SubtractFunction(m);
1583 >
1584 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1585 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1586 >        final Callable<Boolean> complete1 = failFirst ?
1587 >            () -> fst.completeExceptionally(ex) :
1588 >            () -> fst.complete(v1);
1589 >        final Callable<Boolean> complete2 = failFirst ?
1590 >            () -> snd.complete(v1) :
1591 >            () -> snd.completeExceptionally(ex);
1592 >
1593 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1594 >        assertTrue(complete1.call());
1595 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1596 >        checkIncomplete(h1);
1597 >        checkIncomplete(h2);
1598 >        assertTrue(complete2.call());
1599 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1600 >
1601 >        checkCompletedWithWrappedException(h1, ex);
1602 >        checkCompletedWithWrappedException(h2, ex);
1603 >        checkCompletedWithWrappedException(h3, ex);
1604 >        r1.assertNotInvoked();
1605 >        r2.assertNotInvoked();
1606 >        r3.assertNotInvoked();
1607 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1608 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1609      }}
1610  
1611      /**
1612 <     * thenCombine result completes exceptionally if action does
1612 >     * thenCombine result completes exceptionally if either source cancelled
1613       */
1614 <    public void testThenCombine_actionFailed() {
1614 >    public void testThenCombine_sourceCancelled() throws Throwable {
1615          for (ExecutionMode m : ExecutionMode.values())
1616 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1617          for (boolean fFirst : new boolean[] { true, false })
1618 +        for (boolean failFirst : new boolean[] { true, false })
1619          for (Integer v1 : new Integer[] { 1, null })
1388        for (Integer v2 : new Integer[] { 2, null })
1620      {
1621          final CompletableFuture<Integer> f = new CompletableFuture<>();
1622          final CompletableFuture<Integer> g = new CompletableFuture<>();
1623 <        final FailingBiFunction r = new FailingBiFunction(m);
1624 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1625 <
1626 <        if (fFirst) {
1627 <            f.complete(v1);
1628 <            g.complete(v2);
1629 <        } else {
1630 <            g.complete(v2);
1631 <            f.complete(v1);
1632 <        }
1633 <
1634 <        checkCompletedWithWrappedCFException(h);
1635 <        checkCompletedNormally(f, v1);
1636 <        checkCompletedNormally(g, v2);
1623 >        final SubtractFunction r1 = new SubtractFunction(m);
1624 >        final SubtractFunction r2 = new SubtractFunction(m);
1625 >        final SubtractFunction r3 = new SubtractFunction(m);
1626 >
1627 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1628 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1629 >        final Callable<Boolean> complete1 = failFirst ?
1630 >            () -> fst.cancel(mayInterruptIfRunning) :
1631 >            () -> fst.complete(v1);
1632 >        final Callable<Boolean> complete2 = failFirst ?
1633 >            () -> snd.complete(v1) :
1634 >            () -> snd.cancel(mayInterruptIfRunning);
1635 >
1636 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1637 >        assertTrue(complete1.call());
1638 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1639 >        checkIncomplete(h1);
1640 >        checkIncomplete(h2);
1641 >        assertTrue(complete2.call());
1642 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1643 >
1644 >        checkCompletedWithWrappedCancellationException(h1);
1645 >        checkCompletedWithWrappedCancellationException(h2);
1646 >        checkCompletedWithWrappedCancellationException(h3);
1647 >        r1.assertNotInvoked();
1648 >        r2.assertNotInvoked();
1649 >        r3.assertNotInvoked();
1650 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1651 >        checkCancelled(failFirst ? fst : snd);
1652      }}
1653  
1654      /**
1655 <     * thenCombine result completes exceptionally if either source cancelled
1655 >     * thenCombine result completes exceptionally if action does
1656       */
1657 <    public void testThenCombine_sourceCancelled() {
1657 >    public void testThenCombine_actionFailed() {
1658          for (ExecutionMode m : ExecutionMode.values())
1413        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1414        for (boolean createIncomplete : new boolean[] { true, false })
1659          for (boolean fFirst : new boolean[] { true, false })
1660          for (Integer v1 : new Integer[] { 1, null })
1661 +        for (Integer v2 : new Integer[] { 2, null })
1662      {
1663          final CompletableFuture<Integer> f = new CompletableFuture<>();
1664          final CompletableFuture<Integer> g = new CompletableFuture<>();
1665 <        final SubtractFunction r = new SubtractFunction(m);
1665 >        final FailingBiFunction r1 = new FailingBiFunction(m);
1666 >        final FailingBiFunction r2 = new FailingBiFunction(m);
1667 >        final FailingBiFunction r3 = new FailingBiFunction(m);
1668 >
1669 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1670 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1671 >        final Integer w1 =  fFirst ? v1 : v2;
1672 >        final Integer w2 = !fFirst ? v1 : v2;
1673 >
1674 >        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1675 >        assertTrue(fst.complete(w1));
1676 >        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1677 >        assertTrue(snd.complete(w2));
1678 >        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1679  
1680 <        (fFirst ? f : g).complete(v1);
1681 <        if (!createIncomplete)
1682 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1683 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1684 <        if (createIncomplete) {
1427 <            checkIncomplete(h);
1428 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1429 <        }
1430 <
1431 <        checkCompletedWithWrappedCancellationException(h);
1432 <        checkCancelled(!fFirst ? f : g);
1433 <        assertEquals(0, r.invocationCount);
1434 <        checkCompletedNormally(fFirst ? f : g, v1);
1680 >        checkCompletedWithWrappedCFException(h1);
1681 >        checkCompletedWithWrappedCFException(h2);
1682 >        checkCompletedWithWrappedCFException(h3);
1683 >        checkCompletedNormally(f, v1);
1684 >        checkCompletedNormally(g, v2);
1685      }}
1686  
1687      /**
# Line 1449 | Line 1699 | public class CompletableFutureTest exten
1699          final CompletableFuture<Integer> g = new CompletableFuture<>();
1700          final SubtractAction r = new SubtractAction(m);
1701  
1702 <        if (fFirst) f.complete(v1); else g.complete(v2);
1702 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1703          if (!createIncomplete)
1704 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1704 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1705          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1706          if (createIncomplete) {
1707              checkIncomplete(h);
1708 <            assertEquals(0, r.invocationCount);
1709 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1708 >            r.assertNotInvoked();
1709 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1710          }
1711  
1712          checkCompletedNormally(h, null);
1713 <        assertEquals(subtract(v1, v2), r.value);
1713 >        r.assertValue(subtract(v1, v2));
1714          checkCompletedNormally(f, v1);
1715          checkCompletedNormally(g, v2);
1716      }}
# Line 1480 | Line 1730 | public class CompletableFutureTest exten
1730          final CFException ex = new CFException();
1731          final SubtractAction r = new SubtractAction(m);
1732  
1733 <        (fFirst ? f : g).complete(v1);
1733 >        assertTrue((fFirst ? f : g).complete(v1));
1734          if (!createIncomplete)
1735 <            (!fFirst ? f : g).completeExceptionally(ex);
1735 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1736          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1737          if (createIncomplete) {
1738              checkIncomplete(h);
1739 <            (!fFirst ? f : g).completeExceptionally(ex);
1739 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1740          }
1741  
1742 <        checkCompletedWithWrappedCFException(h, ex);
1743 <        assertEquals(0, r.invocationCount);
1742 >        checkCompletedWithWrappedException(h, ex);
1743 >        r.assertNotInvoked();
1744          checkCompletedNormally(fFirst ? f : g, v1);
1745 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1496 <    }}
1497 <
1498 <    /**
1499 <     * thenAcceptBoth result completes exceptionally if action does
1500 <     */
1501 <    public void testThenAcceptBoth_actionFailed() {
1502 <        for (ExecutionMode m : ExecutionMode.values())
1503 <        for (boolean fFirst : new boolean[] { true, false })
1504 <        for (Integer v1 : new Integer[] { 1, null })
1505 <        for (Integer v2 : new Integer[] { 2, null })
1506 <    {
1507 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1508 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1509 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1510 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1511 <
1512 <        if (fFirst) {
1513 <            f.complete(v1);
1514 <            g.complete(v2);
1515 <        } else {
1516 <            g.complete(v2);
1517 <            f.complete(v1);
1518 <        }
1519 <
1520 <        checkCompletedWithWrappedCFException(h);
1521 <        checkCompletedNormally(f, v1);
1522 <        checkCompletedNormally(g, v2);
1745 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1746      }}
1747  
1748      /**
# Line 1536 | Line 1759 | public class CompletableFutureTest exten
1759          final CompletableFuture<Integer> g = new CompletableFuture<>();
1760          final SubtractAction r = new SubtractAction(m);
1761  
1762 <        (fFirst ? f : g).complete(v1);
1762 >        assertTrue((fFirst ? f : g).complete(v1));
1763          if (!createIncomplete)
1764              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1765          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
# Line 1547 | Line 1770 | public class CompletableFutureTest exten
1770  
1771          checkCompletedWithWrappedCancellationException(h);
1772          checkCancelled(!fFirst ? f : g);
1773 <        assertEquals(0, r.invocationCount);
1773 >        r.assertNotInvoked();
1774          checkCompletedNormally(fFirst ? f : g, v1);
1775      }}
1776  
1777      /**
1778 +     * thenAcceptBoth result completes exceptionally if action does
1779 +     */
1780 +    public void testThenAcceptBoth_actionFailed() {
1781 +        for (ExecutionMode m : ExecutionMode.values())
1782 +        for (boolean fFirst : new boolean[] { true, false })
1783 +        for (Integer v1 : new Integer[] { 1, null })
1784 +        for (Integer v2 : new Integer[] { 2, null })
1785 +    {
1786 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1787 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1788 +        final FailingBiConsumer r = new FailingBiConsumer(m);
1789 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1790 +
1791 +        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1792 +        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1793 +
1794 +        checkCompletedWithWrappedCFException(h);
1795 +        checkCompletedNormally(f, v1);
1796 +        checkCompletedNormally(g, v2);
1797 +    }}
1798 +
1799 +    /**
1800       * runAfterBoth result completes normally after normal
1801       * completion of sources
1802       */
# Line 1566 | Line 1811 | public class CompletableFutureTest exten
1811          final CompletableFuture<Integer> g = new CompletableFuture<>();
1812          final Noop r = new Noop(m);
1813  
1814 <        if (fFirst) f.complete(v1); else g.complete(v2);
1814 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1815          if (!createIncomplete)
1816 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1816 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1817          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1818          if (createIncomplete) {
1819              checkIncomplete(h);
1820 <            assertEquals(0, r.invocationCount);
1821 <            if (!fFirst) f.complete(v1); else g.complete(v2);
1820 >            r.assertNotInvoked();
1821 >            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1822          }
1823  
1824          checkCompletedNormally(h, null);
1825 <        assertEquals(1, r.invocationCount);
1825 >        r.assertInvoked();
1826          checkCompletedNormally(f, v1);
1827          checkCompletedNormally(g, v2);
1828      }}
# Line 1597 | Line 1842 | public class CompletableFutureTest exten
1842          final CFException ex = new CFException();
1843          final Noop r = new Noop(m);
1844  
1845 <        (fFirst ? f : g).complete(v1);
1845 >        assertTrue((fFirst ? f : g).complete(v1));
1846          if (!createIncomplete)
1847 <            (!fFirst ? f : g).completeExceptionally(ex);
1847 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1848          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1849          if (createIncomplete) {
1850              checkIncomplete(h);
1851 <            (!fFirst ? f : g).completeExceptionally(ex);
1851 >            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1852          }
1853  
1854 <        checkCompletedWithWrappedCFException(h, ex);
1855 <        assertEquals(0, r.invocationCount);
1854 >        checkCompletedWithWrappedException(h, ex);
1855 >        r.assertNotInvoked();
1856          checkCompletedNormally(fFirst ? f : g, v1);
1857 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1613 <    }}
1614 <
1615 <    /**
1616 <     * runAfterBoth result completes exceptionally if action does
1617 <     */
1618 <    public void testRunAfterBoth_actionFailed() {
1619 <        for (ExecutionMode m : ExecutionMode.values())
1620 <        for (boolean fFirst : new boolean[] { true, false })
1621 <        for (Integer v1 : new Integer[] { 1, null })
1622 <        for (Integer v2 : new Integer[] { 2, null })
1623 <    {
1624 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1625 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1626 <        final FailingRunnable r = new FailingRunnable(m);
1627 <
1628 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1629 <        if (fFirst) {
1630 <            f.complete(v1);
1631 <            g.complete(v2);
1632 <        } else {
1633 <            g.complete(v2);
1634 <            f.complete(v1);
1635 <        }
1636 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1637 <
1638 <        checkCompletedWithWrappedCFException(h1);
1639 <        checkCompletedWithWrappedCFException(h2);
1640 <        checkCompletedNormally(f, v1);
1641 <        checkCompletedNormally(g, v2);
1857 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1858      }}
1859  
1860      /**
# Line 1655 | Line 1871 | public class CompletableFutureTest exten
1871          final CompletableFuture<Integer> g = new CompletableFuture<>();
1872          final Noop r = new Noop(m);
1873  
1874 <
1659 <        (fFirst ? f : g).complete(v1);
1874 >        assertTrue((fFirst ? f : g).complete(v1));
1875          if (!createIncomplete)
1876              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1877          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
# Line 1667 | Line 1882 | public class CompletableFutureTest exten
1882  
1883          checkCompletedWithWrappedCancellationException(h);
1884          checkCancelled(!fFirst ? f : g);
1885 <        assertEquals(0, r.invocationCount);
1885 >        r.assertNotInvoked();
1886          checkCompletedNormally(fFirst ? f : g, v1);
1887      }}
1888  
1889      /**
1890 <     * applyToEither result completes normally after normal completion
1676 <     * of either source
1890 >     * runAfterBoth result completes exceptionally if action does
1891       */
1892 <    public void testApplyToEither_normalCompletion() {
1892 >    public void testRunAfterBoth_actionFailed() {
1893          for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean createIncomplete : new boolean[] { true, false })
1894          for (boolean fFirst : new boolean[] { true, false })
1895          for (Integer v1 : new Integer[] { 1, null })
1896          for (Integer v2 : new Integer[] { 2, null })
1897      {
1898          final CompletableFuture<Integer> f = new CompletableFuture<>();
1899          final CompletableFuture<Integer> g = new CompletableFuture<>();
1900 <        final IncFunction r = new IncFunction(m);
1900 >        final FailingRunnable r1 = new FailingRunnable(m);
1901 >        final FailingRunnable r2 = new FailingRunnable(m);
1902  
1903 <        if (!createIncomplete)
1904 <            if (fFirst) f.complete(v1); else g.complete(v2);
1905 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1906 <        if (createIncomplete) {
1693 <            checkIncomplete(h);
1694 <            assertEquals(0, r.invocationCount);
1695 <            if (fFirst) f.complete(v1); else g.complete(v2);
1696 <        }
1697 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1698 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1903 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1904 >        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1905 >        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1906 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1907  
1908 +        checkCompletedWithWrappedCFException(h1);
1909 +        checkCompletedWithWrappedCFException(h2);
1910          checkCompletedNormally(f, v1);
1911          checkCompletedNormally(g, v2);
1702        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1912      }}
1913  
1914 <    public void testApplyToEither_normalCompletionBothAvailable() {
1914 >    /**
1915 >     * applyToEither result completes normally after normal completion
1916 >     * of either source
1917 >     */
1918 >    public void testApplyToEither_normalCompletion() {
1919          for (ExecutionMode m : ExecutionMode.values())
1707        for (boolean fFirst : new boolean[] { true, false })
1920          for (Integer v1 : new Integer[] { 1, null })
1921          for (Integer v2 : new Integer[] { 2, null })
1922      {
1923          final CompletableFuture<Integer> f = new CompletableFuture<>();
1924          final CompletableFuture<Integer> g = new CompletableFuture<>();
1925 <        final IncFunction r = new IncFunction(m);
1925 >        final IncFunction[] rs = new IncFunction[6];
1926 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1927  
1928 <        if (fFirst) {
1929 <            f.complete(v1);
1930 <            g.complete(v2);
1931 <        } else {
1932 <            g.complete(v2);
1933 <            f.complete(v1);
1934 <        }
1928 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1929 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1930 >        checkIncomplete(h0);
1931 >        checkIncomplete(h1);
1932 >        rs[0].assertNotInvoked();
1933 >        rs[1].assertNotInvoked();
1934 >        f.complete(v1);
1935 >        checkCompletedNormally(h0, inc(v1));
1936 >        checkCompletedNormally(h1, inc(v1));
1937 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1938 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1939 >        checkCompletedNormally(h2, inc(v1));
1940 >        checkCompletedNormally(h3, inc(v1));
1941 >        g.complete(v2);
1942  
1943 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1943 >        // unspecified behavior - both source completions available
1944 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1945 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1946 >        rs[4].assertValue(h4.join());
1947 >        rs[5].assertValue(h5.join());
1948 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1949 >                   Objects.equals(inc(v2), h4.join()));
1950 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1951 >                   Objects.equals(inc(v2), h5.join()));
1952  
1953          checkCompletedNormally(f, v1);
1954          checkCompletedNormally(g, v2);
1955 <
1956 <        // unspecified behavior
1957 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1958 <                   Objects.equals(h.join(), inc(v2)));
1959 <        assertEquals(1, r.invocationCount);
1955 >        checkCompletedNormally(h0, inc(v1));
1956 >        checkCompletedNormally(h1, inc(v1));
1957 >        checkCompletedNormally(h2, inc(v1));
1958 >        checkCompletedNormally(h3, inc(v1));
1959 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1960      }}
1961  
1962      /**
1963       * applyToEither result completes exceptionally after exceptional
1964       * completion of either source
1965       */
1966 <    public void testApplyToEither_exceptionalCompletion1() {
1966 >    public void testApplyToEither_exceptionalCompletion() {
1967          for (ExecutionMode m : ExecutionMode.values())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
1968          for (Integer v1 : new Integer[] { 1, null })
1969      {
1970          final CompletableFuture<Integer> f = new CompletableFuture<>();
1971          final CompletableFuture<Integer> g = new CompletableFuture<>();
1972          final CFException ex = new CFException();
1973 <        final IncFunction r = new IncFunction(m);
1973 >        final IncFunction[] rs = new IncFunction[6];
1974 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1975  
1976 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1977 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1978 <        if (createIncomplete) {
1979 <            checkIncomplete(h);
1980 <            assertEquals(0, r.invocationCount);
1981 <            (fFirst ? f : g).completeExceptionally(ex);
1982 <        }
1976 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1977 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1978 >        checkIncomplete(h0);
1979 >        checkIncomplete(h1);
1980 >        rs[0].assertNotInvoked();
1981 >        rs[1].assertNotInvoked();
1982 >        f.completeExceptionally(ex);
1983 >        checkCompletedWithWrappedException(h0, ex);
1984 >        checkCompletedWithWrappedException(h1, ex);
1985 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1986 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1987 >        checkCompletedWithWrappedException(h2, ex);
1988 >        checkCompletedWithWrappedException(h3, ex);
1989 >        g.complete(v1);
1990  
1991 <        checkCompletedWithWrappedCFException(h, ex);
1992 <        (!fFirst ? f : g).complete(v1);
1991 >        // unspecified behavior - both source completions available
1992 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1993 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1994 >        try {
1995 >            assertEquals(inc(v1), h4.join());
1996 >            rs[4].assertValue(inc(v1));
1997 >        } catch (CompletionException ok) {
1998 >            checkCompletedWithWrappedException(h4, ex);
1999 >            rs[4].assertNotInvoked();
2000 >        }
2001 >        try {
2002 >            assertEquals(inc(v1), h5.join());
2003 >            rs[5].assertValue(inc(v1));
2004 >        } catch (CompletionException ok) {
2005 >            checkCompletedWithWrappedException(h5, ex);
2006 >            rs[5].assertNotInvoked();
2007 >        }
2008  
2009 <        assertEquals(0, r.invocationCount);
2010 <        checkCompletedNormally(!fFirst ? f : g, v1);
2011 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
2012 <        checkCompletedWithWrappedCFException(h, ex);
2009 >        checkCompletedExceptionally(f, ex);
2010 >        checkCompletedNormally(g, v1);
2011 >        checkCompletedWithWrappedException(h0, ex);
2012 >        checkCompletedWithWrappedException(h1, ex);
2013 >        checkCompletedWithWrappedException(h2, ex);
2014 >        checkCompletedWithWrappedException(h3, ex);
2015 >        checkCompletedWithWrappedException(h4, ex);
2016 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2017      }}
2018  
2019      public void testApplyToEither_exceptionalCompletion2() {
2020          for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean reverseArgs : new boolean[] { true, false })
2021          for (boolean fFirst : new boolean[] { true, false })
2022          for (Integer v1 : new Integer[] { 1, null })
2023      {
2024          final CompletableFuture<Integer> f = new CompletableFuture<>();
2025          final CompletableFuture<Integer> g = new CompletableFuture<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
2026          final CFException ex = new CFException();
2027 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
2028 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2029 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2030 <        if (fFirst) {
2031 <            f.complete(v1);
2032 <            g.completeExceptionally(ex);
2033 <        } else {
2034 <            g.completeExceptionally(ex);
2035 <            f.complete(v1);
1786 <        }
1787 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2027 >        final IncFunction[] rs = new IncFunction[6];
2028 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2029 >
2030 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2031 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2032 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2033 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2034 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2035 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2036  
2037 <        // unspecified behavior
2037 >        // unspecified behavior - both source completions available
2038 >        try {
2039 >            assertEquals(inc(v1), h0.join());
2040 >            rs[0].assertValue(inc(v1));
2041 >        } catch (CompletionException ok) {
2042 >            checkCompletedWithWrappedException(h0, ex);
2043 >            rs[0].assertNotInvoked();
2044 >        }
2045          try {
2046              assertEquals(inc(v1), h1.join());
2047 <            assertEquals(1, r1.invocationCount);
2047 >            rs[1].assertValue(inc(v1));
2048          } catch (CompletionException ok) {
2049 <            checkCompletedWithWrappedCFException(h1, ex);
2050 <            assertEquals(0, r1.invocationCount);
2049 >            checkCompletedWithWrappedException(h1, ex);
2050 >            rs[1].assertNotInvoked();
2051          }
1797
2052          try {
2053              assertEquals(inc(v1), h2.join());
2054 <            assertEquals(1, r2.invocationCount);
2054 >            rs[2].assertValue(inc(v1));
2055          } catch (CompletionException ok) {
2056 <            checkCompletedWithWrappedCFException(h2, ex);
2057 <            assertEquals(0, r2.invocationCount);
2056 >            checkCompletedWithWrappedException(h2, ex);
2057 >            rs[2].assertNotInvoked();
2058 >        }
2059 >        try {
2060 >            assertEquals(inc(v1), h3.join());
2061 >            rs[3].assertValue(inc(v1));
2062 >        } catch (CompletionException ok) {
2063 >            checkCompletedWithWrappedException(h3, ex);
2064 >            rs[3].assertNotInvoked();
2065          }
2066  
1806        checkCompletedWithWrappedCFException(g, ex);
1807        checkCompletedNormally(f, v1);
1808    }}
1809
1810    /**
1811     * applyToEither result completes exceptionally if action does
1812     */
1813    public void testApplyToEither_actionFailed1() {
1814        for (ExecutionMode m : ExecutionMode.values())
1815        for (Integer v1 : new Integer[] { 1, null })
1816        for (Integer v2 : new Integer[] { 2, null })
1817    {
1818        final CompletableFuture<Integer> f = new CompletableFuture<>();
1819        final CompletableFuture<Integer> g = new CompletableFuture<>();
1820        final FailingFunction r = new FailingFunction(m);
1821        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822
1823        f.complete(v1);
1824        checkCompletedWithWrappedCFException(h);
1825        g.complete(v2);
1826        checkCompletedNormally(f, v1);
1827        checkCompletedNormally(g, v2);
1828    }}
1829
1830    public void testApplyToEither_actionFailed2() {
1831        for (ExecutionMode m : ExecutionMode.values())
1832        for (Integer v1 : new Integer[] { 1, null })
1833        for (Integer v2 : new Integer[] { 2, null })
1834    {
1835        final CompletableFuture<Integer> f = new CompletableFuture<>();
1836        final CompletableFuture<Integer> g = new CompletableFuture<>();
1837        final FailingFunction r = new FailingFunction(m);
1838        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1839
1840        g.complete(v2);
1841        checkCompletedWithWrappedCFException(h);
1842        f.complete(v1);
2067          checkCompletedNormally(f, v1);
2068 <        checkCompletedNormally(g, v2);
2068 >        checkCompletedExceptionally(g, ex);
2069      }}
2070  
2071      /**
2072       * applyToEither result completes exceptionally if either source cancelled
2073       */
2074 <    public void testApplyToEither_sourceCancelled1() {
2074 >    public void testApplyToEither_sourceCancelled() {
2075          for (ExecutionMode m : ExecutionMode.values())
2076          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : new boolean[] { true, false })
2077          for (Integer v1 : new Integer[] { 1, null })
2078      {
2079          final CompletableFuture<Integer> f = new CompletableFuture<>();
2080          final CompletableFuture<Integer> g = new CompletableFuture<>();
2081 <        final IncFunction r = new IncFunction(m);
2081 >        final IncFunction[] rs = new IncFunction[6];
2082 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2083  
2084 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2085 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2086 <        if (createIncomplete) {
2087 <            checkIncomplete(h);
2088 <            assertEquals(0, r.invocationCount);
2089 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2090 <        }
2084 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2085 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2086 >        checkIncomplete(h0);
2087 >        checkIncomplete(h1);
2088 >        rs[0].assertNotInvoked();
2089 >        rs[1].assertNotInvoked();
2090 >        f.cancel(mayInterruptIfRunning);
2091 >        checkCompletedWithWrappedCancellationException(h0);
2092 >        checkCompletedWithWrappedCancellationException(h1);
2093 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2094 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2095 >        checkCompletedWithWrappedCancellationException(h2);
2096 >        checkCompletedWithWrappedCancellationException(h3);
2097 >        g.complete(v1);
2098  
2099 <        checkCompletedWithWrappedCancellationException(h);
2100 <        (!fFirst ? f : g).complete(v1);
2099 >        // unspecified behavior - both source completions available
2100 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2101 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2102 >        try {
2103 >            assertEquals(inc(v1), h4.join());
2104 >            rs[4].assertValue(inc(v1));
2105 >        } catch (CompletionException ok) {
2106 >            checkCompletedWithWrappedCancellationException(h4);
2107 >            rs[4].assertNotInvoked();
2108 >        }
2109 >        try {
2110 >            assertEquals(inc(v1), h5.join());
2111 >            rs[5].assertValue(inc(v1));
2112 >        } catch (CompletionException ok) {
2113 >            checkCompletedWithWrappedCancellationException(h5);
2114 >            rs[5].assertNotInvoked();
2115 >        }
2116  
2117 <        assertEquals(0, r.invocationCount);
2118 <        checkCompletedNormally(!fFirst ? f : g, v1);
2119 <        checkCancelled(fFirst ? f : g);
2120 <        checkCompletedWithWrappedCancellationException(h);
2117 >        checkCancelled(f);
2118 >        checkCompletedNormally(g, v1);
2119 >        checkCompletedWithWrappedCancellationException(h0);
2120 >        checkCompletedWithWrappedCancellationException(h1);
2121 >        checkCompletedWithWrappedCancellationException(h2);
2122 >        checkCompletedWithWrappedCancellationException(h3);
2123 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2124      }}
2125  
2126      public void testApplyToEither_sourceCancelled2() {
2127          for (ExecutionMode m : ExecutionMode.values())
2128          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1881        for (boolean reverseArgs : new boolean[] { true, false })
2129          for (boolean fFirst : new boolean[] { true, false })
2130          for (Integer v1 : new Integer[] { 1, null })
2131      {
2132          final CompletableFuture<Integer> f = new CompletableFuture<>();
2133          final CompletableFuture<Integer> g = new CompletableFuture<>();
2134 <        final IncFunction r1 = new IncFunction(m);
2135 <        final IncFunction r2 = new IncFunction(m);
1889 <        final CFException ex = new CFException();
1890 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1891 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2134 >        final IncFunction[] rs = new IncFunction[6];
2135 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2136  
2137 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2138 <        if (fFirst) {
2139 <            f.complete(v1);
2140 <            assertTrue(g.cancel(mayInterruptIfRunning));
2141 <        } else {
2142 <            assertTrue(g.cancel(mayInterruptIfRunning));
1899 <            f.complete(v1);
1900 <        }
1901 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2137 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2138 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2139 >        assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2140 >        assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2141 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2142 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2143  
2144 <        // unspecified behavior
2144 >        // unspecified behavior - both source completions available
2145 >        try {
2146 >            assertEquals(inc(v1), h0.join());
2147 >            rs[0].assertValue(inc(v1));
2148 >        } catch (CompletionException ok) {
2149 >            checkCompletedWithWrappedCancellationException(h0);
2150 >            rs[0].assertNotInvoked();
2151 >        }
2152          try {
2153              assertEquals(inc(v1), h1.join());
2154 <            assertEquals(1, r1.invocationCount);
2154 >            rs[1].assertValue(inc(v1));
2155          } catch (CompletionException ok) {
2156              checkCompletedWithWrappedCancellationException(h1);
2157 <            assertEquals(0, r1.invocationCount);
2157 >            rs[1].assertNotInvoked();
2158          }
1911
2159          try {
2160              assertEquals(inc(v1), h2.join());
2161 <            assertEquals(1, r2.invocationCount);
2161 >            rs[2].assertValue(inc(v1));
2162          } catch (CompletionException ok) {
2163              checkCompletedWithWrappedCancellationException(h2);
2164 <            assertEquals(0, r2.invocationCount);
2164 >            rs[2].assertNotInvoked();
2165 >        }
2166 >        try {
2167 >            assertEquals(inc(v1), h3.join());
2168 >            rs[3].assertValue(inc(v1));
2169 >        } catch (CompletionException ok) {
2170 >            checkCompletedWithWrappedCancellationException(h3);
2171 >            rs[3].assertNotInvoked();
2172          }
2173  
1920        checkCancelled(g);
2174          checkCompletedNormally(f, v1);
2175 +        checkCancelled(g);
2176      }}
2177  
2178      /**
2179 <     * acceptEither result completes normally after normal completion
1926 <     * of either source
2179 >     * applyToEither result completes exceptionally if action does
2180       */
2181 <    public void testAcceptEither_normalCompletion1() {
2181 >    public void testApplyToEither_actionFailed() {
2182          for (ExecutionMode m : ExecutionMode.values())
2183          for (Integer v1 : new Integer[] { 1, null })
2184          for (Integer v2 : new Integer[] { 2, null })
2185      {
2186          final CompletableFuture<Integer> f = new CompletableFuture<>();
2187          final CompletableFuture<Integer> g = new CompletableFuture<>();
2188 <        final IncAction r = new IncAction();
2189 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2188 >        final FailingFunction[] rs = new FailingFunction[6];
2189 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2190  
2191 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2192 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2193          f.complete(v1);
2194 <        checkCompletedNormally(h, null);
2195 <        assertEquals(inc(v1), r.value);
2196 <        g.complete(v2);
2197 <
2198 <        checkCompletedNormally(f, v1);
2199 <        checkCompletedNormally(g, v2);
2200 <        checkCompletedNormally(h, null);
1946 <    }}
1947 <
1948 <    public void testAcceptEither_normalCompletion2() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        for (Integer v2 : new Integer[] { 2, null })
1952 <    {
1953 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1954 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1956 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2194 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2195 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2196 >        checkCompletedWithWrappedCFException(h0);
2197 >        checkCompletedWithWrappedCFException(h1);
2198 >        checkCompletedWithWrappedCFException(h2);
2199 >        checkCompletedWithWrappedCFException(h3);
2200 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2201  
2202          g.complete(v2);
2203 <        checkCompletedNormally(h, null);
2204 <        assertEquals(inc(v2), r.value);
2205 <        f.complete(v1);
2203 >
2204 >        // unspecified behavior - both source completions available
2205 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2206 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2207 >
2208 >        checkCompletedWithWrappedCFException(h4);
2209 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2210 >                   Objects.equals(v2, rs[4].value));
2211 >        checkCompletedWithWrappedCFException(h5);
2212 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2213 >                   Objects.equals(v2, rs[5].value));
2214  
2215          checkCompletedNormally(f, v1);
2216          checkCompletedNormally(g, v2);
1965        checkCompletedNormally(h, null);
2217      }}
2218  
2219 <    public void testAcceptEither_normalCompletion3() {
2219 >    /**
2220 >     * acceptEither result completes normally after normal completion
2221 >     * of either source
2222 >     */
2223 >    public void testAcceptEither_normalCompletion() {
2224          for (ExecutionMode m : ExecutionMode.values())
2225          for (Integer v1 : new Integer[] { 1, null })
2226          for (Integer v2 : new Integer[] { 2, null })
2227      {
2228          final CompletableFuture<Integer> f = new CompletableFuture<>();
2229          final CompletableFuture<Integer> g = new CompletableFuture<>();
2230 <        final IncAction r = new IncAction();
2230 >        final NoopConsumer[] rs = new NoopConsumer[6];
2231 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2232  
2233 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2234 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2235 +        checkIncomplete(h0);
2236 +        checkIncomplete(h1);
2237 +        rs[0].assertNotInvoked();
2238 +        rs[1].assertNotInvoked();
2239          f.complete(v1);
2240 +        checkCompletedNormally(h0, null);
2241 +        checkCompletedNormally(h1, null);
2242 +        rs[0].assertValue(v1);
2243 +        rs[1].assertValue(v1);
2244 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2245 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2246 +        checkCompletedNormally(h2, null);
2247 +        checkCompletedNormally(h3, null);
2248 +        rs[2].assertValue(v1);
2249 +        rs[3].assertValue(v1);
2250          g.complete(v2);
1979        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2251  
2252 <        checkCompletedNormally(h, null);
2252 >        // unspecified behavior - both source completions available
2253 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2254 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2255 >        checkCompletedNormally(h4, null);
2256 >        checkCompletedNormally(h5, null);
2257 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2258 >                   Objects.equals(v2, rs[4].value));
2259 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2260 >                   Objects.equals(v2, rs[5].value));
2261 >
2262          checkCompletedNormally(f, v1);
2263          checkCompletedNormally(g, v2);
2264 <
2265 <        // unspecified behavior
2266 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2267 <                   Objects.equals(r.value, inc(v2)));
2264 >        checkCompletedNormally(h0, null);
2265 >        checkCompletedNormally(h1, null);
2266 >        checkCompletedNormally(h2, null);
2267 >        checkCompletedNormally(h3, null);
2268 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2269      }}
2270  
2271      /**
2272       * acceptEither result completes exceptionally after exceptional
2273       * completion of either source
2274       */
2275 <    public void testAcceptEither_exceptionalCompletion1() {
2275 >    public void testAcceptEither_exceptionalCompletion() {
2276          for (ExecutionMode m : ExecutionMode.values())
2277          for (Integer v1 : new Integer[] { 1, null })
2278      {
2279          final CompletableFuture<Integer> f = new CompletableFuture<>();
2280          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000        final IncAction r = new IncAction();
2001        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2281          final CFException ex = new CFException();
2282 +        final NoopConsumer[] rs = new NoopConsumer[6];
2283 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2284  
2285 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2286 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2287 +        checkIncomplete(h0);
2288 +        checkIncomplete(h1);
2289 +        rs[0].assertNotInvoked();
2290 +        rs[1].assertNotInvoked();
2291          f.completeExceptionally(ex);
2292 <        checkCompletedWithWrappedCFException(h, ex);
2292 >        checkCompletedWithWrappedException(h0, ex);
2293 >        checkCompletedWithWrappedException(h1, ex);
2294 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2295 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2296 >        checkCompletedWithWrappedException(h2, ex);
2297 >        checkCompletedWithWrappedException(h3, ex);
2298 >
2299          g.complete(v1);
2300  
2301 <        assertEquals(0, r.invocationCount);
2301 >        // unspecified behavior - both source completions available
2302 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2303 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2304 >        try {
2305 >            assertNull(h4.join());
2306 >            rs[4].assertValue(v1);
2307 >        } catch (CompletionException ok) {
2308 >            checkCompletedWithWrappedException(h4, ex);
2309 >            rs[4].assertNotInvoked();
2310 >        }
2311 >        try {
2312 >            assertNull(h5.join());
2313 >            rs[5].assertValue(v1);
2314 >        } catch (CompletionException ok) {
2315 >            checkCompletedWithWrappedException(h5, ex);
2316 >            rs[5].assertNotInvoked();
2317 >        }
2318 >
2319 >        checkCompletedExceptionally(f, ex);
2320          checkCompletedNormally(g, v1);
2321 <        checkCompletedWithWrappedCFException(f, ex);
2322 <        checkCompletedWithWrappedCFException(h, ex);
2321 >        checkCompletedWithWrappedException(h0, ex);
2322 >        checkCompletedWithWrappedException(h1, ex);
2323 >        checkCompletedWithWrappedException(h2, ex);
2324 >        checkCompletedWithWrappedException(h3, ex);
2325 >        checkCompletedWithWrappedException(h4, ex);
2326 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2327      }}
2328  
2329      public void testAcceptEither_exceptionalCompletion2() {
2330          for (ExecutionMode m : ExecutionMode.values())
2331 +        for (boolean fFirst : new boolean[] { true, false })
2332          for (Integer v1 : new Integer[] { 1, null })
2333      {
2334          final CompletableFuture<Integer> f = new CompletableFuture<>();
2335          final CompletableFuture<Integer> g = new CompletableFuture<>();
2020        final IncAction r = new IncAction();
2021        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2022        final CFException ex = new CFException();
2023
2024        g.completeExceptionally(ex);
2025        checkCompletedWithWrappedCFException(h, ex);
2026        f.complete(v1);
2027
2028        assertEquals(0, r.invocationCount);
2029        checkCompletedNormally(f, v1);
2030        checkCompletedWithWrappedCFException(g, ex);
2031        checkCompletedWithWrappedCFException(h, ex);
2032    }}
2033
2034    public void testAcceptEither_exceptionalCompletion3() {
2035        for (ExecutionMode m : ExecutionMode.values())
2036        for (Integer v1 : new Integer[] { 1, null })
2037    {
2038        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040        final IncAction r = new IncAction();
2336          final CFException ex = new CFException();
2337 +        final NoopConsumer[] rs = new NoopConsumer[6];
2338 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2339  
2340 <        g.completeExceptionally(ex);
2341 <        f.complete(v1);
2342 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2340 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2341 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2342 >        assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2343 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2344 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2345 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2346  
2347 <        // unspecified behavior
2048 <        Integer v;
2347 >        // unspecified behavior - both source completions available
2348          try {
2349 <            assertNull(h.join());
2350 <            assertEquals(1, r.invocationCount);
2052 <            assertEquals(inc(v1), r.value);
2349 >            assertEquals(null, h0.join());
2350 >            rs[0].assertValue(v1);
2351          } catch (CompletionException ok) {
2352 <            checkCompletedWithWrappedCFException(h, ex);
2353 <            assertEquals(0, r.invocationCount);
2352 >            checkCompletedWithWrappedException(h0, ex);
2353 >            rs[0].assertNotInvoked();
2354          }
2057
2058        checkCompletedWithWrappedCFException(g, ex);
2059        checkCompletedNormally(f, v1);
2060    }}
2061
2062    public void testAcceptEither_exceptionalCompletion4() {
2063        for (ExecutionMode m : ExecutionMode.values())
2064        for (Integer v1 : new Integer[] { 1, null })
2065    {
2066        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068        final IncAction r = new IncAction();
2069        final CFException ex = new CFException();
2070
2071        f.completeExceptionally(ex);
2072        g.complete(v1);
2073        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2074
2075        // unspecified behavior
2076        Integer v;
2355          try {
2356 <            assertNull(h.join());
2357 <            assertEquals(1, r.invocationCount);
2080 <            assertEquals(inc(v1), r.value);
2356 >            assertEquals(null, h1.join());
2357 >            rs[1].assertValue(v1);
2358          } catch (CompletionException ok) {
2359 <            checkCompletedWithWrappedCFException(h, ex);
2360 <            assertEquals(0, r.invocationCount);
2359 >            checkCompletedWithWrappedException(h1, ex);
2360 >            rs[1].assertNotInvoked();
2361 >        }
2362 >        try {
2363 >            assertEquals(null, h2.join());
2364 >            rs[2].assertValue(v1);
2365 >        } catch (CompletionException ok) {
2366 >            checkCompletedWithWrappedException(h2, ex);
2367 >            rs[2].assertNotInvoked();
2368 >        }
2369 >        try {
2370 >            assertEquals(null, h3.join());
2371 >            rs[3].assertValue(v1);
2372 >        } catch (CompletionException ok) {
2373 >            checkCompletedWithWrappedException(h3, ex);
2374 >            rs[3].assertNotInvoked();
2375          }
2376  
2086        checkCompletedWithWrappedCFException(f, ex);
2087        checkCompletedNormally(g, v1);
2088    }}
2089
2090    /**
2091     * acceptEither result completes exceptionally if action does
2092     */
2093    public void testAcceptEither_actionFailed1() {
2094        for (ExecutionMode m : ExecutionMode.values())
2095        for (Integer v1 : new Integer[] { 1, null })
2096        for (Integer v2 : new Integer[] { 2, null })
2097    {
2098        final CompletableFuture<Integer> f = new CompletableFuture<>();
2099        final CompletableFuture<Integer> g = new CompletableFuture<>();
2100        final FailingConsumer r = new FailingConsumer(m);
2101        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2102
2103        f.complete(v1);
2104        checkCompletedWithWrappedCFException(h);
2105        g.complete(v2);
2106        checkCompletedNormally(f, v1);
2107        checkCompletedNormally(g, v2);
2108    }}
2109
2110    public void testAcceptEither_actionFailed2() {
2111        for (ExecutionMode m : ExecutionMode.values())
2112        for (Integer v1 : new Integer[] { 1, null })
2113        for (Integer v2 : new Integer[] { 2, null })
2114    {
2115        final CompletableFuture<Integer> f = new CompletableFuture<>();
2116        final CompletableFuture<Integer> g = new CompletableFuture<>();
2117        final FailingConsumer r = new FailingConsumer(m);
2118        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2119
2120        g.complete(v2);
2121        checkCompletedWithWrappedCFException(h);
2122        f.complete(v1);
2377          checkCompletedNormally(f, v1);
2378 <        checkCompletedNormally(g, v2);
2378 >        checkCompletedExceptionally(g, ex);
2379      }}
2380  
2381      /**
2382       * acceptEither result completes exceptionally if either source cancelled
2383       */
2384 <    public void testAcceptEither_sourceCancelled1() {
2131 <        for (ExecutionMode m : ExecutionMode.values())
2132 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null })
2134 <    {
2135 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2137 <        final IncAction r = new IncAction();
2138 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2139 <
2140 <        assertTrue(f.cancel(mayInterruptIfRunning));
2141 <        checkCompletedWithWrappedCancellationException(h);
2142 <        g.complete(v1);
2143 <
2144 <        checkCancelled(f);
2145 <        assertEquals(0, r.invocationCount);
2146 <        checkCompletedNormally(g, v1);
2147 <        checkCompletedWithWrappedCancellationException(h);
2148 <    }}
2149 <
2150 <    public void testAcceptEither_sourceCancelled2() {
2384 >    public void testAcceptEither_sourceCancelled() {
2385          for (ExecutionMode m : ExecutionMode.values())
2386          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2387          for (Integer v1 : new Integer[] { 1, null })
2388      {
2389          final CompletableFuture<Integer> f = new CompletableFuture<>();
2390          final CompletableFuture<Integer> g = new CompletableFuture<>();
2391 <        final IncAction r = new IncAction();
2392 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2159 <
2160 <        assertTrue(g.cancel(mayInterruptIfRunning));
2161 <        checkCompletedWithWrappedCancellationException(h);
2162 <        f.complete(v1);
2391 >        final NoopConsumer[] rs = new NoopConsumer[6];
2392 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2393  
2394 <        checkCancelled(g);
2395 <        assertEquals(0, r.invocationCount);
2396 <        checkCompletedNormally(f, v1);
2397 <        checkCompletedWithWrappedCancellationException(h);
2398 <    }}
2394 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2395 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2396 >        checkIncomplete(h0);
2397 >        checkIncomplete(h1);
2398 >        rs[0].assertNotInvoked();
2399 >        rs[1].assertNotInvoked();
2400 >        f.cancel(mayInterruptIfRunning);
2401 >        checkCompletedWithWrappedCancellationException(h0);
2402 >        checkCompletedWithWrappedCancellationException(h1);
2403 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2404 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2405 >        checkCompletedWithWrappedCancellationException(h2);
2406 >        checkCompletedWithWrappedCancellationException(h3);
2407  
2408 <    public void testAcceptEither_sourceCancelled3() {
2171 <        for (ExecutionMode m : ExecutionMode.values())
2172 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2173 <        for (Integer v1 : new Integer[] { 1, null })
2174 <    {
2175 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2177 <        final IncAction r = new IncAction();
2178 <
2179 <        assertTrue(g.cancel(mayInterruptIfRunning));
2180 <        f.complete(v1);
2181 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2408 >        g.complete(v1);
2409  
2410 <        // unspecified behavior
2411 <        Integer v;
2410 >        // unspecified behavior - both source completions available
2411 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2412 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2413          try {
2414 <            assertNull(h.join());
2415 <            assertEquals(1, r.invocationCount);
2188 <            assertEquals(inc(v1), r.value);
2414 >            assertNull(h4.join());
2415 >            rs[4].assertValue(v1);
2416          } catch (CompletionException ok) {
2417 <            checkCompletedWithWrappedCancellationException(h);
2418 <            assertEquals(0, r.invocationCount);
2417 >            checkCompletedWithWrappedCancellationException(h4);
2418 >            rs[4].assertNotInvoked();
2419          }
2193
2194        checkCancelled(g);
2195        checkCompletedNormally(f, v1);
2196    }}
2197
2198    public void testAcceptEither_sourceCancelled4() {
2199        for (ExecutionMode m : ExecutionMode.values())
2200        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2201        for (Integer v1 : new Integer[] { 1, null })
2202    {
2203        final CompletableFuture<Integer> f = new CompletableFuture<>();
2204        final CompletableFuture<Integer> g = new CompletableFuture<>();
2205        final IncAction r = new IncAction();
2206
2207        assertTrue(f.cancel(mayInterruptIfRunning));
2208        g.complete(v1);
2209        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2210
2211        // unspecified behavior
2212        Integer v;
2420          try {
2421 <            assertNull(h.join());
2422 <            assertEquals(1, r.invocationCount);
2216 <            assertEquals(inc(v1), r.value);
2421 >            assertNull(h5.join());
2422 >            rs[5].assertValue(v1);
2423          } catch (CompletionException ok) {
2424 <            checkCompletedWithWrappedCancellationException(h);
2425 <            assertEquals(0, r.invocationCount);
2424 >            checkCompletedWithWrappedCancellationException(h5);
2425 >            rs[5].assertNotInvoked();
2426          }
2427  
2428          checkCancelled(f);
2429          checkCompletedNormally(g, v1);
2430 +        checkCompletedWithWrappedCancellationException(h0);
2431 +        checkCompletedWithWrappedCancellationException(h1);
2432 +        checkCompletedWithWrappedCancellationException(h2);
2433 +        checkCompletedWithWrappedCancellationException(h3);
2434 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2435      }}
2436  
2437      /**
2438 <     * runAfterEither result completes normally after normal completion
2228 <     * of either source
2438 >     * acceptEither result completes exceptionally if action does
2439       */
2440 <    public void testRunAfterEither_normalCompletion1() {
2440 >    public void testAcceptEither_actionFailed() {
2441          for (ExecutionMode m : ExecutionMode.values())
2442          for (Integer v1 : new Integer[] { 1, null })
2443          for (Integer v2 : new Integer[] { 2, null })
2444      {
2445          final CompletableFuture<Integer> f = new CompletableFuture<>();
2446          final CompletableFuture<Integer> g = new CompletableFuture<>();
2447 <        final Noop r = new Noop(m);
2448 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2447 >        final FailingConsumer[] rs = new FailingConsumer[6];
2448 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2449  
2450 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2451 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2452          f.complete(v1);
2453 <        checkCompletedNormally(h, null);
2454 <        assertEquals(1, r.invocationCount);
2453 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2454 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2455 >        checkCompletedWithWrappedCFException(h0);
2456 >        checkCompletedWithWrappedCFException(h1);
2457 >        checkCompletedWithWrappedCFException(h2);
2458 >        checkCompletedWithWrappedCFException(h3);
2459 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2460 >
2461          g.complete(v2);
2462  
2463 +        // unspecified behavior - both source completions available
2464 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2465 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2466 +
2467 +        checkCompletedWithWrappedCFException(h4);
2468 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2469 +                   Objects.equals(v2, rs[4].value));
2470 +        checkCompletedWithWrappedCFException(h5);
2471 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2472 +                   Objects.equals(v2, rs[5].value));
2473 +
2474          checkCompletedNormally(f, v1);
2475          checkCompletedNormally(g, v2);
2247        checkCompletedNormally(h, null);
2248        assertEquals(1, r.invocationCount);
2476      }}
2477  
2478 <    public void testRunAfterEither_normalCompletion2() {
2478 >    /**
2479 >     * runAfterEither result completes normally after normal completion
2480 >     * of either source
2481 >     */
2482 >    public void testRunAfterEither_normalCompletion() {
2483          for (ExecutionMode m : ExecutionMode.values())
2484          for (Integer v1 : new Integer[] { 1, null })
2485          for (Integer v2 : new Integer[] { 2, null })
2486      {
2487          final CompletableFuture<Integer> f = new CompletableFuture<>();
2488          final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 <        final Noop r = new Noop(m);
2490 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2489 >        final Noop[] rs = new Noop[6];
2490 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2491  
2492 <        g.complete(v2);
2493 <        checkCompletedNormally(h, null);
2494 <        assertEquals(1, r.invocationCount);
2492 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2493 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2494 >        checkIncomplete(h0);
2495 >        checkIncomplete(h1);
2496 >        rs[0].assertNotInvoked();
2497 >        rs[1].assertNotInvoked();
2498          f.complete(v1);
2499 +        checkCompletedNormally(h0, null);
2500 +        checkCompletedNormally(h1, null);
2501 +        rs[0].assertInvoked();
2502 +        rs[1].assertInvoked();
2503 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2504 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2505 +        checkCompletedNormally(h2, null);
2506 +        checkCompletedNormally(h3, null);
2507 +        rs[2].assertInvoked();
2508 +        rs[3].assertInvoked();
2509  
2266        checkCompletedNormally(f, v1);
2267        checkCompletedNormally(g, v2);
2268        checkCompletedNormally(h, null);
2269        assertEquals(1, r.invocationCount);
2270        }}
2271
2272    public void testRunAfterEither_normalCompletion3() {
2273        for (ExecutionMode m : ExecutionMode.values())
2274        for (Integer v1 : new Integer[] { 1, null })
2275        for (Integer v2 : new Integer[] { 2, null })
2276    {
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final Noop r = new Noop(m);
2280
2281        f.complete(v1);
2510          g.complete(v2);
2283        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2511  
2512 <        checkCompletedNormally(h, null);
2512 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2513 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2514 >
2515          checkCompletedNormally(f, v1);
2516          checkCompletedNormally(g, v2);
2517 <        assertEquals(1, r.invocationCount);
2517 >        checkCompletedNormally(h0, null);
2518 >        checkCompletedNormally(h1, null);
2519 >        checkCompletedNormally(h2, null);
2520 >        checkCompletedNormally(h3, null);
2521 >        checkCompletedNormally(h4, null);
2522 >        checkCompletedNormally(h5, null);
2523 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2524      }}
2525  
2526      /**
2527       * runAfterEither result completes exceptionally after exceptional
2528       * completion of either source
2529       */
2530 <    public void testRunAfterEither_exceptionalCompletion1() {
2296 <        for (ExecutionMode m : ExecutionMode.values())
2297 <        for (Integer v1 : new Integer[] { 1, null })
2298 <    {
2299 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2300 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2301 <        final Noop r = new Noop(m);
2302 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2303 <        final CFException ex = new CFException();
2304 <
2305 <        f.completeExceptionally(ex);
2306 <        checkCompletedWithWrappedCFException(h, ex);
2307 <        g.complete(v1);
2308 <
2309 <        assertEquals(0, r.invocationCount);
2310 <        checkCompletedNormally(g, v1);
2311 <        checkCompletedWithWrappedCFException(f, ex);
2312 <        checkCompletedWithWrappedCFException(h, ex);
2313 <    }}
2314 <
2315 <    public void testRunAfterEither_exceptionalCompletion2() {
2530 >    public void testRunAfterEither_exceptionalCompletion() {
2531          for (ExecutionMode m : ExecutionMode.values())
2532          for (Integer v1 : new Integer[] { 1, null })
2533      {
2534          final CompletableFuture<Integer> f = new CompletableFuture<>();
2535          final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final Noop r = new Noop(m);
2322        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2536          final CFException ex = new CFException();
2537 +        final Noop[] rs = new Noop[6];
2538 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2539  
2540 <        g.completeExceptionally(ex);
2541 <        checkCompletedWithWrappedCFException(h, ex);
2542 <        f.complete(v1);
2543 <
2544 <        assertEquals(0, r.invocationCount);
2545 <        checkCompletedNormally(f, v1);
2546 <        checkCompletedWithWrappedCFException(g, ex);
2547 <        checkCompletedWithWrappedCFException(h, ex);
2548 <    }}
2549 <
2550 <    public void testRunAfterEither_exceptionalCompletion3() {
2551 <        for (ExecutionMode m : ExecutionMode.values())
2552 <        for (Integer v1 : new Integer[] { 1, null })
2338 <    {
2339 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341 <        final Noop r = new Noop(m);
2342 <        final CFException ex = new CFException();
2540 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2541 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2542 >        checkIncomplete(h0);
2543 >        checkIncomplete(h1);
2544 >        rs[0].assertNotInvoked();
2545 >        rs[1].assertNotInvoked();
2546 >        assertTrue(f.completeExceptionally(ex));
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2550 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2551 >        checkCompletedWithWrappedException(h2, ex);
2552 >        checkCompletedWithWrappedException(h3, ex);
2553  
2554 <        g.completeExceptionally(ex);
2345 <        f.complete(v1);
2346 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2554 >        assertTrue(g.complete(v1));
2555  
2556 <        // unspecified behavior
2557 <        Integer v;
2556 >        // unspecified behavior - both source completions available
2557 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2558 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2559          try {
2560 <            assertNull(h.join());
2561 <            assertEquals(1, r.invocationCount);
2560 >            assertNull(h4.join());
2561 >            rs[4].assertInvoked();
2562          } catch (CompletionException ok) {
2563 <            checkCompletedWithWrappedCFException(h, ex);
2564 <            assertEquals(0, r.invocationCount);
2563 >            checkCompletedWithWrappedException(h4, ex);
2564 >            rs[4].assertNotInvoked();
2565          }
2357
2358        checkCompletedWithWrappedCFException(g, ex);
2359        checkCompletedNormally(f, v1);
2360    }}
2361
2362    public void testRunAfterEither_exceptionalCompletion4() {
2363        for (ExecutionMode m : ExecutionMode.values())
2364        for (Integer v1 : new Integer[] { 1, null })
2365    {
2366        final CompletableFuture<Integer> f = new CompletableFuture<>();
2367        final CompletableFuture<Integer> g = new CompletableFuture<>();
2368        final Noop r = new Noop(m);
2369        final CFException ex = new CFException();
2370
2371        f.completeExceptionally(ex);
2372        g.complete(v1);
2373        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2374
2375        // unspecified behavior
2376        Integer v;
2566          try {
2567 <            assertNull(h.join());
2568 <            assertEquals(1, r.invocationCount);
2567 >            assertNull(h5.join());
2568 >            rs[5].assertInvoked();
2569          } catch (CompletionException ok) {
2570 <            checkCompletedWithWrappedCFException(h, ex);
2571 <            assertEquals(0, r.invocationCount);
2570 >            checkCompletedWithWrappedException(h5, ex);
2571 >            rs[5].assertNotInvoked();
2572          }
2573  
2574 <        checkCompletedWithWrappedCFException(f, ex);
2574 >        checkCompletedExceptionally(f, ex);
2575          checkCompletedNormally(g, v1);
2576 +        checkCompletedWithWrappedException(h0, ex);
2577 +        checkCompletedWithWrappedException(h1, ex);
2578 +        checkCompletedWithWrappedException(h2, ex);
2579 +        checkCompletedWithWrappedException(h3, ex);
2580 +        checkCompletedWithWrappedException(h4, ex);
2581 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2582      }}
2583  
2584 <    /**
2390 <     * runAfterEither result completes exceptionally if action does
2391 <     */
2392 <    public void testRunAfterEither_actionFailed1() {
2584 >    public void testRunAfterEither_exceptionalCompletion2() {
2585          for (ExecutionMode m : ExecutionMode.values())
2586 +        for (boolean fFirst : new boolean[] { true, false })
2587          for (Integer v1 : new Integer[] { 1, null })
2395        for (Integer v2 : new Integer[] { 2, null })
2588      {
2589          final CompletableFuture<Integer> f = new CompletableFuture<>();
2590          final CompletableFuture<Integer> g = new CompletableFuture<>();
2591 <        final FailingRunnable r = new FailingRunnable(m);
2592 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2591 >        final CFException ex = new CFException();
2592 >        final Noop[] rs = new Noop[6];
2593 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2594  
2595 <        f.complete(v1);
2596 <        checkCompletedWithWrappedCFException(h);
2597 <        g.complete(v2);
2598 <        checkCompletedNormally(f, v1);
2599 <        checkCompletedNormally(g, v2);
2600 <    }}
2595 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2596 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2597 >        assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2598 >        assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2599 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2600 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2601  
2602 <    public void testRunAfterEither_actionFailed2() {
2603 <        for (ExecutionMode m : ExecutionMode.values())
2604 <        for (Integer v1 : new Integer[] { 1, null })
2605 <        for (Integer v2 : new Integer[] { 2, null })
2606 <    {
2607 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2608 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2609 <        final FailingRunnable r = new FailingRunnable(m);
2610 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2602 >        // unspecified behavior - both source completions available
2603 >        try {
2604 >            assertEquals(null, h0.join());
2605 >            rs[0].assertInvoked();
2606 >        } catch (CompletionException ok) {
2607 >            checkCompletedWithWrappedException(h0, ex);
2608 >            rs[0].assertNotInvoked();
2609 >        }
2610 >        try {
2611 >            assertEquals(null, h1.join());
2612 >            rs[1].assertInvoked();
2613 >        } catch (CompletionException ok) {
2614 >            checkCompletedWithWrappedException(h1, ex);
2615 >            rs[1].assertNotInvoked();
2616 >        }
2617 >        try {
2618 >            assertEquals(null, h2.join());
2619 >            rs[2].assertInvoked();
2620 >        } catch (CompletionException ok) {
2621 >            checkCompletedWithWrappedException(h2, ex);
2622 >            rs[2].assertNotInvoked();
2623 >        }
2624 >        try {
2625 >            assertEquals(null, h3.join());
2626 >            rs[3].assertInvoked();
2627 >        } catch (CompletionException ok) {
2628 >            checkCompletedWithWrappedException(h3, ex);
2629 >            rs[3].assertNotInvoked();
2630 >        }
2631  
2419        g.complete(v2);
2420        checkCompletedWithWrappedCFException(h);
2421        f.complete(v1);
2632          checkCompletedNormally(f, v1);
2633 <        checkCompletedNormally(g, v2);
2633 >        checkCompletedExceptionally(g, ex);
2634      }}
2635  
2636      /**
2637       * runAfterEither result completes exceptionally if either source cancelled
2638       */
2639 <    public void testRunAfterEither_sourceCancelled1() {
2639 >    public void testRunAfterEither_sourceCancelled() {
2640          for (ExecutionMode m : ExecutionMode.values())
2641          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2642          for (Integer v1 : new Integer[] { 1, null })
2643      {
2644          final CompletableFuture<Integer> f = new CompletableFuture<>();
2645          final CompletableFuture<Integer> g = new CompletableFuture<>();
2646 <        final Noop r = new Noop(m);
2647 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2646 >        final Noop[] rs = new Noop[6];
2647 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2648  
2649 <        assertTrue(f.cancel(mayInterruptIfRunning));
2650 <        checkCompletedWithWrappedCancellationException(h);
2651 <        g.complete(v1);
2652 <
2653 <        checkCancelled(f);
2654 <        assertEquals(0, r.invocationCount);
2655 <        checkCompletedNormally(g, v1);
2656 <        checkCompletedWithWrappedCancellationException(h);
2657 <    }}
2658 <
2659 <    public void testRunAfterEither_sourceCancelled2() {
2660 <        for (ExecutionMode m : ExecutionMode.values())
2661 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2662 <        for (Integer v1 : new Integer[] { 1, null })
2663 <    {
2664 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2665 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2666 <        final Noop r = new Noop(m);
2667 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2458 <
2459 <        assertTrue(g.cancel(mayInterruptIfRunning));
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <        f.complete(v1);
2462 <
2463 <        checkCancelled(g);
2464 <        assertEquals(0, r.invocationCount);
2465 <        checkCompletedNormally(f, v1);
2466 <        checkCompletedWithWrappedCancellationException(h);
2467 <    }}
2468 <
2469 <    public void testRunAfterEither_sourceCancelled3() {
2470 <        for (ExecutionMode m : ExecutionMode.values())
2471 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2472 <        for (Integer v1 : new Integer[] { 1, null })
2473 <    {
2474 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2475 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2476 <        final Noop r = new Noop(m);
2477 <
2478 <        assertTrue(g.cancel(mayInterruptIfRunning));
2479 <        f.complete(v1);
2480 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2481 <
2482 <        // unspecified behavior
2483 <        Integer v;
2649 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2650 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2651 >        checkIncomplete(h0);
2652 >        checkIncomplete(h1);
2653 >        rs[0].assertNotInvoked();
2654 >        rs[1].assertNotInvoked();
2655 >        f.cancel(mayInterruptIfRunning);
2656 >        checkCompletedWithWrappedCancellationException(h0);
2657 >        checkCompletedWithWrappedCancellationException(h1);
2658 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2659 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2660 >        checkCompletedWithWrappedCancellationException(h2);
2661 >        checkCompletedWithWrappedCancellationException(h3);
2662 >
2663 >        assertTrue(g.complete(v1));
2664 >
2665 >        // unspecified behavior - both source completions available
2666 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2667 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2668          try {
2669 <            assertNull(h.join());
2670 <            assertEquals(1, r.invocationCount);
2669 >            assertNull(h4.join());
2670 >            rs[4].assertInvoked();
2671          } catch (CompletionException ok) {
2672 <            checkCompletedWithWrappedCancellationException(h);
2673 <            assertEquals(0, r.invocationCount);
2672 >            checkCompletedWithWrappedCancellationException(h4);
2673 >            rs[4].assertNotInvoked();
2674 >        }
2675 >        try {
2676 >            assertNull(h5.join());
2677 >            rs[5].assertInvoked();
2678 >        } catch (CompletionException ok) {
2679 >            checkCompletedWithWrappedCancellationException(h5);
2680 >            rs[5].assertNotInvoked();
2681          }
2682  
2683 <        checkCancelled(g);
2684 <        checkCompletedNormally(f, v1);
2683 >        checkCancelled(f);
2684 >        checkCompletedNormally(g, v1);
2685 >        checkCompletedWithWrappedCancellationException(h0);
2686 >        checkCompletedWithWrappedCancellationException(h1);
2687 >        checkCompletedWithWrappedCancellationException(h2);
2688 >        checkCompletedWithWrappedCancellationException(h3);
2689 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2690      }}
2691  
2692 <    public void testRunAfterEither_sourceCancelled4() {
2692 >    /**
2693 >     * runAfterEither result completes exceptionally if action does
2694 >     */
2695 >    public void testRunAfterEither_actionFailed() {
2696          for (ExecutionMode m : ExecutionMode.values())
2498        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2697          for (Integer v1 : new Integer[] { 1, null })
2698 +        for (Integer v2 : new Integer[] { 2, null })
2699      {
2700          final CompletableFuture<Integer> f = new CompletableFuture<>();
2701          final CompletableFuture<Integer> g = new CompletableFuture<>();
2702 <        final Noop r = new Noop(m);
2702 >        final FailingRunnable[] rs = new FailingRunnable[6];
2703 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2704  
2705 <        assertTrue(f.cancel(mayInterruptIfRunning));
2706 <        g.complete(v1);
2707 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2708 <
2709 <        // unspecified behavior
2710 <        Integer v;
2711 <        try {
2712 <            assertNull(h.join());
2713 <            assertEquals(1, r.invocationCount);
2714 <        } catch (CompletionException ok) {
2715 <            checkCompletedWithWrappedCancellationException(h);
2716 <            assertEquals(0, r.invocationCount);
2717 <        }
2705 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2706 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2707 >        assertTrue(f.complete(v1));
2708 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2709 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2710 >        checkCompletedWithWrappedCFException(h0);
2711 >        checkCompletedWithWrappedCFException(h1);
2712 >        checkCompletedWithWrappedCFException(h2);
2713 >        checkCompletedWithWrappedCFException(h3);
2714 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2715 >        assertTrue(g.complete(v2));
2716 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2717 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2718 >        checkCompletedWithWrappedCFException(h4);
2719 >        checkCompletedWithWrappedCFException(h5);
2720  
2721 <        checkCancelled(f);
2722 <        checkCompletedNormally(g, v1);
2721 >        checkCompletedNormally(f, v1);
2722 >        checkCompletedNormally(g, v2);
2723 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2724      }}
2725  
2726      /**
# Line 2530 | Line 2733 | public class CompletableFutureTest exten
2733      {
2734          final CompletableFuture<Integer> f = new CompletableFuture<>();
2735          final CompletableFutureInc r = new CompletableFutureInc(m);
2736 <        if (!createIncomplete) f.complete(v1);
2736 >        if (!createIncomplete) assertTrue(f.complete(v1));
2737          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2738 <        if (createIncomplete) f.complete(v1);
2738 >        if (createIncomplete) assertTrue(f.complete(v1));
2739  
2740          checkCompletedNormally(g, inc(v1));
2741          checkCompletedNormally(f, v1);
2742 <        assertEquals(1, r.invocationCount);
2742 >        r.assertValue(v1);
2743      }}
2744  
2745      /**
# Line 2554 | Line 2757 | public class CompletableFutureTest exten
2757          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2758          if (createIncomplete) f.completeExceptionally(ex);
2759  
2760 <        checkCompletedWithWrappedCFException(g, ex);
2761 <        checkCompletedWithWrappedCFException(f, ex);
2762 <        assertEquals(0, r.invocationCount);
2760 >        checkCompletedWithWrappedException(g, ex);
2761 >        checkCompletedExceptionally(f, ex);
2762 >        r.assertNotInvoked();
2763      }}
2764  
2765      /**
# Line 2570 | Line 2773 | public class CompletableFutureTest exten
2773          final CompletableFuture<Integer> f = new CompletableFuture<>();
2774          final FailingCompletableFutureFunction r
2775              = new FailingCompletableFutureFunction(m);
2776 <        if (!createIncomplete) f.complete(v1);
2776 >        if (!createIncomplete) assertTrue(f.complete(v1));
2777          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2778 <        if (createIncomplete) f.complete(v1);
2778 >        if (createIncomplete) assertTrue(f.complete(v1));
2779  
2780          checkCompletedWithWrappedCFException(g);
2781          checkCompletedNormally(f, v1);
# Line 2811 | Line 3014 | public class CompletableFutureTest exten
3014          assertSame(f, f.toCompletableFuture());
3015      }
3016  
3017 <    /**
3018 <     * whenComplete action executes on normal completion, propagating
3019 <     * source result.
3020 <     */
3021 <    public void testWhenComplete_normalCompletion1() {
3022 <        for (ExecutionMode m : ExecutionMode.values())
3023 <        for (boolean createIncomplete : new boolean[] { true, false })
3024 <        for (Integer v1 : new Integer[] { 1, null })
3025 <    {
3026 <        final AtomicInteger a = new AtomicInteger(0);
3027 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3028 <        if (!createIncomplete) f.complete(v1);
3029 <        final CompletableFuture<Integer> g = m.whenComplete
3030 <            (f,
3031 <             (Integer x, Throwable t) -> {
3032 <                threadAssertSame(x, v1);
3033 <                threadAssertNull(t);
2831 <                a.getAndIncrement();
2832 <            });
2833 <        if (createIncomplete) f.complete(v1);
2834 <
2835 <        checkCompletedNormally(g, v1);
2836 <        checkCompletedNormally(f, v1);
2837 <        assertEquals(1, a.get());
2838 <    }}
2839 <
2840 <    /**
2841 <     * whenComplete action executes on exceptional completion, propagating
2842 <     * source result.
2843 <     */
2844 <    public void testWhenComplete_exceptionalCompletion() {
2845 <        for (ExecutionMode m : ExecutionMode.values())
2846 <        for (boolean createIncomplete : new boolean[] { true, false })
2847 <        for (Integer v1 : new Integer[] { 1, null })
2848 <    {
2849 <        final AtomicInteger a = new AtomicInteger(0);
2850 <        final CFException ex = new CFException();
2851 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2852 <        if (!createIncomplete) f.completeExceptionally(ex);
2853 <        final CompletableFuture<Integer> g = m.whenComplete
2854 <            (f,
2855 <             (Integer x, Throwable t) -> {
2856 <                threadAssertNull(x);
2857 <                threadAssertSame(t, ex);
2858 <                a.getAndIncrement();
2859 <            });
2860 <        if (createIncomplete) f.completeExceptionally(ex);
2861 <        checkCompletedWithWrappedCFException(f, ex);
2862 <        checkCompletedWithWrappedCFException(g, ex);
2863 <        assertEquals(1, a.get());
2864 <    }}
2865 <
2866 <    /**
2867 <     * whenComplete action executes on cancelled source, propagating
2868 <     * CancellationException.
2869 <     */
2870 <    public void testWhenComplete_sourceCancelled() {
2871 <        for (ExecutionMode m : ExecutionMode.values())
2872 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2873 <        for (boolean createIncomplete : new boolean[] { true, false })
2874 <    {
2875 <        final AtomicInteger a = new AtomicInteger(0);
2876 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2877 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2878 <        final CompletableFuture<Integer> g = m.whenComplete
2879 <            (f,
2880 <             (Integer x, Throwable t) -> {
2881 <                threadAssertNull(x);
2882 <                threadAssertTrue(t instanceof CancellationException);
2883 <                a.getAndIncrement();
2884 <            });
2885 <        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2886 <
2887 <        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2888 <        checkCompletedWithWrappedCancellationException(g);
2889 <        checkCancelled(f);
2890 <        assertEquals(1, a.get());
2891 <    }}
2892 <
2893 <    /**
2894 <     * If a whenComplete action throws an exception when triggered by
2895 <     * a normal completion, it completes exceptionally
2896 <     */
2897 <    public void testWhenComplete_actionFailed() {
2898 <        for (boolean createIncomplete : new boolean[] { true, false })
2899 <        for (ExecutionMode m : ExecutionMode.values())
2900 <        for (Integer v1 : new Integer[] { 1, null })
2901 <    {
2902 <        final AtomicInteger a = new AtomicInteger(0);
2903 <        final CFException ex = new CFException();
2904 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2905 <        if (!createIncomplete) f.complete(v1);
2906 <        final CompletableFuture<Integer> g = m.whenComplete
2907 <            (f,
2908 <             (Integer x, Throwable t) -> {
2909 <                threadAssertSame(x, v1);
2910 <                threadAssertNull(t);
2911 <                a.getAndIncrement();
2912 <                throw ex;
2913 <            });
2914 <        if (createIncomplete) f.complete(v1);
2915 <        checkCompletedNormally(f, v1);
2916 <        checkCompletedWithWrappedCFException(g, ex);
2917 <        assertEquals(1, a.get());
2918 <    }}
2919 <
2920 <    /**
2921 <     * If a whenComplete action throws an exception when triggered by
2922 <     * a source completion that also throws an exception, the source
2923 <     * exception takes precedence.
2924 <     */
2925 <    public void testWhenComplete_actionFailedSourceFailed() {
2926 <        for (boolean createIncomplete : new boolean[] { true, false })
2927 <        for (ExecutionMode m : ExecutionMode.values())
2928 <        for (Integer v1 : new Integer[] { 1, null })
2929 <    {
2930 <        final AtomicInteger a = new AtomicInteger(0);
2931 <        final CFException ex1 = new CFException();
2932 <        final CFException ex2 = new CFException();
2933 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2934 <
2935 <        if (!createIncomplete) f.completeExceptionally(ex1);
2936 <        final CompletableFuture<Integer> g = m.whenComplete
2937 <            (f,
2938 <             (Integer x, Throwable t) -> {
2939 <                threadAssertSame(t, ex1);
2940 <                threadAssertNull(x);
2941 <                a.getAndIncrement();
2942 <                throw ex2;
2943 <            });
2944 <        if (createIncomplete) f.completeExceptionally(ex1);
2945 <
2946 <        checkCompletedWithWrappedCFException(f, ex1);
2947 <        checkCompletedWithWrappedCFException(g, ex1);
2948 <        assertEquals(1, a.get());
2949 <    }}
3017 > //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3018 > //         for (ExecutionMode m : ExecutionMode.values())
3019 > //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3020 > //         for (Integer v1 : new Integer[] { 1, null })
3021 > //     {
3022 > //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3023 > //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3024 > //         final Noop[] rs = new Noop[2];
3025 > //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3026 > //         f.complete(v1);
3027 > //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3028 > //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3029 > //         assertTrue(g.cancel(mayInterruptIfRunning));
3030 > //         checkCompletedNormally(h0, null);
3031 > //         checkCompletedNormally(h1, null);
3032 > //         for (Noop r : rs) r.assertInvoked();
3033 > //     }}
3034  
3035   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines