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.59 by jsr166, Tue Jun 3 03:54:14 2014 UTC vs.
Revision 1.75 by jsr166, Sat Jun 7 21:14:42 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 218 | Line 239 | public class CompletableFutureTest exten
239       */
240      public void testCompleteExceptionally() {
241          CompletableFuture<Integer> f = new CompletableFuture<>();
242 +        CFException ex = new CFException();
243          checkIncomplete(f);
244 <        f.completeExceptionally(new CFException());
245 <        checkCompletedWithWrappedCFException(f);
244 >        f.completeExceptionally(ex);
245 >        checkCompletedExceptionally(f, ex);
246      }
247  
248      /**
# Line 261 | Line 283 | public class CompletableFutureTest exten
283       * obtrudeException forces completion with given exception
284       */
285      public void testObtrudeException() {
286 <        CompletableFuture<Integer> f = new CompletableFuture<>();
287 <        checkIncomplete(f);
288 <        f.complete(one);
289 <        checkCompletedNormally(f, one);
290 <        f.obtrudeException(new CFException());
269 <        checkCompletedWithWrappedCFException(f);
286 >        for (Integer v1 : new Integer[] { 1, null })
287 >    {
288 >        CFException ex;
289 >        CompletableFuture<Integer> f;
290 >
291          f = new CompletableFuture<>();
292 <        f.obtrudeException(new CFException());
293 <        checkCompletedWithWrappedCFException(f);
292 >        f.complete(v1);
293 >        for (int i = 0; i < 2; i++) {
294 >            f.obtrudeException(ex = new CFException());
295 >            checkCompletedExceptionally(f, ex);
296 >        }
297 >
298 >        f = new CompletableFuture<>();
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 +        f.completeExceptionally(ex = new CFException());
306 +        f.obtrudeValue(v1);
307 +        checkCompletedNormally(f, v1);
308 +        f.obtrudeException(ex = new CFException());
309 +        checkCompletedExceptionally(f, ex);
310          f.completeExceptionally(new CFException());
311 <        f.obtrudeValue(four);
312 <        checkCompletedNormally(f, four);
313 <        f.obtrudeException(new CFException());
314 <        checkCompletedWithWrappedCFException(f);
279 <    }
311 >        checkCompletedExceptionally(f, ex);
312 >        f.complete(v1);
313 >        checkCompletedExceptionally(f, ex);
314 >    }}
315  
316      /**
317       * getNumberOfDependents returns number of dependent tasks
# Line 310 | Line 345 | public class CompletableFutureTest exten
345          f = new CompletableFuture<String>();
346          f.completeExceptionally(new IndexOutOfBoundsException());
347          assertTrue(f.toString().contains("[Completed exceptionally]"));
348 +
349 +        f = new CompletableFuture<String>();
350 +        f.cancel(true);
351 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
352 +
353 +        f = new CompletableFuture<String>();
354 +        f.cancel(false);
355 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
356      }
357  
358      /**
# Line 320 | Line 363 | public class CompletableFutureTest exten
363          checkCompletedNormally(f, "test");
364      }
365  
366 <    // Choose non-commutative actions for better coverage
367 <
368 <    // A non-commutative function that handles and produces null values as well.
369 <    static Integer subtract(Integer x, Integer y) {
370 <        return (x == null && y == null) ? null :
371 <            ((x == null) ? 42 : x.intValue())
372 <            - ((y == null) ? 99 : y.intValue());
366 >    abstract class CheckedAction {
367 >        int invocationCount = 0;
368 >        final ExecutionMode m;
369 >        CheckedAction(ExecutionMode m) { this.m = m; }
370 >        void invoked() {
371 >            m.checkExecutionMode();
372 >            assertEquals(0, invocationCount++);
373 >        }
374 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
375 >        void assertInvoked() { assertEquals(1, invocationCount); }
376      }
377  
378 <    // A function that handles and produces null values as well.
379 <    static Integer inc(Integer x) {
380 <        return (x == null) ? null : x + 1;
378 >    abstract class CheckedIntegerAction extends CheckedAction {
379 >        Integer value;
380 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
381 >        void assertValue(Integer expected) {
382 >            assertInvoked();
383 >            assertEquals(expected, value);
384 >        }
385      }
386  
387 <    static final class IntegerSupplier implements Supplier<Integer> {
388 <        final ExecutionMode m;
389 <        int invocationCount = 0;
387 >    class IntegerSupplier extends CheckedAction
388 >        implements Supplier<Integer>
389 >    {
390          final Integer value;
391          IntegerSupplier(ExecutionMode m, Integer value) {
392 <            this.m = m;
392 >            super(m);
393              this.value = value;
394          }
395          public Integer get() {
396 <            m.checkExecutionMode();
347 <            invocationCount++;
396 >            invoked();
397              return value;
398          }
399      }
400 <        
401 <    static final class IncAction implements Consumer<Integer> {
402 <        int invocationCount = 0;
403 <        Integer value;
400 >
401 >    // A function that handles and produces null values as well.
402 >    static Integer inc(Integer x) {
403 >        return (x == null) ? null : x + 1;
404 >    }
405 >
406 >    class NoopConsumer extends CheckedIntegerAction
407 >        implements Consumer<Integer>
408 >    {
409 >        NoopConsumer(ExecutionMode m) { super(m); }
410          public void accept(Integer x) {
411 <            invocationCount++;
412 <            value = inc(x);
411 >            invoked();
412 >            value = x;
413          }
414      }
415 <    static final class IncFunction implements Function<Integer,Integer> {
416 <        final ExecutionMode m;
417 <        int invocationCount = 0;
418 <        Integer value;
419 <        IncFunction(ExecutionMode m) { this.m = m; }
415 >
416 >    class IncFunction extends CheckedIntegerAction
417 >        implements Function<Integer,Integer>
418 >    {
419 >        IncFunction(ExecutionMode m) { super(m); }
420          public Integer apply(Integer x) {
421 <            m.checkExecutionMode();
367 <            invocationCount++;
421 >            invoked();
422              return value = inc(x);
423          }
424      }
425 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
426 <        final ExecutionMode m;
427 <        int invocationCount = 0;
428 <        Integer value;
429 <        // Check this action was invoked exactly once when result is computed.
430 <        SubtractAction(ExecutionMode m) { this.m = m; }
425 >
426 >    // Choose non-commutative actions for better coverage
427 >    // A non-commutative function that handles and produces null values as well.
428 >    static Integer subtract(Integer x, Integer y) {
429 >        return (x == null && y == null) ? null :
430 >            ((x == null) ? 42 : x.intValue())
431 >            - ((y == null) ? 99 : y.intValue());
432 >    }
433 >
434 >    class SubtractAction extends CheckedIntegerAction
435 >        implements BiConsumer<Integer, Integer>
436 >    {
437 >        SubtractAction(ExecutionMode m) { super(m); }
438          public void accept(Integer x, Integer y) {
439 <            m.checkExecutionMode();
379 <            invocationCount++;
439 >            invoked();
440              value = subtract(x, y);
441          }
442      }
443 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
444 <        final ExecutionMode m;
445 <        int invocationCount = 0;
446 <        Integer value;
447 <        // Check this action was invoked exactly once when result is computed.
388 <        SubtractFunction(ExecutionMode m) { this.m = m; }
443 >
444 >    class SubtractFunction extends CheckedIntegerAction
445 >        implements BiFunction<Integer, Integer, Integer>
446 >    {
447 >        SubtractFunction(ExecutionMode m) { super(m); }
448          public Integer apply(Integer x, Integer y) {
449 <            m.checkExecutionMode();
391 <            invocationCount++;
449 >            invoked();
450              return value = subtract(x, y);
451          }
452      }
453 <    static final class Noop implements Runnable {
454 <        final ExecutionMode m;
455 <        int invocationCount = 0;
398 <        Noop(ExecutionMode m) { this.m = m; }
453 >
454 >    class Noop extends CheckedAction implements Runnable {
455 >        Noop(ExecutionMode m) { super(m); }
456          public void run() {
457 <            m.checkExecutionMode();
401 <            invocationCount++;
457 >            invoked();
458          }
459      }
460  
461 <    static final class FailingSupplier implements Supplier<Integer> {
462 <        final ExecutionMode m;
463 <        int invocationCount = 0;
464 <        FailingSupplier(ExecutionMode m) { this.m = m; }
461 >    class FailingSupplier extends CheckedAction
462 >        implements Supplier<Integer>
463 >    {
464 >        FailingSupplier(ExecutionMode m) { super(m); }
465          public Integer get() {
466 <            m.checkExecutionMode();
411 <            invocationCount++;
466 >            invoked();
467              throw new CFException();
468          }
469      }
470 <    static final class FailingConsumer implements Consumer<Integer> {
471 <        final ExecutionMode m;
472 <        int invocationCount = 0;
473 <        FailingConsumer(ExecutionMode m) { this.m = m; }
470 >
471 >    class FailingConsumer extends CheckedIntegerAction
472 >        implements Consumer<Integer>
473 >    {
474 >        FailingConsumer(ExecutionMode m) { super(m); }
475          public void accept(Integer x) {
476 <            m.checkExecutionMode();
477 <            invocationCount++;
476 >            invoked();
477 >            value = x;
478              throw new CFException();
479          }
480      }
481 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
482 <        final ExecutionMode m;
483 <        int invocationCount = 0;
484 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
481 >
482 >    class FailingBiConsumer extends CheckedIntegerAction
483 >        implements BiConsumer<Integer, Integer>
484 >    {
485 >        FailingBiConsumer(ExecutionMode m) { super(m); }
486          public void accept(Integer x, Integer y) {
487 <            m.checkExecutionMode();
488 <            invocationCount++;
487 >            invoked();
488 >            value = subtract(x, y);
489              throw new CFException();
490          }
491      }
492 <    static final class FailingFunction implements Function<Integer, Integer> {
493 <        final ExecutionMode m;
494 <        int invocationCount = 0;
495 <        FailingFunction(ExecutionMode m) { this.m = m; }
492 >
493 >    class FailingFunction extends CheckedIntegerAction
494 >        implements Function<Integer, Integer>
495 >    {
496 >        FailingFunction(ExecutionMode m) { super(m); }
497          public Integer apply(Integer x) {
498 <            m.checkExecutionMode();
499 <            invocationCount++;
498 >            invoked();
499 >            value = x;
500              throw new CFException();
501          }
502      }
503 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
504 <        final ExecutionMode m;
505 <        int invocationCount = 0;
506 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
503 >
504 >    class FailingBiFunction extends CheckedIntegerAction
505 >        implements BiFunction<Integer, Integer, Integer>
506 >    {
507 >        FailingBiFunction(ExecutionMode m) { super(m); }
508          public Integer apply(Integer x, Integer y) {
509 <            m.checkExecutionMode();
510 <            invocationCount++;
509 >            invoked();
510 >            value = subtract(x, y);
511              throw new CFException();
512          }
513      }
514 <    static final class FailingRunnable implements Runnable {
515 <        final ExecutionMode m;
516 <        int invocationCount = 0;
458 <        FailingRunnable(ExecutionMode m) { this.m = m; }
514 >
515 >    class FailingRunnable extends CheckedAction implements Runnable {
516 >        FailingRunnable(ExecutionMode m) { super(m); }
517          public void run() {
518 <            m.checkExecutionMode();
461 <            invocationCount++;
518 >            invoked();
519              throw new CFException();
520          }
521      }
522  
523 <    static final class CompletableFutureInc
524 <        implements Function<Integer, CompletableFuture<Integer>> {
525 <        final ExecutionMode m;
526 <        int invocationCount = 0;
527 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
523 >
524 >    class CompletableFutureInc extends CheckedIntegerAction
525 >        implements Function<Integer, CompletableFuture<Integer>>
526 >    {
527 >        CompletableFutureInc(ExecutionMode m) { super(m); }
528          public CompletableFuture<Integer> apply(Integer x) {
529 <            m.checkExecutionMode();
530 <            invocationCount++;
529 >            invoked();
530 >            value = x;
531              CompletableFuture<Integer> f = new CompletableFuture<>();
532              f.complete(inc(x));
533              return f;
534          }
535      }
536  
537 <    static final class FailingCompletableFutureFunction
538 <        implements Function<Integer, CompletableFuture<Integer>> {
539 <        final ExecutionMode m;
540 <        int invocationCount = 0;
484 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
537 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
538 >        implements Function<Integer, CompletableFuture<Integer>>
539 >    {
540 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
541          public CompletableFuture<Integer> apply(Integer x) {
542 <            m.checkExecutionMode();
543 <            invocationCount++;
542 >            invoked();
543 >            value = x;
544              throw new CFException();
545          }
546      }
# Line 505 | Line 561 | public class CompletableFutureTest exten
561  
562      /**
563       * Permits the testing of parallel code for the 3 different
564 <     * execution modes without repeating all the testing code.
564 >     * execution modes without copy/pasting all the test methods.
565       */
566      enum ExecutionMode {
567          DEFAULT {
568              public void checkExecutionMode() {
569 +                assertFalse(ThreadExecutor.startedCurrentThread());
570                  assertNull(ForkJoinTask.getPool());
571              }
572              public CompletableFuture<Void> runAsync(Runnable a) {
# Line 794 | Line 851 | public class CompletableFutureTest exten
851          assertEquals(0, a.get());
852      }}
853  
797
854      /**
855       * exceptionally action completes with function value on source
856       * exception
# Line 838 | Line 894 | public class CompletableFutureTest exten
894              });
895          if (createIncomplete) f.completeExceptionally(ex1);
896  
897 <        checkCompletedWithWrappedCFException(g, ex2);
897 >        checkCompletedWithWrappedException(g, ex2);
898 >        assertEquals(1, a.get());
899 >    }}
900 >
901 >    /**
902 >     * whenComplete action executes on normal completion, propagating
903 >     * source result.
904 >     */
905 >    public void testWhenComplete_normalCompletion1() {
906 >        for (ExecutionMode m : ExecutionMode.values())
907 >        for (boolean createIncomplete : new boolean[] { true, false })
908 >        for (Integer v1 : new Integer[] { 1, null })
909 >    {
910 >        final AtomicInteger a = new AtomicInteger(0);
911 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
912 >        if (!createIncomplete) f.complete(v1);
913 >        final CompletableFuture<Integer> g = m.whenComplete
914 >            (f,
915 >             (Integer x, Throwable t) -> {
916 >                m.checkExecutionMode();
917 >                threadAssertSame(x, v1);
918 >                threadAssertNull(t);
919 >                a.getAndIncrement();
920 >            });
921 >        if (createIncomplete) f.complete(v1);
922 >
923 >        checkCompletedNormally(g, v1);
924 >        checkCompletedNormally(f, v1);
925 >        assertEquals(1, a.get());
926 >    }}
927 >
928 >    /**
929 >     * whenComplete action executes on exceptional completion, propagating
930 >     * source result.
931 >     */
932 >    public void testWhenComplete_exceptionalCompletion() {
933 >        for (ExecutionMode m : ExecutionMode.values())
934 >        for (boolean createIncomplete : new boolean[] { true, false })
935 >        for (Integer v1 : new Integer[] { 1, null })
936 >    {
937 >        final AtomicInteger a = new AtomicInteger(0);
938 >        final CFException ex = new CFException();
939 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
940 >        if (!createIncomplete) f.completeExceptionally(ex);
941 >        final CompletableFuture<Integer> g = m.whenComplete
942 >            (f,
943 >             (Integer x, Throwable t) -> {
944 >                m.checkExecutionMode();
945 >                threadAssertNull(x);
946 >                threadAssertSame(t, ex);
947 >                a.getAndIncrement();
948 >            });
949 >        if (createIncomplete) f.completeExceptionally(ex);
950 >
951 >        checkCompletedWithWrappedException(g, ex);
952 >        checkCompletedExceptionally(f, ex);
953 >        assertEquals(1, a.get());
954 >    }}
955 >
956 >    /**
957 >     * whenComplete action executes on cancelled source, propagating
958 >     * CancellationException.
959 >     */
960 >    public void testWhenComplete_sourceCancelled() {
961 >        for (ExecutionMode m : ExecutionMode.values())
962 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
963 >        for (boolean createIncomplete : new boolean[] { true, false })
964 >    {
965 >        final AtomicInteger a = new AtomicInteger(0);
966 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
967 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
968 >        final CompletableFuture<Integer> g = m.whenComplete
969 >            (f,
970 >             (Integer x, Throwable t) -> {
971 >                m.checkExecutionMode();
972 >                threadAssertNull(x);
973 >                threadAssertTrue(t instanceof CancellationException);
974 >                a.getAndIncrement();
975 >            });
976 >        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
977 >
978 >        checkCompletedWithWrappedCancellationException(g);
979 >        checkCancelled(f);
980 >        assertEquals(1, a.get());
981 >    }}
982 >
983 >    /**
984 >     * If a whenComplete action throws an exception when triggered by
985 >     * a normal completion, it completes exceptionally
986 >     */
987 >    public void testWhenComplete_actionFailed() {
988 >        for (boolean createIncomplete : new boolean[] { true, false })
989 >        for (ExecutionMode m : ExecutionMode.values())
990 >        for (Integer v1 : new Integer[] { 1, null })
991 >    {
992 >        final AtomicInteger a = new AtomicInteger(0);
993 >        final CFException ex = new CFException();
994 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
995 >        if (!createIncomplete) f.complete(v1);
996 >        final CompletableFuture<Integer> g = m.whenComplete
997 >            (f,
998 >             (Integer x, Throwable t) -> {
999 >                m.checkExecutionMode();
1000 >                threadAssertSame(x, v1);
1001 >                threadAssertNull(t);
1002 >                a.getAndIncrement();
1003 >                throw ex;
1004 >            });
1005 >        if (createIncomplete) f.complete(v1);
1006 >
1007 >        checkCompletedWithWrappedException(g, ex);
1008 >        checkCompletedNormally(f, v1);
1009 >        assertEquals(1, a.get());
1010 >    }}
1011 >
1012 >    /**
1013 >     * If a whenComplete action throws an exception when triggered by
1014 >     * a source completion that also throws an exception, the source
1015 >     * exception takes precedence.
1016 >     */
1017 >    public void testWhenComplete_actionFailedSourceFailed() {
1018 >        for (boolean createIncomplete : new boolean[] { true, false })
1019 >        for (ExecutionMode m : ExecutionMode.values())
1020 >        for (Integer v1 : new Integer[] { 1, null })
1021 >    {
1022 >        final AtomicInteger a = new AtomicInteger(0);
1023 >        final CFException ex1 = new CFException();
1024 >        final CFException ex2 = new CFException();
1025 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
1026 >
1027 >        if (!createIncomplete) f.completeExceptionally(ex1);
1028 >        final CompletableFuture<Integer> g = m.whenComplete
1029 >            (f,
1030 >             (Integer x, Throwable t) -> {
1031 >                m.checkExecutionMode();
1032 >                threadAssertSame(t, ex1);
1033 >                threadAssertNull(x);
1034 >                a.getAndIncrement();
1035 >                throw ex2;
1036 >            });
1037 >        if (createIncomplete) f.completeExceptionally(ex1);
1038 >
1039 >        checkCompletedWithWrappedException(g, ex1);
1040 >        checkCompletedExceptionally(f, ex1);
1041          assertEquals(1, a.get());
1042      }}
1043  
# Line 895 | Line 1094 | public class CompletableFutureTest exten
1094          if (createIncomplete) f.completeExceptionally(ex);
1095  
1096          checkCompletedNormally(g, v1);
1097 <        checkCompletedWithWrappedCFException(f, ex);
1097 >        checkCompletedExceptionally(f, ex);
1098          assertEquals(1, a.get());
1099      }}
1100  
# Line 951 | Line 1150 | public class CompletableFutureTest exten
1150              });
1151          if (createIncomplete) f.completeExceptionally(ex1);
1152  
1153 <        checkCompletedWithWrappedCFException(g, ex2);
1154 <        checkCompletedWithWrappedCFException(f, ex1);
1153 >        checkCompletedWithWrappedException(g, ex2);
1154 >        checkCompletedExceptionally(f, ex1);
1155          assertEquals(1, a.get());
1156      }}
1157  
# Line 976 | Line 1175 | public class CompletableFutureTest exten
1175              });
1176          if (createIncomplete) f.complete(v1);
1177  
1178 <        checkCompletedWithWrappedCFException(g, ex);
1178 >        checkCompletedWithWrappedException(g, ex);
1179          checkCompletedNormally(f, v1);
1180          assertEquals(1, a.get());
1181      }}
# Line 995 | Line 1194 | public class CompletableFutureTest exten
1194          final CompletableFuture<Void> f = m.runAsync(r);
1195          assertNull(f.join());
1196          checkCompletedNormally(f, null);
1197 <        assertEquals(1, r.invocationCount);
1197 >        r.assertInvoked();
1198      }}
1199  
1200      /**
# Line 1011 | Line 1210 | public class CompletableFutureTest exten
1210          final FailingRunnable r = new FailingRunnable(m);
1211          final CompletableFuture<Void> f = m.runAsync(r);
1212          checkCompletedWithWrappedCFException(f);
1213 <        assertEquals(1, r.invocationCount);
1213 >        r.assertInvoked();
1214      }}
1215  
1216      /**
# Line 1029 | Line 1228 | public class CompletableFutureTest exten
1228          final CompletableFuture<Integer> f = m.supplyAsync(r);
1229          assertSame(v1, f.join());
1230          checkCompletedNormally(f, v1);
1231 <        assertEquals(1, r.invocationCount);
1231 >        r.assertInvoked();
1232      }}
1233  
1234      /**
# Line 1045 | Line 1244 | public class CompletableFutureTest exten
1244          FailingSupplier r = new FailingSupplier(m);
1245          CompletableFuture<Integer> f = m.supplyAsync(r);
1246          checkCompletedWithWrappedCFException(f);
1247 <        assertEquals(1, r.invocationCount);
1247 >        r.assertInvoked();
1248      }}
1249  
1250      // seq completion methods
# Line 1069 | Line 1268 | public class CompletableFutureTest exten
1268  
1269          checkCompletedNormally(g, null);
1270          checkCompletedNormally(f, v1);
1271 <        assertEquals(1, r.invocationCount);
1271 >        r.assertInvoked();
1272      }}
1273  
1274      /**
# Line 1090 | Line 1289 | public class CompletableFutureTest exten
1289              f.completeExceptionally(ex);
1290          }
1291  
1292 <        checkCompletedWithWrappedCFException(g, ex);
1293 <        checkCompletedWithWrappedCFException(f, ex);
1294 <        assertEquals(0, r.invocationCount);
1292 >        checkCompletedWithWrappedException(g, ex);
1293 >        checkCompletedExceptionally(f, ex);
1294 >        r.assertNotInvoked();
1295      }}
1296  
1297      /**
# Line 1114 | Line 1313 | public class CompletableFutureTest exten
1313  
1314          checkCompletedWithWrappedCancellationException(g);
1315          checkCancelled(f);
1316 <        assertEquals(0, r.invocationCount);
1316 >        r.assertNotInvoked();
1317      }}
1318  
1319      /**
# Line 1157 | Line 1356 | public class CompletableFutureTest exten
1356  
1357          checkCompletedNormally(g, inc(v1));
1358          checkCompletedNormally(f, v1);
1359 <        assertEquals(1, r.invocationCount);
1359 >        r.assertValue(inc(v1));
1360      }}
1361  
1362      /**
# Line 1178 | Line 1377 | public class CompletableFutureTest exten
1377              f.completeExceptionally(ex);
1378          }
1379  
1380 <        checkCompletedWithWrappedCFException(g, ex);
1381 <        checkCompletedWithWrappedCFException(f, ex);
1382 <        assertEquals(0, r.invocationCount);
1380 >        checkCompletedWithWrappedException(g, ex);
1381 >        checkCompletedExceptionally(f, ex);
1382 >        r.assertNotInvoked();
1383      }}
1384  
1385      /**
# Line 1202 | Line 1401 | public class CompletableFutureTest exten
1401  
1402          checkCompletedWithWrappedCancellationException(g);
1403          checkCancelled(f);
1404 <        assertEquals(0, r.invocationCount);
1404 >        r.assertNotInvoked();
1405      }}
1406  
1407      /**
# Line 1235 | Line 1434 | public class CompletableFutureTest exten
1434          for (Integer v1 : new Integer[] { 1, null })
1435      {
1436          final CompletableFuture<Integer> f = new CompletableFuture<>();
1437 <        final IncAction r = new IncAction();
1437 >        final NoopConsumer r = new NoopConsumer(m);
1438          if (!createIncomplete) f.complete(v1);
1439          final CompletableFuture<Void> g = m.thenAccept(f, r);
1440          if (createIncomplete) {
# Line 1244 | Line 1443 | public class CompletableFutureTest exten
1443          }
1444  
1445          checkCompletedNormally(g, null);
1446 +        r.assertValue(v1);
1447          checkCompletedNormally(f, v1);
1248        assertEquals(1, r.invocationCount);
1249        assertEquals(inc(v1), r.value);
1448      }}
1449  
1450      /**
# Line 1259 | Line 1457 | public class CompletableFutureTest exten
1457      {
1458          final CFException ex = new CFException();
1459          final CompletableFuture<Integer> f = new CompletableFuture<>();
1460 <        final IncAction r = new IncAction();
1460 >        final NoopConsumer r = new NoopConsumer(m);
1461          if (!createIncomplete) f.completeExceptionally(ex);
1462          final CompletableFuture<Void> g = m.thenAccept(f, r);
1463          if (createIncomplete) {
# Line 1267 | Line 1465 | public class CompletableFutureTest exten
1465              f.completeExceptionally(ex);
1466          }
1467  
1468 <        checkCompletedWithWrappedCFException(g, ex);
1469 <        checkCompletedWithWrappedCFException(f, ex);
1470 <        assertEquals(0, r.invocationCount);
1468 >        checkCompletedWithWrappedException(g, ex);
1469 >        checkCompletedExceptionally(f, ex);
1470 >        r.assertNotInvoked();
1471      }}
1472  
1473      /**
1474 <     * thenAccept result completes exceptionally if action does
1474 >     * thenAccept result completes exceptionally if source cancelled
1475       */
1476 <    public void testThenAccept_actionFailed() {
1476 >    public void testThenAccept_sourceCancelled() {
1477          for (ExecutionMode m : ExecutionMode.values())
1478          for (boolean createIncomplete : new boolean[] { true, false })
1479 <        for (Integer v1 : new Integer[] { 1, null })
1479 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1480      {
1481          final CompletableFuture<Integer> f = new CompletableFuture<>();
1482 <        final FailingConsumer r = new FailingConsumer(m);
1483 <        if (!createIncomplete) f.complete(v1);
1482 >        final NoopConsumer r = new NoopConsumer(m);
1483 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1484          final CompletableFuture<Void> g = m.thenAccept(f, r);
1485          if (createIncomplete) {
1486              checkIncomplete(g);
1487 <            f.complete(v1);
1487 >            assertTrue(f.cancel(mayInterruptIfRunning));
1488          }
1489  
1490 <        checkCompletedWithWrappedCFException(g);
1491 <        checkCompletedNormally(f, v1);
1490 >        checkCompletedWithWrappedCancellationException(g);
1491 >        checkCancelled(f);
1492 >        r.assertNotInvoked();
1493      }}
1494  
1495      /**
1496 <     * thenAccept result completes exceptionally if source cancelled
1496 >     * thenAccept result completes exceptionally if action does
1497       */
1498 <    public void testThenAccept_sourceCancelled() {
1498 >    public void testThenAccept_actionFailed() {
1499          for (ExecutionMode m : ExecutionMode.values())
1500          for (boolean createIncomplete : new boolean[] { true, false })
1501 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1501 >        for (Integer v1 : new Integer[] { 1, null })
1502      {
1503          final CompletableFuture<Integer> f = new CompletableFuture<>();
1504 <        final IncAction r = new IncAction();
1505 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1504 >        final FailingConsumer r = new FailingConsumer(m);
1505 >        if (!createIncomplete) f.complete(v1);
1506          final CompletableFuture<Void> g = m.thenAccept(f, r);
1507          if (createIncomplete) {
1508              checkIncomplete(g);
1509 <            assertTrue(f.cancel(mayInterruptIfRunning));
1509 >            f.complete(v1);
1510          }
1511  
1512 <        checkCompletedWithWrappedCancellationException(g);
1513 <        checkCancelled(f);
1315 <        assertEquals(0, r.invocationCount);
1512 >        checkCompletedWithWrappedCFException(g);
1513 >        checkCompletedNormally(f, v1);
1514      }}
1515  
1516      /**
# Line 1336 | Line 1534 | public class CompletableFutureTest exten
1534          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1535          if (createIncomplete) {
1536              checkIncomplete(h);
1537 <            assertEquals(0, r.invocationCount);
1537 >            r.assertNotInvoked();
1538              if (!fFirst) f.complete(v1); else g.complete(v2);
1539          }
1540  
1541          checkCompletedNormally(h, subtract(v1, v2));
1542          checkCompletedNormally(f, v1);
1543          checkCompletedNormally(g, v2);
1544 <        assertEquals(1, r.invocationCount);
1544 >        r.assertValue(subtract(v1, v2));
1545      }}
1546  
1547      /**
# Line 1370 | Line 1568 | public class CompletableFutureTest exten
1568              (!fFirst ? f : g).completeExceptionally(ex);
1569          }
1570  
1571 <        checkCompletedWithWrappedCFException(h, ex);
1572 <        assertEquals(0, r.invocationCount);
1571 >        checkCompletedWithWrappedException(h, ex);
1572 >        r.assertNotInvoked();
1573          checkCompletedNormally(fFirst ? f : g, v1);
1574 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1377 <    }}
1378 <
1379 <    /**
1380 <     * thenCombine result completes exceptionally if action does
1381 <     */
1382 <    public void testThenCombine_actionFailed() {
1383 <        for (ExecutionMode m : ExecutionMode.values())
1384 <        for (boolean fFirst : new boolean[] { true, false })
1385 <        for (Integer v1 : new Integer[] { 1, null })
1386 <        for (Integer v2 : new Integer[] { 2, null })
1387 <    {
1388 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1389 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1390 <        final FailingBiFunction r = new FailingBiFunction(m);
1391 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1392 <
1393 <        if (fFirst) {
1394 <            f.complete(v1);
1395 <            g.complete(v2);
1396 <        } else {
1397 <            g.complete(v2);
1398 <            f.complete(v1);
1399 <        }
1400 <
1401 <        checkCompletedWithWrappedCFException(h);
1402 <        checkCompletedNormally(f, v1);
1403 <        checkCompletedNormally(g, v2);
1574 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1575      }}
1576  
1577      /**
# Line 1428 | Line 1599 | public class CompletableFutureTest exten
1599  
1600          checkCompletedWithWrappedCancellationException(h);
1601          checkCancelled(!fFirst ? f : g);
1602 <        assertEquals(0, r.invocationCount);
1602 >        r.assertNotInvoked();
1603          checkCompletedNormally(fFirst ? f : g, v1);
1604      }}
1605  
1606      /**
1607 +     * thenCombine result completes exceptionally if action does
1608 +     */
1609 +    public void testThenCombine_actionFailed() {
1610 +        for (ExecutionMode m : ExecutionMode.values())
1611 +        for (boolean fFirst : new boolean[] { true, false })
1612 +        for (Integer v1 : new Integer[] { 1, null })
1613 +        for (Integer v2 : new Integer[] { 2, null })
1614 +    {
1615 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1616 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1617 +        final FailingBiFunction r = new FailingBiFunction(m);
1618 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1619 +
1620 +        if (fFirst) {
1621 +            f.complete(v1);
1622 +            g.complete(v2);
1623 +        } else {
1624 +            g.complete(v2);
1625 +            f.complete(v1);
1626 +        }
1627 +
1628 +        checkCompletedWithWrappedCFException(h);
1629 +        checkCompletedNormally(f, v1);
1630 +        checkCompletedNormally(g, v2);
1631 +    }}
1632 +
1633 +    /**
1634       * thenAcceptBoth result completes normally after normal
1635       * completion of sources
1636       */
# Line 1453 | Line 1651 | public class CompletableFutureTest exten
1651          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1652          if (createIncomplete) {
1653              checkIncomplete(h);
1654 <            assertEquals(0, r.invocationCount);
1654 >            r.assertNotInvoked();
1655              if (!fFirst) f.complete(v1); else g.complete(v2);
1656          }
1657  
1658          checkCompletedNormally(h, null);
1659 <        assertEquals(subtract(v1, v2), r.value);
1659 >        r.assertValue(subtract(v1, v2));
1660          checkCompletedNormally(f, v1);
1661          checkCompletedNormally(g, v2);
1662      }}
# Line 1487 | Line 1685 | public class CompletableFutureTest exten
1685              (!fFirst ? f : g).completeExceptionally(ex);
1686          }
1687  
1688 <        checkCompletedWithWrappedCFException(h, ex);
1689 <        assertEquals(0, r.invocationCount);
1688 >        checkCompletedWithWrappedException(h, ex);
1689 >        r.assertNotInvoked();
1690          checkCompletedNormally(fFirst ? f : g, v1);
1691 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1494 <    }}
1495 <
1496 <    /**
1497 <     * thenAcceptBoth result completes exceptionally if action does
1498 <     */
1499 <    public void testThenAcceptBoth_actionFailed() {
1500 <        for (ExecutionMode m : ExecutionMode.values())
1501 <        for (boolean fFirst : new boolean[] { true, false })
1502 <        for (Integer v1 : new Integer[] { 1, null })
1503 <        for (Integer v2 : new Integer[] { 2, null })
1504 <    {
1505 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1506 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1507 <        final FailingBiConsumer r = new FailingBiConsumer(m);
1508 <        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1509 <
1510 <        if (fFirst) {
1511 <            f.complete(v1);
1512 <            g.complete(v2);
1513 <        } else {
1514 <            g.complete(v2);
1515 <            f.complete(v1);
1516 <        }
1517 <
1518 <        checkCompletedWithWrappedCFException(h);
1519 <        checkCompletedNormally(f, v1);
1520 <        checkCompletedNormally(g, v2);
1691 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1692      }}
1693  
1694      /**
# Line 1545 | Line 1716 | public class CompletableFutureTest exten
1716  
1717          checkCompletedWithWrappedCancellationException(h);
1718          checkCancelled(!fFirst ? f : g);
1719 <        assertEquals(0, r.invocationCount);
1719 >        r.assertNotInvoked();
1720          checkCompletedNormally(fFirst ? f : g, v1);
1721      }}
1722  
1723      /**
1724 +     * thenAcceptBoth result completes exceptionally if action does
1725 +     */
1726 +    public void testThenAcceptBoth_actionFailed() {
1727 +        for (ExecutionMode m : ExecutionMode.values())
1728 +        for (boolean fFirst : new boolean[] { true, false })
1729 +        for (Integer v1 : new Integer[] { 1, null })
1730 +        for (Integer v2 : new Integer[] { 2, null })
1731 +    {
1732 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1733 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1734 +        final FailingBiConsumer r = new FailingBiConsumer(m);
1735 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1736 +
1737 +        if (fFirst) {
1738 +            f.complete(v1);
1739 +            g.complete(v2);
1740 +        } else {
1741 +            g.complete(v2);
1742 +            f.complete(v1);
1743 +        }
1744 +
1745 +        checkCompletedWithWrappedCFException(h);
1746 +        checkCompletedNormally(f, v1);
1747 +        checkCompletedNormally(g, v2);
1748 +    }}
1749 +
1750 +    /**
1751       * runAfterBoth result completes normally after normal
1752       * completion of sources
1753       */
# Line 1570 | Line 1768 | public class CompletableFutureTest exten
1768          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1769          if (createIncomplete) {
1770              checkIncomplete(h);
1771 <            assertEquals(0, r.invocationCount);
1771 >            r.assertNotInvoked();
1772              if (!fFirst) f.complete(v1); else g.complete(v2);
1773          }
1774  
1775          checkCompletedNormally(h, null);
1776 <        assertEquals(1, r.invocationCount);
1776 >        r.assertInvoked();
1777          checkCompletedNormally(f, v1);
1778          checkCompletedNormally(g, v2);
1779      }}
# Line 1604 | Line 1802 | public class CompletableFutureTest exten
1802              (!fFirst ? f : g).completeExceptionally(ex);
1803          }
1804  
1805 <        checkCompletedWithWrappedCFException(h, ex);
1806 <        assertEquals(0, r.invocationCount);
1805 >        checkCompletedWithWrappedException(h, ex);
1806 >        r.assertNotInvoked();
1807          checkCompletedNormally(fFirst ? f : g, v1);
1808 <        checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1611 <    }}
1612 <
1613 <    /**
1614 <     * runAfterBoth result completes exceptionally if action does
1615 <     */
1616 <    public void testRunAfterBoth_actionFailed() {
1617 <        for (ExecutionMode m : ExecutionMode.values())
1618 <        for (boolean fFirst : new boolean[] { true, false })
1619 <        for (Integer v1 : new Integer[] { 1, null })
1620 <        for (Integer v2 : new Integer[] { 2, null })
1621 <    {
1622 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1623 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1624 <        final FailingRunnable r = new FailingRunnable(m);
1625 <
1626 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1627 <        if (fFirst) {
1628 <            f.complete(v1);
1629 <            g.complete(v2);
1630 <        } else {
1631 <            g.complete(v2);
1632 <            f.complete(v1);
1633 <        }
1634 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1635 <
1636 <        checkCompletedWithWrappedCFException(h1);
1637 <        checkCompletedWithWrappedCFException(h2);
1638 <        checkCompletedNormally(f, v1);
1639 <        checkCompletedNormally(g, v2);
1808 >        checkCompletedExceptionally(!fFirst ? f : g, ex);
1809      }}
1810  
1811      /**
# Line 1653 | Line 1822 | public class CompletableFutureTest exten
1822          final CompletableFuture<Integer> g = new CompletableFuture<>();
1823          final Noop r = new Noop(m);
1824  
1656
1825          (fFirst ? f : g).complete(v1);
1826          if (!createIncomplete)
1827              assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
# Line 1665 | Line 1833 | public class CompletableFutureTest exten
1833  
1834          checkCompletedWithWrappedCancellationException(h);
1835          checkCancelled(!fFirst ? f : g);
1836 <        assertEquals(0, r.invocationCount);
1836 >        r.assertNotInvoked();
1837          checkCompletedNormally(fFirst ? f : g, v1);
1838      }}
1839  
1840      /**
1841 <     * applyToEither result completes normally after normal completion
1674 <     * of either source
1841 >     * runAfterBoth result completes exceptionally if action does
1842       */
1843 <    public void testApplyToEither_normalCompletion() {
1843 >    public void testRunAfterBoth_actionFailed() {
1844          for (ExecutionMode m : ExecutionMode.values())
1678        for (boolean createIncomplete : new boolean[] { true, false })
1845          for (boolean fFirst : new boolean[] { true, false })
1846          for (Integer v1 : new Integer[] { 1, null })
1847          for (Integer v2 : new Integer[] { 2, null })
1848      {
1849          final CompletableFuture<Integer> f = new CompletableFuture<>();
1850          final CompletableFuture<Integer> g = new CompletableFuture<>();
1851 <        final IncFunction r = new IncFunction(m);
1851 >        final FailingRunnable r1 = new FailingRunnable(m);
1852 >        final FailingRunnable r2 = new FailingRunnable(m);
1853  
1854 <        if (!createIncomplete)
1855 <            if (fFirst) f.complete(v1); else g.complete(v2);
1856 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1857 <        if (createIncomplete) {
1858 <            checkIncomplete(h);
1859 <            assertEquals(0, r.invocationCount);
1860 <            if (fFirst) f.complete(v1); else g.complete(v2);
1854 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1855 >        if (fFirst) {
1856 >            f.complete(v1);
1857 >            g.complete(v2);
1858 >        } else {
1859 >            g.complete(v2);
1860 >            f.complete(v1);
1861          }
1862 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1696 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1862 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1863  
1864 +        checkCompletedWithWrappedCFException(h1);
1865 +        checkCompletedWithWrappedCFException(h2);
1866          checkCompletedNormally(f, v1);
1867          checkCompletedNormally(g, v2);
1700        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1868      }}
1869  
1870 <    public void testApplyToEither_normalCompletionBothAvailable() {
1870 >    /**
1871 >     * applyToEither result completes normally after normal completion
1872 >     * of either source
1873 >     */
1874 >    public void testApplyToEither_normalCompletion() {
1875          for (ExecutionMode m : ExecutionMode.values())
1705        for (boolean fFirst : new boolean[] { true, false })
1876          for (Integer v1 : new Integer[] { 1, null })
1877          for (Integer v2 : new Integer[] { 2, null })
1878      {
1879          final CompletableFuture<Integer> f = new CompletableFuture<>();
1880          final CompletableFuture<Integer> g = new CompletableFuture<>();
1881 <        final IncFunction r = new IncFunction(m);
1881 >        final IncFunction[] rs = new IncFunction[6];
1882 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1883  
1884 <        if (fFirst) {
1885 <            f.complete(v1);
1886 <            g.complete(v2);
1887 <        } else {
1888 <            g.complete(v2);
1889 <            f.complete(v1);
1890 <        }
1884 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1885 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1886 >        checkIncomplete(h0);
1887 >        checkIncomplete(h1);
1888 >        rs[0].assertNotInvoked();
1889 >        rs[1].assertNotInvoked();
1890 >        f.complete(v1);
1891 >        checkCompletedNormally(h0, inc(v1));
1892 >        checkCompletedNormally(h1, inc(v1));
1893 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1894 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1895 >        checkCompletedNormally(h2, inc(v1));
1896 >        checkCompletedNormally(h3, inc(v1));
1897 >        g.complete(v2);
1898  
1899 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1899 >        // unspecified behavior - both source completions available
1900 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1901 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1902 >        rs[4].assertValue(h4.join());
1903 >        rs[5].assertValue(h5.join());
1904 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1905 >                   Objects.equals(inc(v2), h4.join()));
1906 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1907 >                   Objects.equals(inc(v2), h5.join()));
1908  
1909          checkCompletedNormally(f, v1);
1910          checkCompletedNormally(g, v2);
1911 <
1912 <        // unspecified behavior
1913 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1914 <                   Objects.equals(h.join(), inc(v2)));
1915 <        assertEquals(1, r.invocationCount);
1911 >        checkCompletedNormally(h0, inc(v1));
1912 >        checkCompletedNormally(h1, inc(v1));
1913 >        checkCompletedNormally(h2, inc(v1));
1914 >        checkCompletedNormally(h3, inc(v1));
1915 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1916      }}
1917  
1918      /**
1919       * applyToEither result completes exceptionally after exceptional
1920       * completion of either source
1921       */
1922 <    public void testApplyToEither_exceptionalCompletion1() {
1922 >    public void testApplyToEither_exceptionalCompletion() {
1923          for (ExecutionMode m : ExecutionMode.values())
1738        for (boolean createIncomplete : new boolean[] { true, false })
1739        for (boolean fFirst : new boolean[] { true, false })
1924          for (Integer v1 : new Integer[] { 1, null })
1925      {
1926          final CompletableFuture<Integer> f = new CompletableFuture<>();
1927          final CompletableFuture<Integer> g = new CompletableFuture<>();
1928          final CFException ex = new CFException();
1929 <        final IncFunction r = new IncFunction(m);
1929 >        final IncFunction[] rs = new IncFunction[6];
1930 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1931  
1932 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1933 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1934 <        if (createIncomplete) {
1935 <            checkIncomplete(h);
1936 <            assertEquals(0, r.invocationCount);
1937 <            (fFirst ? f : g).completeExceptionally(ex);
1938 <        }
1932 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1933 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1934 >        checkIncomplete(h0);
1935 >        checkIncomplete(h1);
1936 >        rs[0].assertNotInvoked();
1937 >        rs[1].assertNotInvoked();
1938 >        f.completeExceptionally(ex);
1939 >        checkCompletedWithWrappedException(h0, ex);
1940 >        checkCompletedWithWrappedException(h1, ex);
1941 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1942 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1943 >        checkCompletedWithWrappedException(h2, ex);
1944 >        checkCompletedWithWrappedException(h3, ex);
1945 >        g.complete(v1);
1946  
1947 <        checkCompletedWithWrappedCFException(h, ex);
1948 <        (!fFirst ? f : g).complete(v1);
1947 >        // unspecified behavior - both source completions available
1948 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1949 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1950 >        try {
1951 >            assertEquals(inc(v1), h4.join());
1952 >            rs[4].assertValue(inc(v1));
1953 >        } catch (CompletionException ok) {
1954 >            checkCompletedWithWrappedException(h4, ex);
1955 >            rs[4].assertNotInvoked();
1956 >        }
1957 >        try {
1958 >            assertEquals(inc(v1), h5.join());
1959 >            rs[5].assertValue(inc(v1));
1960 >        } catch (CompletionException ok) {
1961 >            checkCompletedWithWrappedException(h5, ex);
1962 >            rs[5].assertNotInvoked();
1963 >        }
1964  
1965 <        assertEquals(0, r.invocationCount);
1966 <        checkCompletedNormally(!fFirst ? f : g, v1);
1967 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1968 <        checkCompletedWithWrappedCFException(h, ex);
1965 >        checkCompletedExceptionally(f, ex);
1966 >        checkCompletedNormally(g, v1);
1967 >        checkCompletedWithWrappedException(h0, ex);
1968 >        checkCompletedWithWrappedException(h1, ex);
1969 >        checkCompletedWithWrappedException(h2, ex);
1970 >        checkCompletedWithWrappedException(h3, ex);
1971 >        checkCompletedWithWrappedException(h4, ex);
1972 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1973      }}
1974  
1975      public void testApplyToEither_exceptionalCompletion2() {
1976          for (ExecutionMode m : ExecutionMode.values())
1766        for (boolean reverseArgs : new boolean[] { true, false })
1977          for (boolean fFirst : new boolean[] { true, false })
1978          for (Integer v1 : new Integer[] { 1, null })
1979      {
1980          final CompletableFuture<Integer> f = new CompletableFuture<>();
1981          final CompletableFuture<Integer> g = new CompletableFuture<>();
1772        final IncFunction r1 = new IncFunction(m);
1773        final IncFunction r2 = new IncFunction(m);
1982          final CFException ex = new CFException();
1983 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1984 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1985 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1983 >        final IncFunction[] rs = new IncFunction[6];
1984 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1985 >
1986 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1987 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1988          if (fFirst) {
1989              f.complete(v1);
1990              g.completeExceptionally(ex);
# Line 1782 | Line 1992 | public class CompletableFutureTest exten
1992              g.completeExceptionally(ex);
1993              f.complete(v1);
1994          }
1995 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1995 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1996 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1997  
1998 <        // unspecified behavior
1998 >        // unspecified behavior - both source completions available
1999 >        try {
2000 >            assertEquals(inc(v1), h0.join());
2001 >            rs[0].assertValue(inc(v1));
2002 >        } catch (CompletionException ok) {
2003 >            checkCompletedWithWrappedException(h0, ex);
2004 >            rs[0].assertNotInvoked();
2005 >        }
2006          try {
2007              assertEquals(inc(v1), h1.join());
2008 <            assertEquals(1, r1.invocationCount);
2008 >            rs[1].assertValue(inc(v1));
2009          } catch (CompletionException ok) {
2010 <            checkCompletedWithWrappedCFException(h1, ex);
2011 <            assertEquals(0, r1.invocationCount);
2010 >            checkCompletedWithWrappedException(h1, ex);
2011 >            rs[1].assertNotInvoked();
2012          }
1795
2013          try {
2014              assertEquals(inc(v1), h2.join());
2015 <            assertEquals(1, r2.invocationCount);
2015 >            rs[2].assertValue(inc(v1));
2016          } catch (CompletionException ok) {
2017 <            checkCompletedWithWrappedCFException(h2, ex);
2018 <            assertEquals(0, r2.invocationCount);
2017 >            checkCompletedWithWrappedException(h2, ex);
2018 >            rs[2].assertNotInvoked();
2019 >        }
2020 >        try {
2021 >            assertEquals(inc(v1), h3.join());
2022 >            rs[3].assertValue(inc(v1));
2023 >        } catch (CompletionException ok) {
2024 >            checkCompletedWithWrappedException(h3, ex);
2025 >            rs[3].assertNotInvoked();
2026          }
2027  
1804        checkCompletedWithWrappedCFException(g, ex);
1805        checkCompletedNormally(f, v1);
1806    }}
1807
1808    /**
1809     * applyToEither result completes exceptionally if action does
1810     */
1811    public void testApplyToEither_actionFailed1() {
1812        for (ExecutionMode m : ExecutionMode.values())
1813        for (Integer v1 : new Integer[] { 1, null })
1814        for (Integer v2 : new Integer[] { 2, null })
1815    {
1816        final CompletableFuture<Integer> f = new CompletableFuture<>();
1817        final CompletableFuture<Integer> g = new CompletableFuture<>();
1818        final FailingFunction r = new FailingFunction(m);
1819        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1820
1821        f.complete(v1);
1822        checkCompletedWithWrappedCFException(h);
1823        g.complete(v2);
1824        checkCompletedNormally(f, v1);
1825        checkCompletedNormally(g, v2);
1826    }}
1827
1828    public void testApplyToEither_actionFailed2() {
1829        for (ExecutionMode m : ExecutionMode.values())
1830        for (Integer v1 : new Integer[] { 1, null })
1831        for (Integer v2 : new Integer[] { 2, null })
1832    {
1833        final CompletableFuture<Integer> f = new CompletableFuture<>();
1834        final CompletableFuture<Integer> g = new CompletableFuture<>();
1835        final FailingFunction r = new FailingFunction(m);
1836        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1837
1838        g.complete(v2);
1839        checkCompletedWithWrappedCFException(h);
1840        f.complete(v1);
2028          checkCompletedNormally(f, v1);
2029 <        checkCompletedNormally(g, v2);
2029 >        checkCompletedExceptionally(g, ex);
2030      }}
2031  
2032      /**
2033       * applyToEither result completes exceptionally if either source cancelled
2034       */
2035 <    public void testApplyToEither_sourceCancelled1() {
2035 >    public void testApplyToEither_sourceCancelled() {
2036          for (ExecutionMode m : ExecutionMode.values())
2037          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1851        for (boolean createIncomplete : new boolean[] { true, false })
1852        for (boolean fFirst : new boolean[] { true, false })
2038          for (Integer v1 : new Integer[] { 1, null })
2039      {
2040          final CompletableFuture<Integer> f = new CompletableFuture<>();
2041          final CompletableFuture<Integer> g = new CompletableFuture<>();
2042 <        final IncFunction r = new IncFunction(m);
2042 >        final IncFunction[] rs = new IncFunction[6];
2043 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2044  
2045 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2046 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
2047 <        if (createIncomplete) {
2048 <            checkIncomplete(h);
2049 <            assertEquals(0, r.invocationCount);
2050 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
2051 <        }
2045 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2046 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2047 >        checkIncomplete(h0);
2048 >        checkIncomplete(h1);
2049 >        rs[0].assertNotInvoked();
2050 >        rs[1].assertNotInvoked();
2051 >        f.cancel(mayInterruptIfRunning);
2052 >        checkCompletedWithWrappedCancellationException(h0);
2053 >        checkCompletedWithWrappedCancellationException(h1);
2054 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2055 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2056 >        checkCompletedWithWrappedCancellationException(h2);
2057 >        checkCompletedWithWrappedCancellationException(h3);
2058 >        g.complete(v1);
2059  
2060 <        checkCompletedWithWrappedCancellationException(h);
2061 <        (!fFirst ? f : g).complete(v1);
2060 >        // unspecified behavior - both source completions available
2061 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2062 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2063 >        try {
2064 >            assertEquals(inc(v1), h4.join());
2065 >            rs[4].assertValue(inc(v1));
2066 >        } catch (CompletionException ok) {
2067 >            checkCompletedWithWrappedCancellationException(h4);
2068 >            rs[4].assertNotInvoked();
2069 >        }
2070 >        try {
2071 >            assertEquals(inc(v1), h5.join());
2072 >            rs[5].assertValue(inc(v1));
2073 >        } catch (CompletionException ok) {
2074 >            checkCompletedWithWrappedCancellationException(h5);
2075 >            rs[5].assertNotInvoked();
2076 >        }
2077  
2078 <        assertEquals(0, r.invocationCount);
2079 <        checkCompletedNormally(!fFirst ? f : g, v1);
2080 <        checkCancelled(fFirst ? f : g);
2081 <        checkCompletedWithWrappedCancellationException(h);
2078 >        checkCancelled(f);
2079 >        checkCompletedNormally(g, v1);
2080 >        checkCompletedWithWrappedCancellationException(h0);
2081 >        checkCompletedWithWrappedCancellationException(h1);
2082 >        checkCompletedWithWrappedCancellationException(h2);
2083 >        checkCompletedWithWrappedCancellationException(h3);
2084 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2085      }}
2086  
2087      public void testApplyToEither_sourceCancelled2() {
2088          for (ExecutionMode m : ExecutionMode.values())
2089          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1879        for (boolean reverseArgs : new boolean[] { true, false })
2090          for (boolean fFirst : new boolean[] { true, false })
2091          for (Integer v1 : new Integer[] { 1, null })
2092      {
2093          final CompletableFuture<Integer> f = new CompletableFuture<>();
2094          final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 <        final IncFunction r1 = new IncFunction(m);
2096 <        final IncFunction r2 = new IncFunction(m);
1887 <        final CFException ex = new CFException();
1888 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1889 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
2095 >        final IncFunction[] rs = new IncFunction[6];
2096 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2097  
2098 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
2098 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2099 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2100          if (fFirst) {
2101              f.complete(v1);
2102 <            assertTrue(g.cancel(mayInterruptIfRunning));
2102 >            g.cancel(mayInterruptIfRunning);
2103          } else {
2104 <            assertTrue(g.cancel(mayInterruptIfRunning));
2104 >            g.cancel(mayInterruptIfRunning);
2105              f.complete(v1);
2106          }
2107 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
2107 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2108 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2109  
2110 <        // unspecified behavior
2110 >        // unspecified behavior - both source completions available
2111 >        try {
2112 >            assertEquals(inc(v1), h0.join());
2113 >            rs[0].assertValue(inc(v1));
2114 >        } catch (CompletionException ok) {
2115 >            checkCompletedWithWrappedCancellationException(h0);
2116 >            rs[0].assertNotInvoked();
2117 >        }
2118          try {
2119              assertEquals(inc(v1), h1.join());
2120 <            assertEquals(1, r1.invocationCount);
2120 >            rs[1].assertValue(inc(v1));
2121          } catch (CompletionException ok) {
2122              checkCompletedWithWrappedCancellationException(h1);
2123 <            assertEquals(0, r1.invocationCount);
2123 >            rs[1].assertNotInvoked();
2124          }
1909
2125          try {
2126              assertEquals(inc(v1), h2.join());
2127 <            assertEquals(1, r2.invocationCount);
2127 >            rs[2].assertValue(inc(v1));
2128          } catch (CompletionException ok) {
2129              checkCompletedWithWrappedCancellationException(h2);
2130 <            assertEquals(0, r2.invocationCount);
2130 >            rs[2].assertNotInvoked();
2131 >        }
2132 >        try {
2133 >            assertEquals(inc(v1), h3.join());
2134 >            rs[3].assertValue(inc(v1));
2135 >        } catch (CompletionException ok) {
2136 >            checkCompletedWithWrappedCancellationException(h3);
2137 >            rs[3].assertNotInvoked();
2138          }
2139  
1918        checkCancelled(g);
2140          checkCompletedNormally(f, v1);
2141 +        checkCancelled(g);
2142      }}
2143  
2144      /**
2145 <     * acceptEither result completes normally after normal completion
1924 <     * of either source
2145 >     * applyToEither result completes exceptionally if action does
2146       */
2147 <    public void testAcceptEither_normalCompletion1() {
2147 >    public void testApplyToEither_actionFailed() {
2148          for (ExecutionMode m : ExecutionMode.values())
2149          for (Integer v1 : new Integer[] { 1, null })
2150          for (Integer v2 : new Integer[] { 2, null })
2151      {
2152          final CompletableFuture<Integer> f = new CompletableFuture<>();
2153          final CompletableFuture<Integer> g = new CompletableFuture<>();
2154 <        final IncAction r = new IncAction();
2155 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2154 >        final FailingFunction[] rs = new FailingFunction[6];
2155 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2156  
2157 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2158 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2159          f.complete(v1);
2160 <        checkCompletedNormally(h, null);
2161 <        assertEquals(inc(v1), r.value);
2162 <        g.complete(v2);
2163 <
2164 <        checkCompletedNormally(f, v1);
2165 <        checkCompletedNormally(g, v2);
2166 <        checkCompletedNormally(h, null);
1944 <    }}
1945 <
1946 <    public void testAcceptEither_normalCompletion2() {
1947 <        for (ExecutionMode m : ExecutionMode.values())
1948 <        for (Integer v1 : new Integer[] { 1, null })
1949 <        for (Integer v2 : new Integer[] { 2, null })
1950 <    {
1951 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1952 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1953 <        final IncAction r = new IncAction();
1954 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2160 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2161 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2162 >        checkCompletedWithWrappedCFException(h0);
2163 >        checkCompletedWithWrappedCFException(h1);
2164 >        checkCompletedWithWrappedCFException(h2);
2165 >        checkCompletedWithWrappedCFException(h3);
2166 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2167  
2168          g.complete(v2);
2169 <        checkCompletedNormally(h, null);
2170 <        assertEquals(inc(v2), r.value);
2171 <        f.complete(v1);
2169 >
2170 >        // unspecified behavior - both source completions available
2171 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2172 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2173 >
2174 >        checkCompletedWithWrappedCFException(h4);
2175 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2176 >                   Objects.equals(v2, rs[4].value));
2177 >        checkCompletedWithWrappedCFException(h5);
2178 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2179 >                   Objects.equals(v2, rs[5].value));
2180  
2181          checkCompletedNormally(f, v1);
2182          checkCompletedNormally(g, v2);
1963        checkCompletedNormally(h, null);
2183      }}
2184  
2185 <    public void testAcceptEither_normalCompletion3() {
2185 >    /**
2186 >     * acceptEither result completes normally after normal completion
2187 >     * of either source
2188 >     */
2189 >    public void testAcceptEither_normalCompletion() {
2190          for (ExecutionMode m : ExecutionMode.values())
2191          for (Integer v1 : new Integer[] { 1, null })
2192          for (Integer v2 : new Integer[] { 2, null })
2193      {
2194          final CompletableFuture<Integer> f = new CompletableFuture<>();
2195          final CompletableFuture<Integer> g = new CompletableFuture<>();
2196 <        final IncAction r = new IncAction();
2196 >        final NoopConsumer[] rs = new NoopConsumer[6];
2197 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2198  
2199 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2200 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2201 +        checkIncomplete(h0);
2202 +        checkIncomplete(h1);
2203 +        rs[0].assertNotInvoked();
2204 +        rs[1].assertNotInvoked();
2205          f.complete(v1);
2206 +        checkCompletedNormally(h0, null);
2207 +        checkCompletedNormally(h1, null);
2208 +        rs[0].assertValue(v1);
2209 +        rs[1].assertValue(v1);
2210 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2211 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2212 +        checkCompletedNormally(h2, null);
2213 +        checkCompletedNormally(h3, null);
2214 +        rs[2].assertValue(v1);
2215 +        rs[3].assertValue(v1);
2216          g.complete(v2);
1977        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2217  
2218 <        checkCompletedNormally(h, null);
2218 >        // unspecified behavior - both source completions available
2219 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2220 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2221 >        checkCompletedNormally(h4, null);
2222 >        checkCompletedNormally(h5, null);
2223 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2224 >                   Objects.equals(v2, rs[4].value));
2225 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2226 >                   Objects.equals(v2, rs[5].value));
2227 >
2228          checkCompletedNormally(f, v1);
2229          checkCompletedNormally(g, v2);
2230 <
2231 <        // unspecified behavior
2232 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2233 <                   Objects.equals(r.value, inc(v2)));
2230 >        checkCompletedNormally(h0, null);
2231 >        checkCompletedNormally(h1, null);
2232 >        checkCompletedNormally(h2, null);
2233 >        checkCompletedNormally(h3, null);
2234 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2235      }}
2236  
2237      /**
2238       * acceptEither result completes exceptionally after exceptional
2239       * completion of either source
2240       */
2241 <    public void testAcceptEither_exceptionalCompletion1() {
2241 >    public void testAcceptEither_exceptionalCompletion() {
2242          for (ExecutionMode m : ExecutionMode.values())
2243          for (Integer v1 : new Integer[] { 1, null })
2244      {
2245          final CompletableFuture<Integer> f = new CompletableFuture<>();
2246          final CompletableFuture<Integer> g = new CompletableFuture<>();
1998        final IncAction r = new IncAction();
1999        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2247          final CFException ex = new CFException();
2248 +        final NoopConsumer[] rs = new NoopConsumer[6];
2249 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2250  
2251 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2252 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2253 +        checkIncomplete(h0);
2254 +        checkIncomplete(h1);
2255 +        rs[0].assertNotInvoked();
2256 +        rs[1].assertNotInvoked();
2257          f.completeExceptionally(ex);
2258 <        checkCompletedWithWrappedCFException(h, ex);
2258 >        checkCompletedWithWrappedException(h0, ex);
2259 >        checkCompletedWithWrappedException(h1, ex);
2260 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2261 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2262 >        checkCompletedWithWrappedException(h2, ex);
2263 >        checkCompletedWithWrappedException(h3, ex);
2264 >
2265          g.complete(v1);
2266  
2267 <        assertEquals(0, r.invocationCount);
2267 >        // unspecified behavior - both source completions available
2268 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2269 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2270 >        try {
2271 >            assertNull(h4.join());
2272 >            rs[4].assertValue(v1);
2273 >        } catch (CompletionException ok) {
2274 >            checkCompletedWithWrappedException(h4, ex);
2275 >            rs[4].assertNotInvoked();
2276 >        }
2277 >        try {
2278 >            assertNull(h5.join());
2279 >            rs[5].assertValue(v1);
2280 >        } catch (CompletionException ok) {
2281 >            checkCompletedWithWrappedException(h5, ex);
2282 >            rs[5].assertNotInvoked();
2283 >        }
2284 >
2285 >        checkCompletedExceptionally(f, ex);
2286          checkCompletedNormally(g, v1);
2287 <        checkCompletedWithWrappedCFException(f, ex);
2288 <        checkCompletedWithWrappedCFException(h, ex);
2287 >        checkCompletedWithWrappedException(h0, ex);
2288 >        checkCompletedWithWrappedException(h1, ex);
2289 >        checkCompletedWithWrappedException(h2, ex);
2290 >        checkCompletedWithWrappedException(h3, ex);
2291 >        checkCompletedWithWrappedException(h4, ex);
2292 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2293      }}
2294  
2295      public void testAcceptEither_exceptionalCompletion2() {
2296          for (ExecutionMode m : ExecutionMode.values())
2297 +        for (boolean fFirst : new boolean[] { true, false })
2298          for (Integer v1 : new Integer[] { 1, null })
2299      {
2300          final CompletableFuture<Integer> f = new CompletableFuture<>();
2301          final CompletableFuture<Integer> g = new CompletableFuture<>();
2018        final IncAction r = new IncAction();
2019        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2020        final CFException ex = new CFException();
2021
2022        g.completeExceptionally(ex);
2023        checkCompletedWithWrappedCFException(h, ex);
2024        f.complete(v1);
2025
2026        assertEquals(0, r.invocationCount);
2027        checkCompletedNormally(f, v1);
2028        checkCompletedWithWrappedCFException(g, ex);
2029        checkCompletedWithWrappedCFException(h, ex);
2030    }}
2031
2032    public void testAcceptEither_exceptionalCompletion3() {
2033        for (ExecutionMode m : ExecutionMode.values())
2034        for (Integer v1 : new Integer[] { 1, null })
2035    {
2036        final CompletableFuture<Integer> f = new CompletableFuture<>();
2037        final CompletableFuture<Integer> g = new CompletableFuture<>();
2038        final IncAction r = new IncAction();
2302          final CFException ex = new CFException();
2303 +        final NoopConsumer[] rs = new NoopConsumer[6];
2304 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2305  
2306 <        g.completeExceptionally(ex);
2307 <        f.complete(v1);
2308 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2306 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2307 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2308 >        if (fFirst) {
2309 >            f.complete(v1);
2310 >            g.completeExceptionally(ex);
2311 >        } else {
2312 >            g.completeExceptionally(ex);
2313 >            f.complete(v1);
2314 >        }
2315 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2316 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2317  
2318 <        // unspecified behavior
2046 <        Integer v;
2318 >        // unspecified behavior - both source completions available
2319          try {
2320 <            assertNull(h.join());
2321 <            assertEquals(1, r.invocationCount);
2050 <            assertEquals(inc(v1), r.value);
2320 >            assertEquals(null, h0.join());
2321 >            rs[0].assertValue(v1);
2322          } catch (CompletionException ok) {
2323 <            checkCompletedWithWrappedCFException(h, ex);
2324 <            assertEquals(0, r.invocationCount);
2323 >            checkCompletedWithWrappedException(h0, ex);
2324 >            rs[0].assertNotInvoked();
2325          }
2055
2056        checkCompletedWithWrappedCFException(g, ex);
2057        checkCompletedNormally(f, v1);
2058    }}
2059
2060    public void testAcceptEither_exceptionalCompletion4() {
2061        for (ExecutionMode m : ExecutionMode.values())
2062        for (Integer v1 : new Integer[] { 1, null })
2063    {
2064        final CompletableFuture<Integer> f = new CompletableFuture<>();
2065        final CompletableFuture<Integer> g = new CompletableFuture<>();
2066        final IncAction r = new IncAction();
2067        final CFException ex = new CFException();
2068
2069        f.completeExceptionally(ex);
2070        g.complete(v1);
2071        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2072
2073        // unspecified behavior
2074        Integer v;
2326          try {
2327 <            assertNull(h.join());
2328 <            assertEquals(1, r.invocationCount);
2078 <            assertEquals(inc(v1), r.value);
2327 >            assertEquals(null, h1.join());
2328 >            rs[1].assertValue(v1);
2329          } catch (CompletionException ok) {
2330 <            checkCompletedWithWrappedCFException(h, ex);
2331 <            assertEquals(0, r.invocationCount);
2330 >            checkCompletedWithWrappedException(h1, ex);
2331 >            rs[1].assertNotInvoked();
2332 >        }
2333 >        try {
2334 >            assertEquals(null, h2.join());
2335 >            rs[2].assertValue(v1);
2336 >        } catch (CompletionException ok) {
2337 >            checkCompletedWithWrappedException(h2, ex);
2338 >            rs[2].assertNotInvoked();
2339 >        }
2340 >        try {
2341 >            assertEquals(null, h3.join());
2342 >            rs[3].assertValue(v1);
2343 >        } catch (CompletionException ok) {
2344 >            checkCompletedWithWrappedException(h3, ex);
2345 >            rs[3].assertNotInvoked();
2346          }
2347  
2084        checkCompletedWithWrappedCFException(f, ex);
2085        checkCompletedNormally(g, v1);
2086    }}
2087
2088    /**
2089     * acceptEither result completes exceptionally if action does
2090     */
2091    public void testAcceptEither_actionFailed1() {
2092        for (ExecutionMode m : ExecutionMode.values())
2093        for (Integer v1 : new Integer[] { 1, null })
2094        for (Integer v2 : new Integer[] { 2, null })
2095    {
2096        final CompletableFuture<Integer> f = new CompletableFuture<>();
2097        final CompletableFuture<Integer> g = new CompletableFuture<>();
2098        final FailingConsumer r = new FailingConsumer(m);
2099        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2100
2101        f.complete(v1);
2102        checkCompletedWithWrappedCFException(h);
2103        g.complete(v2);
2104        checkCompletedNormally(f, v1);
2105        checkCompletedNormally(g, v2);
2106    }}
2107
2108    public void testAcceptEither_actionFailed2() {
2109        for (ExecutionMode m : ExecutionMode.values())
2110        for (Integer v1 : new Integer[] { 1, null })
2111        for (Integer v2 : new Integer[] { 2, null })
2112    {
2113        final CompletableFuture<Integer> f = new CompletableFuture<>();
2114        final CompletableFuture<Integer> g = new CompletableFuture<>();
2115        final FailingConsumer r = new FailingConsumer(m);
2116        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2117
2118        g.complete(v2);
2119        checkCompletedWithWrappedCFException(h);
2120        f.complete(v1);
2348          checkCompletedNormally(f, v1);
2349 <        checkCompletedNormally(g, v2);
2349 >        checkCompletedExceptionally(g, ex);
2350      }}
2351  
2352      /**
2353       * acceptEither result completes exceptionally if either source cancelled
2354       */
2355 <    public void testAcceptEither_sourceCancelled1() {
2129 <        for (ExecutionMode m : ExecutionMode.values())
2130 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2131 <        for (Integer v1 : new Integer[] { 1, null })
2132 <    {
2133 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2134 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2135 <        final IncAction r = new IncAction();
2136 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2137 <
2138 <        assertTrue(f.cancel(mayInterruptIfRunning));
2139 <        checkCompletedWithWrappedCancellationException(h);
2140 <        g.complete(v1);
2141 <
2142 <        checkCancelled(f);
2143 <        assertEquals(0, r.invocationCount);
2144 <        checkCompletedNormally(g, v1);
2145 <        checkCompletedWithWrappedCancellationException(h);
2146 <    }}
2147 <
2148 <    public void testAcceptEither_sourceCancelled2() {
2355 >    public void testAcceptEither_sourceCancelled() {
2356          for (ExecutionMode m : ExecutionMode.values())
2357          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2358          for (Integer v1 : new Integer[] { 1, null })
2359      {
2360          final CompletableFuture<Integer> f = new CompletableFuture<>();
2361          final CompletableFuture<Integer> g = new CompletableFuture<>();
2362 <        final IncAction r = new IncAction();
2363 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2362 >        final NoopConsumer[] rs = new NoopConsumer[6];
2363 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2364  
2365 <        assertTrue(g.cancel(mayInterruptIfRunning));
2366 <        checkCompletedWithWrappedCancellationException(h);
2367 <        f.complete(v1);
2368 <
2369 <        checkCancelled(g);
2370 <        assertEquals(0, r.invocationCount);
2371 <        checkCompletedNormally(f, v1);
2372 <        checkCompletedWithWrappedCancellationException(h);
2373 <    }}
2374 <
2375 <    public void testAcceptEither_sourceCancelled3() {
2376 <        for (ExecutionMode m : ExecutionMode.values())
2377 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2171 <        for (Integer v1 : new Integer[] { 1, null })
2172 <    {
2173 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2174 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2175 <        final IncAction r = new IncAction();
2365 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2366 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2367 >        checkIncomplete(h0);
2368 >        checkIncomplete(h1);
2369 >        rs[0].assertNotInvoked();
2370 >        rs[1].assertNotInvoked();
2371 >        f.cancel(mayInterruptIfRunning);
2372 >        checkCompletedWithWrappedCancellationException(h0);
2373 >        checkCompletedWithWrappedCancellationException(h1);
2374 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2375 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2376 >        checkCompletedWithWrappedCancellationException(h2);
2377 >        checkCompletedWithWrappedCancellationException(h3);
2378  
2379 <        assertTrue(g.cancel(mayInterruptIfRunning));
2178 <        f.complete(v1);
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2379 >        g.complete(v1);
2380  
2381 <        // unspecified behavior
2382 <        Integer v;
2381 >        // unspecified behavior - both source completions available
2382 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2383 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2384          try {
2385 <            assertNull(h.join());
2386 <            assertEquals(1, r.invocationCount);
2186 <            assertEquals(inc(v1), r.value);
2385 >            assertNull(h4.join());
2386 >            rs[4].assertValue(v1);
2387          } catch (CompletionException ok) {
2388 <            checkCompletedWithWrappedCancellationException(h);
2389 <            assertEquals(0, r.invocationCount);
2388 >            checkCompletedWithWrappedCancellationException(h4);
2389 >            rs[4].assertNotInvoked();
2390          }
2191
2192        checkCancelled(g);
2193        checkCompletedNormally(f, v1);
2194    }}
2195
2196    public void testAcceptEither_sourceCancelled4() {
2197        for (ExecutionMode m : ExecutionMode.values())
2198        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2199        for (Integer v1 : new Integer[] { 1, null })
2200    {
2201        final CompletableFuture<Integer> f = new CompletableFuture<>();
2202        final CompletableFuture<Integer> g = new CompletableFuture<>();
2203        final IncAction r = new IncAction();
2204
2205        assertTrue(f.cancel(mayInterruptIfRunning));
2206        g.complete(v1);
2207        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2208
2209        // unspecified behavior
2210        Integer v;
2391          try {
2392 <            assertNull(h.join());
2393 <            assertEquals(1, r.invocationCount);
2214 <            assertEquals(inc(v1), r.value);
2392 >            assertNull(h5.join());
2393 >            rs[5].assertValue(v1);
2394          } catch (CompletionException ok) {
2395 <            checkCompletedWithWrappedCancellationException(h);
2396 <            assertEquals(0, r.invocationCount);
2395 >            checkCompletedWithWrappedCancellationException(h5);
2396 >            rs[5].assertNotInvoked();
2397          }
2398  
2399          checkCancelled(f);
2400          checkCompletedNormally(g, v1);
2401 +        checkCompletedWithWrappedCancellationException(h0);
2402 +        checkCompletedWithWrappedCancellationException(h1);
2403 +        checkCompletedWithWrappedCancellationException(h2);
2404 +        checkCompletedWithWrappedCancellationException(h3);
2405 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2406      }}
2407  
2408      /**
2409 <     * runAfterEither result completes normally after normal completion
2226 <     * of either source
2409 >     * acceptEither result completes exceptionally if action does
2410       */
2411 <    public void testRunAfterEither_normalCompletion1() {
2411 >    public void testAcceptEither_actionFailed() {
2412          for (ExecutionMode m : ExecutionMode.values())
2413          for (Integer v1 : new Integer[] { 1, null })
2414          for (Integer v2 : new Integer[] { 2, null })
2415      {
2416          final CompletableFuture<Integer> f = new CompletableFuture<>();
2417          final CompletableFuture<Integer> g = new CompletableFuture<>();
2418 <        final Noop r = new Noop(m);
2419 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2418 >        final FailingConsumer[] rs = new FailingConsumer[6];
2419 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2420  
2421 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2422 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2423          f.complete(v1);
2424 <        checkCompletedNormally(h, null);
2425 <        assertEquals(1, r.invocationCount);
2424 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2425 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2426 >        checkCompletedWithWrappedCFException(h0);
2427 >        checkCompletedWithWrappedCFException(h1);
2428 >        checkCompletedWithWrappedCFException(h2);
2429 >        checkCompletedWithWrappedCFException(h3);
2430 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2431 >
2432          g.complete(v2);
2433  
2434 +        // unspecified behavior - both source completions available
2435 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2436 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2437 +
2438 +        checkCompletedWithWrappedCFException(h4);
2439 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2440 +                   Objects.equals(v2, rs[4].value));
2441 +        checkCompletedWithWrappedCFException(h5);
2442 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2443 +                   Objects.equals(v2, rs[5].value));
2444 +
2445          checkCompletedNormally(f, v1);
2446          checkCompletedNormally(g, v2);
2245        checkCompletedNormally(h, null);
2246        assertEquals(1, r.invocationCount);
2447      }}
2448  
2449 <    public void testRunAfterEither_normalCompletion2() {
2449 >    /**
2450 >     * runAfterEither result completes normally after normal completion
2451 >     * of either source
2452 >     */
2453 >    public void testRunAfterEither_normalCompletion() {
2454          for (ExecutionMode m : ExecutionMode.values())
2455          for (Integer v1 : new Integer[] { 1, null })
2456          for (Integer v2 : new Integer[] { 2, null })
2457      {
2458          final CompletableFuture<Integer> f = new CompletableFuture<>();
2459          final CompletableFuture<Integer> g = new CompletableFuture<>();
2460 <        final Noop r = new Noop(m);
2461 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2460 >        final Noop[] rs = new Noop[6];
2461 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2462  
2463 <        g.complete(v2);
2464 <        checkCompletedNormally(h, null);
2465 <        assertEquals(1, r.invocationCount);
2463 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2464 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2465 >        checkIncomplete(h0);
2466 >        checkIncomplete(h1);
2467 >        rs[0].assertNotInvoked();
2468 >        rs[1].assertNotInvoked();
2469          f.complete(v1);
2470 +        checkCompletedNormally(h0, null);
2471 +        checkCompletedNormally(h1, null);
2472 +        rs[0].assertInvoked();
2473 +        rs[1].assertInvoked();
2474 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2475 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2476 +        checkCompletedNormally(h2, null);
2477 +        checkCompletedNormally(h3, null);
2478 +        rs[2].assertInvoked();
2479 +        rs[3].assertInvoked();
2480  
2264        checkCompletedNormally(f, v1);
2265        checkCompletedNormally(g, v2);
2266        checkCompletedNormally(h, null);
2267        assertEquals(1, r.invocationCount);
2268        }}
2269
2270    public void testRunAfterEither_normalCompletion3() {
2271        for (ExecutionMode m : ExecutionMode.values())
2272        for (Integer v1 : new Integer[] { 1, null })
2273        for (Integer v2 : new Integer[] { 2, null })
2274    {
2275        final CompletableFuture<Integer> f = new CompletableFuture<>();
2276        final CompletableFuture<Integer> g = new CompletableFuture<>();
2277        final Noop r = new Noop(m);
2278
2279        f.complete(v1);
2481          g.complete(v2);
2281        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2482  
2483 <        checkCompletedNormally(h, null);
2483 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2484 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2485 >
2486          checkCompletedNormally(f, v1);
2487          checkCompletedNormally(g, v2);
2488 <        assertEquals(1, r.invocationCount);
2488 >        checkCompletedNormally(h0, null);
2489 >        checkCompletedNormally(h1, null);
2490 >        checkCompletedNormally(h2, null);
2491 >        checkCompletedNormally(h3, null);
2492 >        checkCompletedNormally(h4, null);
2493 >        checkCompletedNormally(h5, null);
2494 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2495      }}
2496  
2497      /**
2498       * runAfterEither result completes exceptionally after exceptional
2499       * completion of either source
2500       */
2501 <    public void testRunAfterEither_exceptionalCompletion1() {
2501 >    public void testRunAfterEither_exceptionalCompletion() {
2502          for (ExecutionMode m : ExecutionMode.values())
2503          for (Integer v1 : new Integer[] { 1, null })
2504      {
2505          final CompletableFuture<Integer> f = new CompletableFuture<>();
2506          final CompletableFuture<Integer> g = new CompletableFuture<>();
2299        final Noop r = new Noop(m);
2300        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2507          final CFException ex = new CFException();
2508 +        final Noop[] rs = new Noop[6];
2509 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2510  
2511 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2512 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2513 +        checkIncomplete(h0);
2514 +        checkIncomplete(h1);
2515 +        rs[0].assertNotInvoked();
2516 +        rs[1].assertNotInvoked();
2517          f.completeExceptionally(ex);
2518 <        checkCompletedWithWrappedCFException(h, ex);
2518 >        checkCompletedWithWrappedException(h0, ex);
2519 >        checkCompletedWithWrappedException(h1, ex);
2520 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2521 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2522 >        checkCompletedWithWrappedException(h2, ex);
2523 >        checkCompletedWithWrappedException(h3, ex);
2524 >
2525          g.complete(v1);
2526  
2527 <        assertEquals(0, r.invocationCount);
2527 >        // unspecified behavior - both source completions available
2528 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2529 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2530 >        try {
2531 >            assertNull(h4.join());
2532 >            rs[4].assertInvoked();
2533 >        } catch (CompletionException ok) {
2534 >            checkCompletedWithWrappedException(h4, ex);
2535 >            rs[4].assertNotInvoked();
2536 >        }
2537 >        try {
2538 >            assertNull(h5.join());
2539 >            rs[5].assertInvoked();
2540 >        } catch (CompletionException ok) {
2541 >            checkCompletedWithWrappedException(h5, ex);
2542 >            rs[5].assertNotInvoked();
2543 >        }
2544 >
2545 >        checkCompletedExceptionally(f, ex);
2546          checkCompletedNormally(g, v1);
2547 <        checkCompletedWithWrappedCFException(f, ex);
2548 <        checkCompletedWithWrappedCFException(h, ex);
2547 >        checkCompletedWithWrappedException(h0, ex);
2548 >        checkCompletedWithWrappedException(h1, ex);
2549 >        checkCompletedWithWrappedException(h2, ex);
2550 >        checkCompletedWithWrappedException(h3, ex);
2551 >        checkCompletedWithWrappedException(h4, ex);
2552 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2553      }}
2554  
2555      public void testRunAfterEither_exceptionalCompletion2() {
2556          for (ExecutionMode m : ExecutionMode.values())
2557 +        for (boolean fFirst : new boolean[] { true, false })
2558          for (Integer v1 : new Integer[] { 1, null })
2559      {
2560          final CompletableFuture<Integer> f = new CompletableFuture<>();
2561          final CompletableFuture<Integer> g = new CompletableFuture<>();
2319        final Noop r = new Noop(m);
2320        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2321        final CFException ex = new CFException();
2322
2323        g.completeExceptionally(ex);
2324        checkCompletedWithWrappedCFException(h, ex);
2325        f.complete(v1);
2326
2327        assertEquals(0, r.invocationCount);
2328        checkCompletedNormally(f, v1);
2329        checkCompletedWithWrappedCFException(g, ex);
2330        checkCompletedWithWrappedCFException(h, ex);
2331    }}
2332
2333    public void testRunAfterEither_exceptionalCompletion3() {
2334        for (ExecutionMode m : ExecutionMode.values())
2335        for (Integer v1 : new Integer[] { 1, null })
2336    {
2337        final CompletableFuture<Integer> f = new CompletableFuture<>();
2338        final CompletableFuture<Integer> g = new CompletableFuture<>();
2339        final Noop r = new Noop(m);
2562          final CFException ex = new CFException();
2563 +        final Noop[] rs = new Noop[6];
2564 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2565  
2566 <        g.completeExceptionally(ex);
2567 <        f.complete(v1);
2568 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2566 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2567 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2568 >        if (fFirst) {
2569 >            f.complete(v1);
2570 >            g.completeExceptionally(ex);
2571 >        } else {
2572 >            g.completeExceptionally(ex);
2573 >            f.complete(v1);
2574 >        }
2575 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2576 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2577  
2578 <        // unspecified behavior
2579 <        Integer v;
2578 >        // unspecified behavior - both source completions available
2579 >        try {
2580 >            assertEquals(null, h0.join());
2581 >            rs[0].assertInvoked();
2582 >        } catch (CompletionException ok) {
2583 >            checkCompletedWithWrappedException(h0, ex);
2584 >            rs[0].assertNotInvoked();
2585 >        }
2586 >        try {
2587 >            assertEquals(null, h1.join());
2588 >            rs[1].assertInvoked();
2589 >        } catch (CompletionException ok) {
2590 >            checkCompletedWithWrappedException(h1, ex);
2591 >            rs[1].assertNotInvoked();
2592 >        }
2593          try {
2594 <            assertNull(h.join());
2595 <            assertEquals(1, r.invocationCount);
2594 >            assertEquals(null, h2.join());
2595 >            rs[2].assertInvoked();
2596          } catch (CompletionException ok) {
2597 <            checkCompletedWithWrappedCFException(h, ex);
2598 <            assertEquals(0, r.invocationCount);
2597 >            checkCompletedWithWrappedException(h2, ex);
2598 >            rs[2].assertNotInvoked();
2599 >        }
2600 >        try {
2601 >            assertEquals(null, h3.join());
2602 >            rs[3].assertInvoked();
2603 >        } catch (CompletionException ok) {
2604 >            checkCompletedWithWrappedException(h3, ex);
2605 >            rs[3].assertNotInvoked();
2606          }
2607  
2356        checkCompletedWithWrappedCFException(g, ex);
2608          checkCompletedNormally(f, v1);
2609 +        checkCompletedExceptionally(g, ex);
2610      }}
2611  
2612 <    public void testRunAfterEither_exceptionalCompletion4() {
2612 >    /**
2613 >     * runAfterEither result completes exceptionally if either source cancelled
2614 >     */
2615 >    public void testRunAfterEither_sourceCancelled() {
2616          for (ExecutionMode m : ExecutionMode.values())
2617 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2618          for (Integer v1 : new Integer[] { 1, null })
2619      {
2620          final CompletableFuture<Integer> f = new CompletableFuture<>();
2621          final CompletableFuture<Integer> g = new CompletableFuture<>();
2622 <        final Noop r = new Noop(m);
2623 <        final CFException ex = new CFException();
2622 >        final Noop[] rs = new Noop[6];
2623 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2624 >
2625 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2626 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2627 >        checkIncomplete(h0);
2628 >        checkIncomplete(h1);
2629 >        rs[0].assertNotInvoked();
2630 >        rs[1].assertNotInvoked();
2631 >        f.cancel(mayInterruptIfRunning);
2632 >        checkCompletedWithWrappedCancellationException(h0);
2633 >        checkCompletedWithWrappedCancellationException(h1);
2634 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2635 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2636 >        checkCompletedWithWrappedCancellationException(h2);
2637 >        checkCompletedWithWrappedCancellationException(h3);
2638  
2369        f.completeExceptionally(ex);
2639          g.complete(v1);
2371        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2640  
2641 <        // unspecified behavior
2642 <        Integer v;
2641 >        // unspecified behavior - both source completions available
2642 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2643 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2644 >        try {
2645 >            assertNull(h4.join());
2646 >            rs[4].assertInvoked();
2647 >        } catch (CompletionException ok) {
2648 >            checkCompletedWithWrappedCancellationException(h4);
2649 >            rs[4].assertNotInvoked();
2650 >        }
2651          try {
2652 <            assertNull(h.join());
2653 <            assertEquals(1, r.invocationCount);
2652 >            assertNull(h5.join());
2653 >            rs[5].assertInvoked();
2654          } catch (CompletionException ok) {
2655 <            checkCompletedWithWrappedCFException(h, ex);
2656 <            assertEquals(0, r.invocationCount);
2655 >            checkCompletedWithWrappedCancellationException(h5);
2656 >            rs[5].assertNotInvoked();
2657          }
2658  
2659 <        checkCompletedWithWrappedCFException(f, ex);
2659 >        checkCancelled(f);
2660          checkCompletedNormally(g, v1);
2661 +        checkCompletedWithWrappedCancellationException(h0);
2662 +        checkCompletedWithWrappedCancellationException(h1);
2663 +        checkCompletedWithWrappedCancellationException(h2);
2664 +        checkCompletedWithWrappedCancellationException(h3);
2665 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2666      }}
2667  
2668      /**
2669       * runAfterEither result completes exceptionally if action does
2670       */
2671 <    public void testRunAfterEither_actionFailed1() {
2671 >    public void testRunAfterEither_actionFailed() {
2672          for (ExecutionMode m : ExecutionMode.values())
2673          for (Integer v1 : new Integer[] { 1, null })
2674          for (Integer v2 : new Integer[] { 2, null })
2675      {
2676          final CompletableFuture<Integer> f = new CompletableFuture<>();
2677          final CompletableFuture<Integer> g = new CompletableFuture<>();
2678 <        final FailingRunnable r = new FailingRunnable(m);
2679 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2678 >        final FailingRunnable[] rs = new FailingRunnable[6];
2679 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2680  
2681 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2682 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2683          f.complete(v1);
2684 <        checkCompletedWithWrappedCFException(h);
2684 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2685 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2686 >        checkCompletedWithWrappedCFException(h0);
2687 >        checkCompletedWithWrappedCFException(h1);
2688 >        checkCompletedWithWrappedCFException(h2);
2689 >        checkCompletedWithWrappedCFException(h3);
2690 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2691          g.complete(v2);
2692 <        checkCompletedNormally(f, v1);
2693 <        checkCompletedNormally(g, v2);
2694 <    }}
2695 <
2407 <    public void testRunAfterEither_actionFailed2() {
2408 <        for (ExecutionMode m : ExecutionMode.values())
2409 <        for (Integer v1 : new Integer[] { 1, null })
2410 <        for (Integer v2 : new Integer[] { 2, null })
2411 <    {
2412 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2413 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2414 <        final FailingRunnable r = new FailingRunnable(m);
2415 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2692 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2693 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2694 >        checkCompletedWithWrappedCFException(h4);
2695 >        checkCompletedWithWrappedCFException(h5);
2696  
2417        g.complete(v2);
2418        checkCompletedWithWrappedCFException(h);
2419        f.complete(v1);
2697          checkCompletedNormally(f, v1);
2698          checkCompletedNormally(g, v2);
2699 <    }}
2423 <
2424 <    /**
2425 <     * runAfterEither result completes exceptionally if either source cancelled
2426 <     */
2427 <    public void testRunAfterEither_sourceCancelled1() {
2428 <        for (ExecutionMode m : ExecutionMode.values())
2429 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2430 <        for (Integer v1 : new Integer[] { 1, null })
2431 <    {
2432 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2433 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2434 <        final Noop r = new Noop(m);
2435 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2436 <
2437 <        assertTrue(f.cancel(mayInterruptIfRunning));
2438 <        checkCompletedWithWrappedCancellationException(h);
2439 <        g.complete(v1);
2440 <
2441 <        checkCancelled(f);
2442 <        assertEquals(0, r.invocationCount);
2443 <        checkCompletedNormally(g, v1);
2444 <        checkCompletedWithWrappedCancellationException(h);
2445 <    }}
2446 <
2447 <    public void testRunAfterEither_sourceCancelled2() {
2448 <        for (ExecutionMode m : ExecutionMode.values())
2449 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2450 <        for (Integer v1 : new Integer[] { 1, null })
2451 <    {
2452 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2453 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2454 <        final Noop r = new Noop(m);
2455 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456 <
2457 <        assertTrue(g.cancel(mayInterruptIfRunning));
2458 <        checkCompletedWithWrappedCancellationException(h);
2459 <        f.complete(v1);
2460 <
2461 <        checkCancelled(g);
2462 <        assertEquals(0, r.invocationCount);
2463 <        checkCompletedNormally(f, v1);
2464 <        checkCompletedWithWrappedCancellationException(h);
2465 <    }}
2466 <
2467 <    public void testRunAfterEither_sourceCancelled3() {
2468 <        for (ExecutionMode m : ExecutionMode.values())
2469 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2470 <        for (Integer v1 : new Integer[] { 1, null })
2471 <    {
2472 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2473 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2474 <        final Noop r = new Noop(m);
2475 <
2476 <        assertTrue(g.cancel(mayInterruptIfRunning));
2477 <        f.complete(v1);
2478 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2479 <
2480 <        // unspecified behavior
2481 <        Integer v;
2482 <        try {
2483 <            assertNull(h.join());
2484 <            assertEquals(1, r.invocationCount);
2485 <        } catch (CompletionException ok) {
2486 <            checkCompletedWithWrappedCancellationException(h);
2487 <            assertEquals(0, r.invocationCount);
2488 <        }
2489 <
2490 <        checkCancelled(g);
2491 <        checkCompletedNormally(f, v1);
2492 <    }}
2493 <
2494 <    public void testRunAfterEither_sourceCancelled4() {
2495 <        for (ExecutionMode m : ExecutionMode.values())
2496 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2497 <        for (Integer v1 : new Integer[] { 1, null })
2498 <    {
2499 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2500 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2501 <        final Noop r = new Noop(m);
2502 <
2503 <        assertTrue(f.cancel(mayInterruptIfRunning));
2504 <        g.complete(v1);
2505 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2506 <
2507 <        // unspecified behavior
2508 <        Integer v;
2509 <        try {
2510 <            assertNull(h.join());
2511 <            assertEquals(1, r.invocationCount);
2512 <        } catch (CompletionException ok) {
2513 <            checkCompletedWithWrappedCancellationException(h);
2514 <            assertEquals(0, r.invocationCount);
2515 <        }
2516 <
2517 <        checkCancelled(f);
2518 <        checkCompletedNormally(g, v1);
2699 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2700      }}
2701  
2702      /**
# Line 2534 | Line 2715 | public class CompletableFutureTest exten
2715  
2716          checkCompletedNormally(g, inc(v1));
2717          checkCompletedNormally(f, v1);
2718 <        assertEquals(1, r.invocationCount);
2718 >        r.assertValue(v1);
2719      }}
2720  
2721      /**
# Line 2552 | Line 2733 | public class CompletableFutureTest exten
2733          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2734          if (createIncomplete) f.completeExceptionally(ex);
2735  
2736 <        checkCompletedWithWrappedCFException(g, ex);
2737 <        checkCompletedWithWrappedCFException(f, ex);
2738 <        assertEquals(0, r.invocationCount);
2736 >        checkCompletedWithWrappedException(g, ex);
2737 >        checkCompletedExceptionally(f, ex);
2738 >        r.assertNotInvoked();
2739      }}
2740  
2741      /**
# Line 2809 | Line 2990 | public class CompletableFutureTest exten
2990          assertSame(f, f.toCompletableFuture());
2991      }
2992  
2812    /**
2813     * whenComplete action executes on normal completion, propagating
2814     * source result.
2815     */
2816    public void testWhenComplete_normalCompletion1() {
2817        for (ExecutionMode m : ExecutionMode.values())
2818        for (boolean createIncomplete : new boolean[] { true, false })
2819        for (Integer v1 : new Integer[] { 1, null })
2820    {
2821        final AtomicInteger a = new AtomicInteger(0);
2822        final CompletableFuture<Integer> f = new CompletableFuture<>();
2823        if (!createIncomplete) f.complete(v1);
2824        final CompletableFuture<Integer> g = m.whenComplete
2825            (f,
2826             (Integer x, Throwable t) -> {
2827                threadAssertSame(x, v1);
2828                threadAssertNull(t);
2829                a.getAndIncrement();
2830            });
2831        if (createIncomplete) f.complete(v1);
2832
2833        checkCompletedNormally(g, v1);
2834        checkCompletedNormally(f, v1);
2835        assertEquals(1, a.get());
2836    }}
2837
2838    /**
2839     * whenComplete action executes on exceptional completion, propagating
2840     * source result.
2841     */
2842    public void testWhenComplete_exceptionalCompletion() {
2843        for (ExecutionMode m : ExecutionMode.values())
2844        for (boolean createIncomplete : new boolean[] { true, false })
2845        for (Integer v1 : new Integer[] { 1, null })
2846    {
2847        final AtomicInteger a = new AtomicInteger(0);
2848        final CFException ex = new CFException();
2849        final CompletableFuture<Integer> f = new CompletableFuture<>();
2850        if (!createIncomplete) f.completeExceptionally(ex);
2851        final CompletableFuture<Integer> g = m.whenComplete
2852            (f,
2853             (Integer x, Throwable t) -> {
2854                threadAssertNull(x);
2855                threadAssertSame(t, ex);
2856                a.getAndIncrement();
2857            });
2858        if (createIncomplete) f.completeExceptionally(ex);
2859        checkCompletedWithWrappedCFException(f, ex);
2860        checkCompletedWithWrappedCFException(g, ex);
2861        assertEquals(1, a.get());
2862    }}
2863
2864    /**
2865     * whenComplete action executes on cancelled source, propagating
2866     * CancellationException.
2867     */
2868    public void testWhenComplete_sourceCancelled() {
2869        for (ExecutionMode m : ExecutionMode.values())
2870        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2871        for (boolean createIncomplete : new boolean[] { true, false })
2872    {
2873        final AtomicInteger a = new AtomicInteger(0);
2874        final CompletableFuture<Integer> f = new CompletableFuture<>();
2875        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2876        final CompletableFuture<Integer> g = m.whenComplete
2877            (f,
2878             (Integer x, Throwable t) -> {
2879                threadAssertNull(x);
2880                threadAssertTrue(t instanceof CancellationException);
2881                a.getAndIncrement();
2882            });
2883        if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2884
2885        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2886        checkCompletedWithWrappedCancellationException(g);
2887        checkCancelled(f);
2888        assertEquals(1, a.get());
2889    }}
2890
2891    /**
2892     * If a whenComplete action throws an exception when triggered by
2893     * a normal completion, it completes exceptionally
2894     */
2895    public void testWhenComplete_actionFailed() {
2896        for (boolean createIncomplete : new boolean[] { true, false })
2897        for (ExecutionMode m : ExecutionMode.values())
2898        for (Integer v1 : new Integer[] { 1, null })
2899    {
2900        final AtomicInteger a = new AtomicInteger(0);
2901        final CFException ex = new CFException();
2902        final CompletableFuture<Integer> f = new CompletableFuture<>();
2903        if (!createIncomplete) f.complete(v1);
2904        final CompletableFuture<Integer> g = m.whenComplete
2905            (f,
2906             (Integer x, Throwable t) -> {
2907                threadAssertSame(x, v1);
2908                threadAssertNull(t);
2909                a.getAndIncrement();
2910                throw ex;
2911            });
2912        if (createIncomplete) f.complete(v1);
2913        checkCompletedNormally(f, v1);
2914        checkCompletedWithWrappedCFException(g, ex);
2915        assertEquals(1, a.get());
2916    }}
2917
2918    /**
2919     * If a whenComplete action throws an exception when triggered by
2920     * a source completion that also throws an exception, the source
2921     * exception takes precedence.
2922     */
2923    public void testWhenComplete_actionFailedSourceFailed() {
2924        for (boolean createIncomplete : new boolean[] { true, false })
2925        for (ExecutionMode m : ExecutionMode.values())
2926        for (Integer v1 : new Integer[] { 1, null })
2927    {
2928        final AtomicInteger a = new AtomicInteger(0);
2929        final CFException ex1 = new CFException();
2930        final CFException ex2 = new CFException();
2931        final CompletableFuture<Integer> f = new CompletableFuture<>();
2932
2933        if (!createIncomplete) f.completeExceptionally(ex1);
2934        final CompletableFuture<Integer> g = m.whenComplete
2935            (f,
2936             (Integer x, Throwable t) -> {
2937                threadAssertSame(t, ex1);
2938                threadAssertNull(x);
2939                a.getAndIncrement();
2940                throw ex2;
2941            });
2942        if (createIncomplete) f.completeExceptionally(ex1);
2943
2944        checkCompletedWithWrappedCFException(f, ex1);
2945        checkCompletedWithWrappedCFException(g, ex1);
2946        assertEquals(1, a.get());
2947    }}
2948
2993   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines