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.57 by jsr166, Mon Jun 2 22:48:50 2014 UTC vs.
Revision 1.63 by jsr166, Fri Jun 6 16:54:16 2014 UTC

# Line 320 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    // Choose non-commutative actions for better coverage
323 >    abstract class CheckedAction {
324 >        int invocationCount = 0;
325 >        final ExecutionMode m;
326 >        CheckedAction(ExecutionMode m) { this.m = m; }
327 >        void invoked() {
328 >            m.checkExecutionMode();
329 >            assertEquals(0, invocationCount++);
330 >        }
331 >        void assertNotInvoked() { assertEquals(0, invocationCount); }
332 >        void assertInvoked() { assertEquals(1, invocationCount); }
333 >    }
334  
335 <    // A non-commutative function that handles and produces null values as well.
336 <    static Integer subtract(Integer x, Integer y) {
337 <        return (x == null && y == null) ? null :
338 <            ((x == null) ? 42 : x.intValue())
339 <            - ((y == null) ? 99 : y.intValue());
335 >    abstract class CheckedIntegerAction extends CheckedAction {
336 >        Integer value;
337 >        CheckedIntegerAction(ExecutionMode m) { super(m); }
338 >        void assertValue(Integer expected) {
339 >            assertInvoked();
340 >            assertEquals(expected, value);
341 >        }
342 >    }
343 >
344 >    class IntegerSupplier extends CheckedAction
345 >        implements Supplier<Integer>
346 >    {
347 >        final Integer value;
348 >        IntegerSupplier(ExecutionMode m, Integer value) {
349 >            super(m);
350 >            this.value = value;
351 >        }
352 >        public Integer get() {
353 >            invoked();
354 >            return value;
355 >        }
356      }
357  
358      // A function that handles and produces null values as well.
# Line 334 | Line 360 | public class CompletableFutureTest exten
360          return (x == null) ? null : x + 1;
361      }
362  
363 <    static final Supplier<Integer> supplyOne =
364 <        () -> Integer.valueOf(1);
365 <    static final Function<Integer, Integer> inc =
366 <        (Integer x) -> Integer.valueOf(x.intValue() + 1);
341 <    static final BiFunction<Integer, Integer, Integer> subtract =
342 <        (Integer x, Integer y) -> subtract(x, y);
343 <    static final class IncAction implements Consumer<Integer> {
344 <        int invocationCount = 0;
345 <        Integer value;
363 >    class IncAction extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        IncAction(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
368 >            invoked();
369              value = inc(x);
370          }
371      }
372 <    static final class IncFunction implements Function<Integer,Integer> {
373 <        final ExecutionMode m;
374 <        int invocationCount = 0;
375 <        Integer value;
376 <        IncFunction(ExecutionMode m) { this.m = m; }
372 >
373 >    class IncFunction extends CheckedIntegerAction
374 >        implements Function<Integer,Integer>
375 >    {
376 >        IncFunction(ExecutionMode m) { super(m); }
377          public Integer apply(Integer x) {
378 <            m.checkExecutionMode();
358 <            invocationCount++;
378 >            invoked();
379              return value = inc(x);
380          }
381      }
382 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
383 <        final ExecutionMode m;
384 <        int invocationCount = 0;
385 <        Integer value;
386 <        // Check this action was invoked exactly once when result is computed.
387 <        SubtractAction(ExecutionMode m) { this.m = m; }
382 >
383 >    // Choose non-commutative actions for better coverage
384 >    // A non-commutative function that handles and produces null values as well.
385 >    static Integer subtract(Integer x, Integer y) {
386 >        return (x == null && y == null) ? null :
387 >            ((x == null) ? 42 : x.intValue())
388 >            - ((y == null) ? 99 : y.intValue());
389 >    }
390 >
391 >    class SubtractAction extends CheckedIntegerAction
392 >        implements BiConsumer<Integer, Integer>
393 >    {
394 >        SubtractAction(ExecutionMode m) { super(m); }
395          public void accept(Integer x, Integer y) {
396 <            m.checkExecutionMode();
370 <            invocationCount++;
396 >            invoked();
397              value = subtract(x, y);
398          }
399      }
400 <    static final class SubtractFunction implements BiFunction<Integer, Integer, Integer> {
401 <        final ExecutionMode m;
402 <        int invocationCount = 0;
403 <        Integer value;
404 <        // Check this action was invoked exactly once when result is computed.
379 <        SubtractFunction(ExecutionMode m) { this.m = m; }
400 >
401 >    class SubtractFunction extends CheckedIntegerAction
402 >        implements BiFunction<Integer, Integer, Integer>
403 >    {
404 >        SubtractFunction(ExecutionMode m) { super(m); }
405          public Integer apply(Integer x, Integer y) {
406 <            m.checkExecutionMode();
382 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410 <    static final class Noop implements Runnable {
411 <        final ExecutionMode m;
412 <        int invocationCount = 0;
389 <        Noop(ExecutionMode m) { this.m = m; }
410 >
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            m.checkExecutionMode();
392 <            invocationCount++;
414 >            invoked();
415          }
416      }
417  
418 <    static final class FailingSupplier implements Supplier<Integer> {
419 <        final ExecutionMode m;
420 <        int invocationCount = 0;
421 <        FailingSupplier(ExecutionMode m) { this.m = m; }
418 >    class FailingSupplier extends CheckedAction
419 >        implements Supplier<Integer>
420 >    {
421 >        FailingSupplier(ExecutionMode m) { super(m); }
422          public Integer get() {
423 <            m.checkExecutionMode();
402 <            invocationCount++;
423 >            invoked();
424              throw new CFException();
425          }
426      }
427 <    static final class FailingConsumer implements Consumer<Integer> {
428 <        final ExecutionMode m;
429 <        int invocationCount = 0;
430 <        FailingConsumer(ExecutionMode m) { this.m = m; }
427 >
428 >    class FailingConsumer extends CheckedIntegerAction
429 >        implements Consumer<Integer>
430 >    {
431 >        FailingConsumer(ExecutionMode m) { super(m); }
432          public void accept(Integer x) {
433 <            m.checkExecutionMode();
434 <            invocationCount++;
433 >            invoked();
434 >            value = x;
435              throw new CFException();
436          }
437      }
438 <    static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
439 <        final ExecutionMode m;
440 <        int invocationCount = 0;
441 <        FailingBiConsumer(ExecutionMode m) { this.m = m; }
438 >
439 >    class FailingBiConsumer extends CheckedIntegerAction
440 >        implements BiConsumer<Integer, Integer>
441 >    {
442 >        FailingBiConsumer(ExecutionMode m) { super(m); }
443          public void accept(Integer x, Integer y) {
444 <            m.checkExecutionMode();
445 <            invocationCount++;
444 >            invoked();
445 >            value = subtract(x, y);
446              throw new CFException();
447          }
448      }
449 <    static final class FailingFunction implements Function<Integer, Integer> {
450 <        final ExecutionMode m;
451 <        int invocationCount = 0;
452 <        FailingFunction(ExecutionMode m) { this.m = m; }
449 >
450 >    class FailingFunction extends CheckedIntegerAction
451 >        implements Function<Integer, Integer>
452 >    {
453 >        FailingFunction(ExecutionMode m) { super(m); }
454          public Integer apply(Integer x) {
455 <            m.checkExecutionMode();
456 <            invocationCount++;
455 >            invoked();
456 >            value = x;
457              throw new CFException();
458          }
459      }
460 <    static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
461 <        final ExecutionMode m;
462 <        int invocationCount = 0;
463 <        FailingBiFunction(ExecutionMode m) { this.m = m; }
460 >
461 >    class FailingBiFunction extends CheckedIntegerAction
462 >        implements BiFunction<Integer, Integer, Integer>
463 >    {
464 >        FailingBiFunction(ExecutionMode m) { super(m); }
465          public Integer apply(Integer x, Integer y) {
466 <            m.checkExecutionMode();
467 <            invocationCount++;
466 >            invoked();
467 >            value = subtract(x, y);
468              throw new CFException();
469          }
470      }
471 <    static final class FailingRunnable implements Runnable {
472 <        final ExecutionMode m;
473 <        int invocationCount = 0;
449 <        FailingRunnable(ExecutionMode m) { this.m = m; }
471 >
472 >    class FailingRunnable extends CheckedAction implements Runnable {
473 >        FailingRunnable(ExecutionMode m) { super(m); }
474          public void run() {
475 <            m.checkExecutionMode();
452 <            invocationCount++;
475 >            invoked();
476              throw new CFException();
477          }
478      }
479  
480 <    static final class CompletableFutureInc
481 <        implements Function<Integer, CompletableFuture<Integer>> {
482 <        final ExecutionMode m;
483 <        int invocationCount = 0;
484 <        CompletableFutureInc(ExecutionMode m) { this.m = m; }
480 >
481 >    class CompletableFutureInc extends CheckedIntegerAction
482 >        implements Function<Integer, CompletableFuture<Integer>>
483 >    {
484 >        CompletableFutureInc(ExecutionMode m) { super(m); }
485          public CompletableFuture<Integer> apply(Integer x) {
486 <            m.checkExecutionMode();
487 <            invocationCount++;
486 >            invoked();
487 >            value = x;
488              CompletableFuture<Integer> f = new CompletableFuture<>();
489              f.complete(inc(x));
490              return f;
491          }
492      }
493  
494 <    static final class FailingCompletableFutureFunction
495 <        implements Function<Integer, CompletableFuture<Integer>> {
496 <        final ExecutionMode m;
497 <        int invocationCount = 0;
475 <        FailingCompletableFutureFunction(ExecutionMode m) { this.m = m; }
494 >    class FailingCompletableFutureFunction extends CheckedIntegerAction
495 >        implements Function<Integer, CompletableFuture<Integer>>
496 >    {
497 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
498          public CompletableFuture<Integer> apply(Integer x) {
499 <            m.checkExecutionMode();
500 <            invocationCount++;
499 >            invoked();
500 >            value = x;
501              throw new CFException();
502          }
503      }
# Line 496 | Line 518 | public class CompletableFutureTest exten
518  
519      /**
520       * Permits the testing of parallel code for the 3 different
521 <     * execution modes without repeating all the testing code.
521 >     * execution modes without copy/pasting all the test methods.
522       */
523      enum ExecutionMode {
524          DEFAULT {
525              public void checkExecutionMode() {
526 +                assertFalse(ThreadExecutor.startedCurrentThread());
527                  assertNull(ForkJoinTask.getPool());
528              }
529              public CompletableFuture<Void> runAsync(Runnable a) {
530                  throw new UnsupportedOperationException();
531              }
532 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
533 +                throw new UnsupportedOperationException();
534 +            }
535              public <T> CompletableFuture<Void> thenRun
536                  (CompletableFuture<T> f, Runnable a) {
537                  return f.thenRun(a);
# Line 577 | Line 603 | public class CompletableFutureTest exten
603              public CompletableFuture<Void> runAsync(Runnable a) {
604                  return CompletableFuture.runAsync(a);
605              }
606 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
607 +                return CompletableFuture.supplyAsync(a);
608 +            }
609              public <T> CompletableFuture<Void> thenRun
610                  (CompletableFuture<T> f, Runnable a) {
611                  return f.thenRunAsync(a);
# Line 647 | Line 676 | public class CompletableFutureTest exten
676              public CompletableFuture<Void> runAsync(Runnable a) {
677                  return CompletableFuture.runAsync(a, new ThreadExecutor());
678              }
679 +            public <U> CompletableFuture<U> supplyAsync(Supplier<U> a) {
680 +                return CompletableFuture.supplyAsync(a, new ThreadExecutor());
681 +            }
682              public <T> CompletableFuture<Void> thenRun
683                  (CompletableFuture<T> f, Runnable a) {
684                  return f.thenRunAsync(a, new ThreadExecutor());
# Line 712 | Line 744 | public class CompletableFutureTest exten
744  
745          public abstract void checkExecutionMode();
746          public abstract CompletableFuture<Void> runAsync(Runnable a);
747 +        public abstract <U> CompletableFuture<U> supplyAsync(Supplier<U> a);
748          public abstract <T> CompletableFuture<Void> thenRun
749              (CompletableFuture<T> f, Runnable a);
750          public abstract <T> CompletableFuture<Void> thenAccept
# Line 976 | Line 1009 | public class CompletableFutureTest exten
1009          final CompletableFuture<Void> f = m.runAsync(r);
1010          assertNull(f.join());
1011          checkCompletedNormally(f, null);
1012 <        assertEquals(1, r.invocationCount);
1012 >        r.assertInvoked();
1013      }}
1014  
1015      /**
# Line 992 | Line 1025 | public class CompletableFutureTest exten
1025          final FailingRunnable r = new FailingRunnable(m);
1026          final CompletableFuture<Void> f = m.runAsync(r);
1027          checkCompletedWithWrappedCFException(f);
1028 <        assertEquals(1, r.invocationCount);
1028 >        r.assertInvoked();
1029      }}
1030  
1031      /**
1032       * supplyAsync completes with result of supplier
1033       */
1034 <    public void testSupplyAsync() {
1035 <        CompletableFuture<Integer> f;
1036 <        f = CompletableFuture.supplyAsync(supplyOne);
1037 <        assertEquals(f.join(), one);
1038 <        checkCompletedNormally(f, one);
1039 <    }
1040 <
1041 <    /**
1042 <     * supplyAsync with executor completes with result of supplier
1043 <     */
1044 <    public void testSupplyAsync2() {
1045 <        CompletableFuture<Integer> f;
1046 <        f = CompletableFuture.supplyAsync(supplyOne, new ThreadExecutor());
1047 <        assertEquals(f.join(), one);
1015 <        checkCompletedNormally(f, one);
1016 <    }
1034 >    public void testSupplyAsync_normalCompletion() {
1035 >        ExecutionMode[] executionModes = {
1036 >            ExecutionMode.ASYNC,
1037 >            ExecutionMode.EXECUTOR,
1038 >        };
1039 >        for (ExecutionMode m : executionModes)
1040 >        for (Integer v1 : new Integer[] { 1, null })
1041 >    {
1042 >        final IntegerSupplier r = new IntegerSupplier(m, v1);
1043 >        final CompletableFuture<Integer> f = m.supplyAsync(r);
1044 >        assertSame(v1, f.join());
1045 >        checkCompletedNormally(f, v1);
1046 >        r.assertInvoked();
1047 >    }}
1048  
1049      /**
1050       * Failing supplyAsync completes exceptionally
1051       */
1052 <    public void testSupplyAsync3() {
1053 <        FailingSupplier r = new FailingSupplier(ExecutionMode.ASYNC);
1054 <        CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
1052 >    public void testSupplyAsync_exceptionalCompletion() {
1053 >        ExecutionMode[] executionModes = {
1054 >            ExecutionMode.ASYNC,
1055 >            ExecutionMode.EXECUTOR,
1056 >        };
1057 >        for (ExecutionMode m : executionModes)
1058 >    {
1059 >        FailingSupplier r = new FailingSupplier(m);
1060 >        CompletableFuture<Integer> f = m.supplyAsync(r);
1061          checkCompletedWithWrappedCFException(f);
1062 <        assertEquals(1, r.invocationCount);
1063 <    }
1062 >        r.assertInvoked();
1063 >    }}
1064  
1065      // seq completion methods
1066  
# Line 1046 | Line 1083 | public class CompletableFutureTest exten
1083  
1084          checkCompletedNormally(g, null);
1085          checkCompletedNormally(f, v1);
1086 <        assertEquals(1, r.invocationCount);
1086 >        r.assertInvoked();
1087      }}
1088  
1089      /**
# Line 1069 | Line 1106 | public class CompletableFutureTest exten
1106  
1107          checkCompletedWithWrappedCFException(g, ex);
1108          checkCompletedWithWrappedCFException(f, ex);
1109 <        assertEquals(0, r.invocationCount);
1109 >        r.assertNotInvoked();
1110      }}
1111  
1112      /**
# Line 1091 | Line 1128 | public class CompletableFutureTest exten
1128  
1129          checkCompletedWithWrappedCancellationException(g);
1130          checkCancelled(f);
1131 <        assertEquals(0, r.invocationCount);
1131 >        r.assertNotInvoked();
1132      }}
1133  
1134      /**
# Line 1134 | Line 1171 | public class CompletableFutureTest exten
1171  
1172          checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        assertEquals(1, r.invocationCount);
1174 >        r.assertInvoked();
1175      }}
1176  
1177      /**
# Line 1157 | Line 1194 | public class CompletableFutureTest exten
1194  
1195          checkCompletedWithWrappedCFException(g, ex);
1196          checkCompletedWithWrappedCFException(f, ex);
1197 <        assertEquals(0, r.invocationCount);
1197 >        r.assertNotInvoked();
1198      }}
1199  
1200      /**
# Line 1179 | Line 1216 | public class CompletableFutureTest exten
1216  
1217          checkCompletedWithWrappedCancellationException(g);
1218          checkCancelled(f);
1219 <        assertEquals(0, r.invocationCount);
1219 >        r.assertNotInvoked();
1220      }}
1221  
1222      /**
# Line 1212 | Line 1249 | public class CompletableFutureTest exten
1249          for (Integer v1 : new Integer[] { 1, null })
1250      {
1251          final CompletableFuture<Integer> f = new CompletableFuture<>();
1252 <        final IncAction r = new IncAction();
1252 >        final IncAction r = new IncAction(m);
1253          if (!createIncomplete) f.complete(v1);
1254          final CompletableFuture<Void> g = m.thenAccept(f, r);
1255          if (createIncomplete) {
# Line 1222 | Line 1259 | public class CompletableFutureTest exten
1259  
1260          checkCompletedNormally(g, null);
1261          checkCompletedNormally(f, v1);
1262 <        assertEquals(1, r.invocationCount);
1263 <        assertEquals(inc(v1), r.value);
1262 >        r.assertInvoked();
1263 >        r.assertValue(inc(v1));
1264      }}
1265  
1266      /**
# Line 1236 | Line 1273 | public class CompletableFutureTest exten
1273      {
1274          final CFException ex = new CFException();
1275          final CompletableFuture<Integer> f = new CompletableFuture<>();
1276 <        final IncAction r = new IncAction();
1276 >        final IncAction r = new IncAction(m);
1277          if (!createIncomplete) f.completeExceptionally(ex);
1278          final CompletableFuture<Void> g = m.thenAccept(f, r);
1279          if (createIncomplete) {
# Line 1246 | Line 1283 | public class CompletableFutureTest exten
1283  
1284          checkCompletedWithWrappedCFException(g, ex);
1285          checkCompletedWithWrappedCFException(f, ex);
1286 <        assertEquals(0, r.invocationCount);
1286 >        r.assertNotInvoked();
1287      }}
1288  
1289      /**
1290 <     * thenAccept result completes exceptionally if action does
1290 >     * thenAccept result completes exceptionally if source cancelled
1291       */
1292 <    public void testThenAccept_actionFailed() {
1292 >    public void testThenAccept_sourceCancelled() {
1293          for (ExecutionMode m : ExecutionMode.values())
1294          for (boolean createIncomplete : new boolean[] { true, false })
1295 <        for (Integer v1 : new Integer[] { 1, null })
1295 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1296      {
1297          final CompletableFuture<Integer> f = new CompletableFuture<>();
1298 <        final FailingConsumer r = new FailingConsumer(m);
1299 <        if (!createIncomplete) f.complete(v1);
1298 >        final IncAction r = new IncAction(m);
1299 >        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1300          final CompletableFuture<Void> g = m.thenAccept(f, r);
1301          if (createIncomplete) {
1302              checkIncomplete(g);
1303 <            f.complete(v1);
1303 >            assertTrue(f.cancel(mayInterruptIfRunning));
1304          }
1305  
1306 <        checkCompletedWithWrappedCFException(g);
1307 <        checkCompletedNormally(f, v1);
1306 >        checkCompletedWithWrappedCancellationException(g);
1307 >        checkCancelled(f);
1308 >        r.assertNotInvoked();
1309      }}
1310  
1311      /**
1312 <     * thenAccept result completes exceptionally if source cancelled
1312 >     * thenAccept result completes exceptionally if action does
1313       */
1314 <    public void testThenAccept_sourceCancelled() {
1314 >    public void testThenAccept_actionFailed() {
1315          for (ExecutionMode m : ExecutionMode.values())
1316          for (boolean createIncomplete : new boolean[] { true, false })
1317 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1317 >        for (Integer v1 : new Integer[] { 1, null })
1318      {
1319          final CompletableFuture<Integer> f = new CompletableFuture<>();
1320 <        final IncAction r = new IncAction();
1321 <        if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1320 >        final FailingConsumer r = new FailingConsumer(m);
1321 >        if (!createIncomplete) f.complete(v1);
1322          final CompletableFuture<Void> g = m.thenAccept(f, r);
1323          if (createIncomplete) {
1324              checkIncomplete(g);
1325 <            assertTrue(f.cancel(mayInterruptIfRunning));
1325 >            f.complete(v1);
1326          }
1327  
1328 <        checkCompletedWithWrappedCancellationException(g);
1329 <        checkCancelled(f);
1292 <        assertEquals(0, r.invocationCount);
1328 >        checkCompletedWithWrappedCFException(g);
1329 >        checkCompletedNormally(f, v1);
1330      }}
1331  
1332      /**
# Line 1313 | Line 1350 | public class CompletableFutureTest exten
1350          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1351          if (createIncomplete) {
1352              checkIncomplete(h);
1353 <            assertEquals(0, r.invocationCount);
1353 >            r.assertNotInvoked();
1354              if (!fFirst) f.complete(v1); else g.complete(v2);
1355          }
1356  
1357          checkCompletedNormally(h, subtract(v1, v2));
1358          checkCompletedNormally(f, v1);
1359          checkCompletedNormally(g, v2);
1360 <        assertEquals(1, r.invocationCount);
1360 >        r.assertInvoked();
1361      }}
1362  
1363      /**
# Line 1348 | Line 1385 | public class CompletableFutureTest exten
1385          }
1386  
1387          checkCompletedWithWrappedCFException(h, ex);
1388 <        assertEquals(0, r.invocationCount);
1388 >        r.assertNotInvoked();
1389          checkCompletedNormally(fFirst ? f : g, v1);
1390          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1391      }}
1392  
1393      /**
1357     * thenCombine result completes exceptionally if action does
1358     */
1359    public void testThenCombine_actionFailed() {
1360        for (ExecutionMode m : ExecutionMode.values())
1361        for (boolean fFirst : new boolean[] { true, false })
1362        for (Integer v1 : new Integer[] { 1, null })
1363        for (Integer v2 : new Integer[] { 2, null })
1364    {
1365        final CompletableFuture<Integer> f = new CompletableFuture<>();
1366        final CompletableFuture<Integer> g = new CompletableFuture<>();
1367        final FailingBiFunction r = new FailingBiFunction(m);
1368        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1369
1370        if (fFirst) {
1371            f.complete(v1);
1372            g.complete(v2);
1373        } else {
1374            g.complete(v2);
1375            f.complete(v1);
1376        }
1377
1378        checkCompletedWithWrappedCFException(h);
1379        checkCompletedNormally(f, v1);
1380        checkCompletedNormally(g, v2);
1381    }}
1382
1383    /**
1394       * thenCombine result completes exceptionally if either source cancelled
1395       */
1396      public void testThenCombine_sourceCancelled() {
# Line 1405 | Line 1415 | public class CompletableFutureTest exten
1415  
1416          checkCompletedWithWrappedCancellationException(h);
1417          checkCancelled(!fFirst ? f : g);
1418 <        assertEquals(0, r.invocationCount);
1418 >        r.assertNotInvoked();
1419          checkCompletedNormally(fFirst ? f : g, v1);
1420      }}
1421  
1422      /**
1423 +     * thenCombine result completes exceptionally if action does
1424 +     */
1425 +    public void testThenCombine_actionFailed() {
1426 +        for (ExecutionMode m : ExecutionMode.values())
1427 +        for (boolean fFirst : new boolean[] { true, false })
1428 +        for (Integer v1 : new Integer[] { 1, null })
1429 +        for (Integer v2 : new Integer[] { 2, null })
1430 +    {
1431 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1432 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1433 +        final FailingBiFunction r = new FailingBiFunction(m);
1434 +        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1435 +
1436 +        if (fFirst) {
1437 +            f.complete(v1);
1438 +            g.complete(v2);
1439 +        } else {
1440 +            g.complete(v2);
1441 +            f.complete(v1);
1442 +        }
1443 +
1444 +        checkCompletedWithWrappedCFException(h);
1445 +        checkCompletedNormally(f, v1);
1446 +        checkCompletedNormally(g, v2);
1447 +    }}
1448 +
1449 +    /**
1450       * thenAcceptBoth result completes normally after normal
1451       * completion of sources
1452       */
# Line 1430 | Line 1467 | public class CompletableFutureTest exten
1467          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1468          if (createIncomplete) {
1469              checkIncomplete(h);
1470 <            assertEquals(0, r.invocationCount);
1470 >            r.assertNotInvoked();
1471              if (!fFirst) f.complete(v1); else g.complete(v2);
1472          }
1473  
1474          checkCompletedNormally(h, null);
1475 <        assertEquals(subtract(v1, v2), r.value);
1475 >        r.assertValue(subtract(v1, v2));
1476          checkCompletedNormally(f, v1);
1477          checkCompletedNormally(g, v2);
1478      }}
# Line 1465 | Line 1502 | public class CompletableFutureTest exten
1502          }
1503  
1504          checkCompletedWithWrappedCFException(h, ex);
1505 <        assertEquals(0, r.invocationCount);
1505 >        r.assertNotInvoked();
1506          checkCompletedNormally(fFirst ? f : g, v1);
1507          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1508      }}
1509  
1510      /**
1474     * thenAcceptBoth result completes exceptionally if action does
1475     */
1476    public void testThenAcceptBoth_actionFailed() {
1477        for (ExecutionMode m : ExecutionMode.values())
1478        for (boolean fFirst : new boolean[] { true, false })
1479        for (Integer v1 : new Integer[] { 1, null })
1480        for (Integer v2 : new Integer[] { 2, null })
1481    {
1482        final CompletableFuture<Integer> f = new CompletableFuture<>();
1483        final CompletableFuture<Integer> g = new CompletableFuture<>();
1484        final FailingBiConsumer r = new FailingBiConsumer(m);
1485        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1486
1487        if (fFirst) {
1488            f.complete(v1);
1489            g.complete(v2);
1490        } else {
1491            g.complete(v2);
1492            f.complete(v1);
1493        }
1494
1495        checkCompletedWithWrappedCFException(h);
1496        checkCompletedNormally(f, v1);
1497        checkCompletedNormally(g, v2);
1498    }}
1499
1500    /**
1511       * thenAcceptBoth result completes exceptionally if either source cancelled
1512       */
1513      public void testThenAcceptBoth_sourceCancelled() {
# Line 1522 | Line 1532 | public class CompletableFutureTest exten
1532  
1533          checkCompletedWithWrappedCancellationException(h);
1534          checkCancelled(!fFirst ? f : g);
1535 <        assertEquals(0, r.invocationCount);
1535 >        r.assertNotInvoked();
1536          checkCompletedNormally(fFirst ? f : g, v1);
1537      }}
1538  
1539      /**
1540 +     * thenAcceptBoth result completes exceptionally if action does
1541 +     */
1542 +    public void testThenAcceptBoth_actionFailed() {
1543 +        for (ExecutionMode m : ExecutionMode.values())
1544 +        for (boolean fFirst : new boolean[] { true, false })
1545 +        for (Integer v1 : new Integer[] { 1, null })
1546 +        for (Integer v2 : new Integer[] { 2, null })
1547 +    {
1548 +        final CompletableFuture<Integer> f = new CompletableFuture<>();
1549 +        final CompletableFuture<Integer> g = new CompletableFuture<>();
1550 +        final FailingBiConsumer r = new FailingBiConsumer(m);
1551 +        final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1552 +
1553 +        if (fFirst) {
1554 +            f.complete(v1);
1555 +            g.complete(v2);
1556 +        } else {
1557 +            g.complete(v2);
1558 +            f.complete(v1);
1559 +        }
1560 +
1561 +        checkCompletedWithWrappedCFException(h);
1562 +        checkCompletedNormally(f, v1);
1563 +        checkCompletedNormally(g, v2);
1564 +    }}
1565 +
1566 +    /**
1567       * runAfterBoth result completes normally after normal
1568       * completion of sources
1569       */
# Line 1547 | Line 1584 | public class CompletableFutureTest exten
1584          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1585          if (createIncomplete) {
1586              checkIncomplete(h);
1587 <            assertEquals(0, r.invocationCount);
1587 >            r.assertNotInvoked();
1588              if (!fFirst) f.complete(v1); else g.complete(v2);
1589          }
1590  
1591          checkCompletedNormally(h, null);
1592 <        assertEquals(1, r.invocationCount);
1592 >        r.assertInvoked();
1593          checkCompletedNormally(f, v1);
1594          checkCompletedNormally(g, v2);
1595      }}
# Line 1582 | Line 1619 | public class CompletableFutureTest exten
1619          }
1620  
1621          checkCompletedWithWrappedCFException(h, ex);
1622 <        assertEquals(0, r.invocationCount);
1622 >        r.assertNotInvoked();
1623          checkCompletedNormally(fFirst ? f : g, v1);
1624          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1625      }}
1626  
1627      /**
1591     * runAfterBoth result completes exceptionally if action does
1592     */
1593    public void testRunAfterBoth_actionFailed() {
1594        for (ExecutionMode m : ExecutionMode.values())
1595        for (boolean fFirst : new boolean[] { true, false })
1596        for (Integer v1 : new Integer[] { 1, null })
1597        for (Integer v2 : new Integer[] { 2, null })
1598    {
1599        final CompletableFuture<Integer> f = new CompletableFuture<>();
1600        final CompletableFuture<Integer> g = new CompletableFuture<>();
1601        final FailingRunnable r = new FailingRunnable(m);
1602
1603        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1604        if (fFirst) {
1605            f.complete(v1);
1606            g.complete(v2);
1607        } else {
1608            g.complete(v2);
1609            f.complete(v1);
1610        }
1611        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1612
1613        checkCompletedWithWrappedCFException(h1);
1614        checkCompletedWithWrappedCFException(h2);
1615        checkCompletedNormally(f, v1);
1616        checkCompletedNormally(g, v2);
1617    }}
1618
1619    /**
1628       * runAfterBoth result completes exceptionally if either source cancelled
1629       */
1630      public void testRunAfterBoth_sourceCancelled() {
# Line 1642 | Line 1650 | public class CompletableFutureTest exten
1650  
1651          checkCompletedWithWrappedCancellationException(h);
1652          checkCancelled(!fFirst ? f : g);
1653 <        assertEquals(0, r.invocationCount);
1653 >        r.assertNotInvoked();
1654          checkCompletedNormally(fFirst ? f : g, v1);
1655      }}
1656  
1657      /**
1658 <     * applyToEither result completes normally after normal completion
1651 <     * of either source
1658 >     * runAfterBoth result completes exceptionally if action does
1659       */
1660 <    public void testApplyToEither_normalCompletion() {
1654 <        for (ExecutionMode m : ExecutionMode.values())
1655 <        for (boolean createIncomplete : new boolean[] { true, false })
1656 <        for (boolean fFirst : new boolean[] { true, false })
1657 <        for (Integer v1 : new Integer[] { 1, null })
1658 <        for (Integer v2 : new Integer[] { 2, null })
1659 <    {
1660 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1661 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1662 <        final IncFunction r = new IncFunction(m);
1663 <
1664 <        if (!createIncomplete)
1665 <            if (fFirst) f.complete(v1); else g.complete(v2);
1666 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1667 <        if (createIncomplete) {
1668 <            checkIncomplete(h);
1669 <            assertEquals(0, r.invocationCount);
1670 <            if (fFirst) f.complete(v1); else g.complete(v2);
1671 <        }
1672 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1673 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1674 <
1675 <        checkCompletedNormally(f, v1);
1676 <        checkCompletedNormally(g, v2);
1677 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1678 <    }}
1679 <
1680 <    public void testApplyToEither_normalCompletionBothAvailable() {
1660 >    public void testRunAfterBoth_actionFailed() {
1661          for (ExecutionMode m : ExecutionMode.values())
1662          for (boolean fFirst : new boolean[] { true, false })
1663          for (Integer v1 : new Integer[] { 1, null })
# Line 1685 | Line 1665 | public class CompletableFutureTest exten
1665      {
1666          final CompletableFuture<Integer> f = new CompletableFuture<>();
1667          final CompletableFuture<Integer> g = new CompletableFuture<>();
1668 <        final IncFunction r = new IncFunction(m);
1668 >        final FailingRunnable r1 = new FailingRunnable(m);
1669 >        final FailingRunnable r2 = new FailingRunnable(m);
1670  
1671 +        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1672          if (fFirst) {
1673              f.complete(v1);
1674              g.complete(v2);
# Line 1694 | Line 1676 | public class CompletableFutureTest exten
1676              g.complete(v2);
1677              f.complete(v1);
1678          }
1679 +        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1680  
1681 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1682 <
1681 >        checkCompletedWithWrappedCFException(h1);
1682 >        checkCompletedWithWrappedCFException(h2);
1683          checkCompletedNormally(f, v1);
1684          checkCompletedNormally(g, v2);
1702
1703        // unspecified behavior
1704        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1705                   Objects.equals(h.join(), inc(v2)));
1706        assertEquals(1, r.invocationCount);
1685      }}
1686  
1687      /**
1688 <     * applyToEither result completes exceptionally after exceptional
1689 <     * completion of either source
1688 >     * applyToEither result completes normally after normal completion
1689 >     * of either source
1690       */
1691 <    public void testApplyToEither_exceptionalCompletion1() {
1691 >    public void testApplyToEither_normalCompletion() {
1692          for (ExecutionMode m : ExecutionMode.values())
1715        for (boolean createIncomplete : new boolean[] { true, false })
1716        for (boolean fFirst : new boolean[] { true, false })
1693          for (Integer v1 : new Integer[] { 1, null })
1694 +        for (Integer v2 : new Integer[] { 2, null })
1695      {
1696          final CompletableFuture<Integer> f = new CompletableFuture<>();
1697          final CompletableFuture<Integer> g = new CompletableFuture<>();
1698 <        final CFException ex = new CFException();
1699 <        final IncFunction r = new IncFunction(m);
1698 >        final IncFunction[] rs = new IncFunction[6];
1699 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1700  
1701 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1702 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1703 <        if (createIncomplete) {
1704 <            checkIncomplete(h);
1705 <            assertEquals(0, r.invocationCount);
1706 <            (fFirst ? f : g).completeExceptionally(ex);
1707 <        }
1701 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1702 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1703 >        checkIncomplete(h0);
1704 >        checkIncomplete(h1);
1705 >        rs[0].assertNotInvoked();
1706 >        rs[1].assertNotInvoked();
1707 >        f.complete(v1);
1708 >        checkCompletedNormally(h0, inc(v1));
1709 >        checkCompletedNormally(h1, inc(v1));
1710 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1711 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1712 >        checkCompletedNormally(h2, inc(v1));
1713 >        checkCompletedNormally(h3, inc(v1));
1714 >        g.complete(v2);
1715  
1716 <        checkCompletedWithWrappedCFException(h, ex);
1717 <        (!fFirst ? f : g).complete(v1);
1716 >        // unspecified behavior - both source completions available
1717 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1718 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1719 >        rs[4].assertValue(h4.join());
1720 >        rs[5].assertValue(h5.join());
1721 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1722 >                   Objects.equals(inc(v2), h4.join()));
1723 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1724 >                   Objects.equals(inc(v2), h5.join()));
1725  
1726 <        assertEquals(0, r.invocationCount);
1727 <        checkCompletedNormally(!fFirst ? f : g, v1);
1728 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1729 <        checkCompletedWithWrappedCFException(h, ex);
1726 >        checkCompletedNormally(f, v1);
1727 >        checkCompletedNormally(g, v2);
1728 >        checkCompletedNormally(h0, inc(v1));
1729 >        checkCompletedNormally(h1, inc(v1));
1730 >        checkCompletedNormally(h2, inc(v1));
1731 >        checkCompletedNormally(h3, inc(v1));
1732 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1733      }}
1734  
1735 <    public void testApplyToEither_exceptionalCompletion2() {
1735 >    /**
1736 >     * applyToEither result completes exceptionally after exceptional
1737 >     * completion of either source
1738 >     */
1739 >    public void testApplyToEither_exceptionalCompletion() {
1740          for (ExecutionMode m : ExecutionMode.values())
1743        for (boolean reverseArgs : new boolean[] { true, false })
1744        for (boolean fFirst : new boolean[] { true, false })
1741          for (Integer v1 : new Integer[] { 1, null })
1742      {
1743          final CompletableFuture<Integer> f = new CompletableFuture<>();
1744          final CompletableFuture<Integer> g = new CompletableFuture<>();
1749        final IncFunction r1 = new IncFunction(m);
1750        final IncFunction r2 = new IncFunction(m);
1745          final CFException ex = new CFException();
1746 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1747 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1754 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1755 <        if (fFirst) {
1756 <            f.complete(v1);
1757 <            g.completeExceptionally(ex);
1758 <        } else {
1759 <            g.completeExceptionally(ex);
1760 <            f.complete(v1);
1761 <        }
1762 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1746 >        final IncFunction[] rs = new IncFunction[6];
1747 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1748  
1749 <        // unspecified behavior
1749 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1750 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1751 >        checkIncomplete(h0);
1752 >        checkIncomplete(h1);
1753 >        rs[0].assertNotInvoked();
1754 >        rs[1].assertNotInvoked();
1755 >        f.completeExceptionally(ex);
1756 >        checkCompletedWithWrappedCFException(h0, ex);
1757 >        checkCompletedWithWrappedCFException(h1, ex);
1758 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1759 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1760 >        checkCompletedWithWrappedCFException(h2, ex);
1761 >        checkCompletedWithWrappedCFException(h3, ex);
1762 >        g.complete(v1);
1763 >
1764 >        // unspecified behavior - both source completions available
1765 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1766 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1767          try {
1768 <            assertEquals(inc(v1), h1.join());
1769 <            assertEquals(1, r1.invocationCount);
1768 >            assertEquals(inc(v1), h4.join());
1769 >            rs[4].assertInvoked();
1770          } catch (CompletionException ok) {
1771 <            checkCompletedWithWrappedCFException(h1, ex);
1772 <            assertEquals(0, r1.invocationCount);
1771 >            checkCompletedWithWrappedCFException(h4, ex);
1772 >            rs[4].assertNotInvoked();
1773          }
1772
1774          try {
1775 <            assertEquals(inc(v1), h2.join());
1776 <            assertEquals(1, r2.invocationCount);
1775 >            assertEquals(inc(v1), h5.join());
1776 >            rs[5].assertInvoked();
1777          } catch (CompletionException ok) {
1778 <            checkCompletedWithWrappedCFException(h2, ex);
1779 <            assertEquals(0, r2.invocationCount);
1778 >            checkCompletedWithWrappedCFException(h5, ex);
1779 >            rs[5].assertNotInvoked();
1780          }
1781  
1782 <        checkCompletedWithWrappedCFException(g, ex);
1783 <        checkCompletedNormally(f, v1);
1784 <    }}
1785 <
1786 <    /**
1787 <     * applyToEither result completes exceptionally if action does
1788 <     */
1789 <    public void testApplyToEither_actionFailed1() {
1789 <        for (ExecutionMode m : ExecutionMode.values())
1790 <        for (Integer v1 : new Integer[] { 1, null })
1791 <        for (Integer v2 : new Integer[] { 2, null })
1792 <    {
1793 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1794 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1795 <        final FailingFunction r = new FailingFunction(m);
1796 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1797 <
1798 <        f.complete(v1);
1799 <        checkCompletedWithWrappedCFException(h);
1800 <        g.complete(v2);
1801 <        checkCompletedNormally(f, v1);
1802 <        checkCompletedNormally(g, v2);
1803 <    }}
1804 <
1805 <    public void testApplyToEither_actionFailed2() {
1806 <        for (ExecutionMode m : ExecutionMode.values())
1807 <        for (Integer v1 : new Integer[] { 1, null })
1808 <        for (Integer v2 : new Integer[] { 2, null })
1809 <    {
1810 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1811 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1812 <        final FailingFunction r = new FailingFunction(m);
1813 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1814 <
1815 <        g.complete(v2);
1816 <        checkCompletedWithWrappedCFException(h);
1817 <        f.complete(v1);
1818 <        checkCompletedNormally(f, v1);
1819 <        checkCompletedNormally(g, v2);
1782 >        checkCompletedWithWrappedCFException(f, ex);
1783 >        checkCompletedNormally(g, v1);
1784 >        checkCompletedWithWrappedCFException(h0, ex);
1785 >        checkCompletedWithWrappedCFException(h1, ex);
1786 >        checkCompletedWithWrappedCFException(h2, ex);
1787 >        checkCompletedWithWrappedCFException(h3, ex);
1788 >        checkCompletedWithWrappedCFException(h4, ex);
1789 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1790      }}
1791  
1792      /**
1793       * applyToEither result completes exceptionally if either source cancelled
1794       */
1795 <    public void testApplyToEither_sourceCancelled1() {
1826 <        for (ExecutionMode m : ExecutionMode.values())
1827 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1828 <        for (boolean createIncomplete : new boolean[] { true, false })
1829 <        for (boolean fFirst : new boolean[] { true, false })
1830 <        for (Integer v1 : new Integer[] { 1, null })
1831 <    {
1832 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1833 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1834 <        final IncFunction r = new IncFunction(m);
1835 <
1836 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1837 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1838 <        if (createIncomplete) {
1839 <            checkIncomplete(h);
1840 <            assertEquals(0, r.invocationCount);
1841 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1842 <        }
1843 <
1844 <        checkCompletedWithWrappedCancellationException(h);
1845 <        (!fFirst ? f : g).complete(v1);
1846 <
1847 <        assertEquals(0, r.invocationCount);
1848 <        checkCompletedNormally(!fFirst ? f : g, v1);
1849 <        checkCancelled(fFirst ? f : g);
1850 <        checkCompletedWithWrappedCancellationException(h);
1851 <    }}
1852 <
1853 <    public void testApplyToEither_sourceCancelled2() {
1795 >    public void testApplyToEither_sourceCancelled() {
1796          for (ExecutionMode m : ExecutionMode.values())
1797          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1856        for (boolean reverseArgs : new boolean[] { true, false })
1857        for (boolean fFirst : new boolean[] { true, false })
1798          for (Integer v1 : new Integer[] { 1, null })
1799      {
1800          final CompletableFuture<Integer> f = new CompletableFuture<>();
1801          final CompletableFuture<Integer> g = new CompletableFuture<>();
1802 <        final IncFunction r1 = new IncFunction(m);
1803 <        final IncFunction r2 = new IncFunction(m);
1864 <        final CFException ex = new CFException();
1865 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1866 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1802 >        final IncFunction[] rs = new IncFunction[6];
1803 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1804  
1805 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1806 <        if (fFirst) {
1807 <            f.complete(v1);
1808 <            assertTrue(g.cancel(mayInterruptIfRunning));
1809 <        } else {
1810 <            assertTrue(g.cancel(mayInterruptIfRunning));
1811 <            f.complete(v1);
1812 <        }
1813 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1805 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1806 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1807 >        checkIncomplete(h0);
1808 >        checkIncomplete(h1);
1809 >        rs[0].assertNotInvoked();
1810 >        rs[1].assertNotInvoked();
1811 >        f.cancel(mayInterruptIfRunning);
1812 >        checkCompletedWithWrappedCancellationException(h0);
1813 >        checkCompletedWithWrappedCancellationException(h1);
1814 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1815 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1816 >        checkCompletedWithWrappedCancellationException(h2);
1817 >        checkCompletedWithWrappedCancellationException(h3);
1818 >        g.complete(v1);
1819  
1820 <        // unspecified behavior
1820 >        // unspecified behavior - both source completions available
1821 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1822 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1823          try {
1824 <            assertEquals(inc(v1), h1.join());
1825 <            assertEquals(1, r1.invocationCount);
1824 >            assertEquals(inc(v1), h4.join());
1825 >            rs[4].assertInvoked();
1826          } catch (CompletionException ok) {
1827 <            checkCompletedWithWrappedCancellationException(h1);
1828 <            assertEquals(0, r1.invocationCount);
1827 >            checkCompletedWithWrappedCancellationException(h4);
1828 >            rs[4].assertNotInvoked();
1829          }
1886
1830          try {
1831 <            assertEquals(inc(v1), h2.join());
1832 <            assertEquals(1, r2.invocationCount);
1831 >            assertEquals(inc(v1), h5.join());
1832 >            rs[5].assertInvoked();
1833          } catch (CompletionException ok) {
1834 <            checkCompletedWithWrappedCancellationException(h2);
1835 <            assertEquals(0, r2.invocationCount);
1834 >            checkCompletedWithWrappedCancellationException(h5);
1835 >            rs[5].assertNotInvoked();
1836          }
1837  
1838 <        checkCancelled(g);
1839 <        checkCompletedNormally(f, v1);
1838 >        checkCancelled(f);
1839 >        checkCompletedNormally(g, v1);
1840 >        checkCompletedWithWrappedCancellationException(h0);
1841 >        checkCompletedWithWrappedCancellationException(h1);
1842 >        checkCompletedWithWrappedCancellationException(h2);
1843 >        checkCompletedWithWrappedCancellationException(h3);
1844 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1845      }}
1846  
1847      /**
1848 <     * acceptEither result completes normally after normal completion
1901 <     * of either source
1848 >     * applyToEither result completes exceptionally if action does
1849       */
1850 <    public void testAcceptEither_normalCompletion1() {
1850 >    public void testApplyToEither_actionFailed() {
1851          for (ExecutionMode m : ExecutionMode.values())
1852          for (Integer v1 : new Integer[] { 1, null })
1853          for (Integer v2 : new Integer[] { 2, null })
1854      {
1855          final CompletableFuture<Integer> f = new CompletableFuture<>();
1856          final CompletableFuture<Integer> g = new CompletableFuture<>();
1857 <        final IncAction r = new IncAction();
1858 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1857 >        final FailingFunction[] rs = new FailingFunction[6];
1858 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1859  
1860 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1861 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1862          f.complete(v1);
1863 <        checkCompletedNormally(h, null);
1864 <        assertEquals(inc(v1), r.value);
1865 <        g.complete(v2);
1866 <
1867 <        checkCompletedNormally(f, v1);
1868 <        checkCompletedNormally(g, v2);
1869 <        checkCompletedNormally(h, null);
1921 <    }}
1922 <
1923 <    public void testAcceptEither_normalCompletion2() {
1924 <        for (ExecutionMode m : ExecutionMode.values())
1925 <        for (Integer v1 : new Integer[] { 1, null })
1926 <        for (Integer v2 : new Integer[] { 2, null })
1927 <    {
1928 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1929 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1930 <        final IncAction r = new IncAction();
1931 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1863 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1864 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1865 >        checkCompletedWithWrappedCFException(h0);
1866 >        checkCompletedWithWrappedCFException(h1);
1867 >        checkCompletedWithWrappedCFException(h2);
1868 >        checkCompletedWithWrappedCFException(h3);
1869 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1870  
1871          g.complete(v2);
1872 <        checkCompletedNormally(h, null);
1873 <        assertEquals(inc(v2), r.value);
1874 <        f.complete(v1);
1872 >
1873 >        // unspecified behavior - both source completions available
1874 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1875 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1876 >
1877 >        checkCompletedWithWrappedCFException(h4);
1878 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1879 >                   Objects.equals(v2, rs[4].value));
1880 >        checkCompletedWithWrappedCFException(h5);
1881 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1882 >                   Objects.equals(v2, rs[5].value));
1883  
1884          checkCompletedNormally(f, v1);
1885          checkCompletedNormally(g, v2);
1940        checkCompletedNormally(h, null);
1886      }}
1887  
1888 <    public void testAcceptEither_normalCompletion3() {
1888 >    /**
1889 >     * acceptEither result completes normally after normal completion
1890 >     * of either source
1891 >     */
1892 >    public void testAcceptEither_normalCompletion() {
1893          for (ExecutionMode m : ExecutionMode.values())
1894          for (Integer v1 : new Integer[] { 1, null })
1895          for (Integer v2 : new Integer[] { 2, null })
1896      {
1897          final CompletableFuture<Integer> f = new CompletableFuture<>();
1898          final CompletableFuture<Integer> g = new CompletableFuture<>();
1899 <        final IncAction r = new IncAction();
1899 >        final IncAction[] rs = new IncAction[6];
1900 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1901  
1902 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1903 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1904 +        checkIncomplete(h0);
1905 +        checkIncomplete(h1);
1906 +        rs[0].assertNotInvoked();
1907 +        rs[1].assertNotInvoked();
1908          f.complete(v1);
1909 +        checkCompletedNormally(h0, null);
1910 +        checkCompletedNormally(h1, null);
1911 +        rs[0].assertValue(inc(v1));
1912 +        rs[1].assertValue(inc(v1));
1913 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1914 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1915 +        checkCompletedNormally(h2, null);
1916 +        checkCompletedNormally(h3, null);
1917 +        rs[2].assertValue(inc(v1));
1918 +        rs[3].assertValue(inc(v1));
1919          g.complete(v2);
1954        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1920  
1921 <        checkCompletedNormally(h, null);
1921 >        // unspecified behavior - both source completions available
1922 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1923 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1924 >        checkCompletedNormally(h4, null);
1925 >        checkCompletedNormally(h5, null);
1926 >        assertTrue(Objects.equals(inc(v1), rs[4].value) ||
1927 >                   Objects.equals(inc(v2), rs[4].value));
1928 >        assertTrue(Objects.equals(inc(v1), rs[5].value) ||
1929 >                   Objects.equals(inc(v2), rs[5].value));
1930 >
1931          checkCompletedNormally(f, v1);
1932          checkCompletedNormally(g, v2);
1933 <
1934 <        // unspecified behavior
1935 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
1936 <                   Objects.equals(r.value, inc(v2)));
1933 >        checkCompletedNormally(h0, null);
1934 >        checkCompletedNormally(h1, null);
1935 >        checkCompletedNormally(h2, null);
1936 >        checkCompletedNormally(h3, null);
1937 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1938      }}
1939  
1940      /**
1941       * acceptEither result completes exceptionally after exceptional
1942       * completion of either source
1943       */
1944 <    public void testAcceptEither_exceptionalCompletion1() {
1944 >    public void testAcceptEither_exceptionalCompletion() {
1945          for (ExecutionMode m : ExecutionMode.values())
1946          for (Integer v1 : new Integer[] { 1, null })
1947      {
1948          final CompletableFuture<Integer> f = new CompletableFuture<>();
1949          final CompletableFuture<Integer> g = new CompletableFuture<>();
1975        final IncAction r = new IncAction();
1976        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1950          final CFException ex = new CFException();
1951 +        final IncAction[] rs = new IncAction[6];
1952 +        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
1953  
1954 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
1955 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
1956 +        checkIncomplete(h0);
1957 +        checkIncomplete(h1);
1958 +        rs[0].assertNotInvoked();
1959 +        rs[1].assertNotInvoked();
1960          f.completeExceptionally(ex);
1961 <        checkCompletedWithWrappedCFException(h, ex);
1962 <        g.complete(v1);
1961 >        checkCompletedWithWrappedCFException(h0, ex);
1962 >        checkCompletedWithWrappedCFException(h1, ex);
1963 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
1964 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
1965 >        checkCompletedWithWrappedCFException(h2, ex);
1966 >        checkCompletedWithWrappedCFException(h3, ex);
1967  
1968 <        assertEquals(0, r.invocationCount);
1984 <        checkCompletedNormally(g, v1);
1985 <        checkCompletedWithWrappedCFException(f, ex);
1986 <        checkCompletedWithWrappedCFException(h, ex);
1987 <    }}
1988 <
1989 <    public void testAcceptEither_exceptionalCompletion2() {
1990 <        for (ExecutionMode m : ExecutionMode.values())
1991 <        for (Integer v1 : new Integer[] { 1, null })
1992 <    {
1993 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1994 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1995 <        final IncAction r = new IncAction();
1996 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1997 <        final CFException ex = new CFException();
1998 <
1999 <        g.completeExceptionally(ex);
2000 <        checkCompletedWithWrappedCFException(h, ex);
2001 <        f.complete(v1);
2002 <
2003 <        assertEquals(0, r.invocationCount);
2004 <        checkCompletedNormally(f, v1);
2005 <        checkCompletedWithWrappedCFException(g, ex);
2006 <        checkCompletedWithWrappedCFException(h, ex);
2007 <    }}
2008 <
2009 <    public void testAcceptEither_exceptionalCompletion3() {
2010 <        for (ExecutionMode m : ExecutionMode.values())
2011 <        for (Integer v1 : new Integer[] { 1, null })
2012 <    {
2013 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2014 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2015 <        final IncAction r = new IncAction();
2016 <        final CFException ex = new CFException();
2017 <
2018 <        g.completeExceptionally(ex);
2019 <        f.complete(v1);
2020 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1968 >        g.complete(v1);
1969  
1970 <        // unspecified behavior
1971 <        Integer v;
1970 >        // unspecified behavior - both source completions available
1971 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
1972 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
1973          try {
1974 <            assertNull(h.join());
1975 <            assertEquals(1, r.invocationCount);
2027 <            assertEquals(inc(v1), r.value);
1974 >            assertNull(h4.join());
1975 >            rs[4].assertValue(inc(v1));
1976          } catch (CompletionException ok) {
1977 <            checkCompletedWithWrappedCFException(h, ex);
1978 <            assertEquals(0, r.invocationCount);
1977 >            checkCompletedWithWrappedCFException(h4, ex);
1978 >            rs[4].assertNotInvoked();
1979          }
2032
2033        checkCompletedWithWrappedCFException(g, ex);
2034        checkCompletedNormally(f, v1);
2035    }}
2036
2037    public void testAcceptEither_exceptionalCompletion4() {
2038        for (ExecutionMode m : ExecutionMode.values())
2039        for (Integer v1 : new Integer[] { 1, null })
2040    {
2041        final CompletableFuture<Integer> f = new CompletableFuture<>();
2042        final CompletableFuture<Integer> g = new CompletableFuture<>();
2043        final IncAction r = new IncAction();
2044        final CFException ex = new CFException();
2045
2046        f.completeExceptionally(ex);
2047        g.complete(v1);
2048        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2049
2050        // unspecified behavior
2051        Integer v;
1980          try {
1981 <            assertNull(h.join());
1982 <            assertEquals(1, r.invocationCount);
2055 <            assertEquals(inc(v1), r.value);
1981 >            assertNull(h5.join());
1982 >            rs[5].assertValue(inc(v1));
1983          } catch (CompletionException ok) {
1984 <            checkCompletedWithWrappedCFException(h, ex);
1985 <            assertEquals(0, r.invocationCount);
1984 >            checkCompletedWithWrappedCFException(h5, ex);
1985 >            rs[5].assertNotInvoked();
1986          }
1987  
1988          checkCompletedWithWrappedCFException(f, ex);
1989          checkCompletedNormally(g, v1);
1990 <    }}
1991 <
1992 <    /**
1993 <     * acceptEither result completes exceptionally if action does
1994 <     */
1995 <    public void testAcceptEither_actionFailed1() {
2069 <        for (ExecutionMode m : ExecutionMode.values())
2070 <        for (Integer v1 : new Integer[] { 1, null })
2071 <        for (Integer v2 : new Integer[] { 2, null })
2072 <    {
2073 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2074 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2075 <        final FailingConsumer r = new FailingConsumer(m);
2076 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2077 <
2078 <        f.complete(v1);
2079 <        checkCompletedWithWrappedCFException(h);
2080 <        g.complete(v2);
2081 <        checkCompletedNormally(f, v1);
2082 <        checkCompletedNormally(g, v2);
2083 <    }}
2084 <
2085 <    public void testAcceptEither_actionFailed2() {
2086 <        for (ExecutionMode m : ExecutionMode.values())
2087 <        for (Integer v1 : new Integer[] { 1, null })
2088 <        for (Integer v2 : new Integer[] { 2, null })
2089 <    {
2090 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2091 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2092 <        final FailingConsumer r = new FailingConsumer(m);
2093 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2094 <
2095 <        g.complete(v2);
2096 <        checkCompletedWithWrappedCFException(h);
2097 <        f.complete(v1);
2098 <        checkCompletedNormally(f, v1);
2099 <        checkCompletedNormally(g, v2);
1990 >        checkCompletedWithWrappedCFException(h0, ex);
1991 >        checkCompletedWithWrappedCFException(h1, ex);
1992 >        checkCompletedWithWrappedCFException(h2, ex);
1993 >        checkCompletedWithWrappedCFException(h3, ex);
1994 >        checkCompletedWithWrappedCFException(h4, ex);
1995 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1996      }}
1997  
1998      /**
1999       * acceptEither result completes exceptionally if either source cancelled
2000       */
2001 <    public void testAcceptEither_sourceCancelled1() {
2001 >    public void testAcceptEither_sourceCancelled() {
2002          for (ExecutionMode m : ExecutionMode.values())
2003          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2004          for (Integer v1 : new Integer[] { 1, null })
2005      {
2006          final CompletableFuture<Integer> f = new CompletableFuture<>();
2007          final CompletableFuture<Integer> g = new CompletableFuture<>();
2008 <        final IncAction r = new IncAction();
2009 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2008 >        final IncAction[] rs = new IncAction[6];
2009 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncAction(m);
2010 >
2011 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2012 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2013 >        checkIncomplete(h0);
2014 >        checkIncomplete(h1);
2015 >        rs[0].assertNotInvoked();
2016 >        rs[1].assertNotInvoked();
2017 >        f.cancel(mayInterruptIfRunning);
2018 >        checkCompletedWithWrappedCancellationException(h0);
2019 >        checkCompletedWithWrappedCancellationException(h1);
2020 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2021 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2022 >        checkCompletedWithWrappedCancellationException(h2);
2023 >        checkCompletedWithWrappedCancellationException(h3);
2024  
2115        assertTrue(f.cancel(mayInterruptIfRunning));
2116        checkCompletedWithWrappedCancellationException(h);
2025          g.complete(v1);
2026  
2027 +        // unspecified behavior - both source completions available
2028 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2029 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2030 +        try {
2031 +            assertNull(h4.join());
2032 +            rs[4].assertValue(inc(v1));
2033 +        } catch (CompletionException ok) {
2034 +            checkCompletedWithWrappedCancellationException(h4);
2035 +            rs[4].assertNotInvoked();
2036 +        }
2037 +        try {
2038 +            assertNull(h5.join());
2039 +            rs[5].assertValue(inc(v1));
2040 +        } catch (CompletionException ok) {
2041 +            checkCompletedWithWrappedCancellationException(h5);
2042 +            rs[5].assertNotInvoked();
2043 +        }
2044 +
2045          checkCancelled(f);
2120        assertEquals(0, r.invocationCount);
2046          checkCompletedNormally(g, v1);
2047 <        checkCompletedWithWrappedCancellationException(h);
2047 >        checkCompletedWithWrappedCancellationException(h0);
2048 >        checkCompletedWithWrappedCancellationException(h1);
2049 >        checkCompletedWithWrappedCancellationException(h2);
2050 >        checkCompletedWithWrappedCancellationException(h3);
2051 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2052      }}
2053  
2054 <    public void testAcceptEither_sourceCancelled2() {
2054 >    /**
2055 >     * acceptEither result completes exceptionally if action does
2056 >     */
2057 >    public void testAcceptEither_actionFailed() {
2058          for (ExecutionMode m : ExecutionMode.values())
2127        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2059          for (Integer v1 : new Integer[] { 1, null })
2060 +        for (Integer v2 : new Integer[] { 2, null })
2061      {
2062          final CompletableFuture<Integer> f = new CompletableFuture<>();
2063          final CompletableFuture<Integer> g = new CompletableFuture<>();
2064 <        final IncAction r = new IncAction();
2065 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2064 >        final FailingConsumer[] rs = new FailingConsumer[6];
2065 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2066  
2067 <        assertTrue(g.cancel(mayInterruptIfRunning));
2068 <        checkCompletedWithWrappedCancellationException(h);
2067 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069          f.complete(v1);
2070 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2071 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2072 +        checkCompletedWithWrappedCFException(h0);
2073 +        checkCompletedWithWrappedCFException(h1);
2074 +        checkCompletedWithWrappedCFException(h2);
2075 +        checkCompletedWithWrappedCFException(h3);
2076 +        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2077  
2078 <        checkCancelled(g);
2140 <        assertEquals(0, r.invocationCount);
2141 <        checkCompletedNormally(f, v1);
2142 <        checkCompletedWithWrappedCancellationException(h);
2143 <    }}
2144 <
2145 <    public void testAcceptEither_sourceCancelled3() {
2146 <        for (ExecutionMode m : ExecutionMode.values())
2147 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2148 <        for (Integer v1 : new Integer[] { 1, null })
2149 <    {
2150 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2151 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2152 <        final IncAction r = new IncAction();
2153 <
2154 <        assertTrue(g.cancel(mayInterruptIfRunning));
2155 <        f.complete(v1);
2156 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2078 >        g.complete(v2);
2079  
2080 <        // unspecified behavior
2081 <        Integer v;
2082 <        try {
2083 <            assertNull(h.join());
2084 <            assertEquals(1, r.invocationCount);
2085 <            assertEquals(inc(v1), r.value);
2086 <        } catch (CompletionException ok) {
2087 <            checkCompletedWithWrappedCancellationException(h);
2088 <            assertEquals(0, r.invocationCount);
2089 <        }
2080 >        // unspecified behavior - both source completions available
2081 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2082 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2083 >
2084 >        checkCompletedWithWrappedCFException(h4);
2085 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2086 >                   Objects.equals(v2, rs[4].value));
2087 >        checkCompletedWithWrappedCFException(h5);
2088 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2089 >                   Objects.equals(v2, rs[5].value));
2090  
2169        checkCancelled(g);
2091          checkCompletedNormally(f, v1);
2092 <    }}
2172 <
2173 <    public void testAcceptEither_sourceCancelled4() {
2174 <        for (ExecutionMode m : ExecutionMode.values())
2175 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2176 <        for (Integer v1 : new Integer[] { 1, null })
2177 <    {
2178 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2179 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2180 <        final IncAction r = new IncAction();
2181 <
2182 <        assertTrue(f.cancel(mayInterruptIfRunning));
2183 <        g.complete(v1);
2184 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2185 <
2186 <        // unspecified behavior
2187 <        Integer v;
2188 <        try {
2189 <            assertNull(h.join());
2190 <            assertEquals(1, r.invocationCount);
2191 <            assertEquals(inc(v1), r.value);
2192 <        } catch (CompletionException ok) {
2193 <            checkCompletedWithWrappedCancellationException(h);
2194 <            assertEquals(0, r.invocationCount);
2195 <        }
2196 <
2197 <        checkCancelled(f);
2198 <        checkCompletedNormally(g, v1);
2092 >        checkCompletedNormally(g, v2);
2093      }}
2094  
2095      /**
# Line 2214 | Line 2108 | public class CompletableFutureTest exten
2108  
2109          f.complete(v1);
2110          checkCompletedNormally(h, null);
2111 <        assertEquals(1, r.invocationCount);
2111 >        r.assertInvoked();
2112          g.complete(v2);
2113  
2114          checkCompletedNormally(f, v1);
2115          checkCompletedNormally(g, v2);
2116          checkCompletedNormally(h, null);
2117 <        assertEquals(1, r.invocationCount);
2117 >        r.assertInvoked();
2118      }}
2119  
2120      public void testRunAfterEither_normalCompletion2() {
# Line 2235 | Line 2129 | public class CompletableFutureTest exten
2129  
2130          g.complete(v2);
2131          checkCompletedNormally(h, null);
2132 <        assertEquals(1, r.invocationCount);
2132 >        r.assertInvoked();
2133          f.complete(v1);
2134  
2135          checkCompletedNormally(f, v1);
2136          checkCompletedNormally(g, v2);
2137          checkCompletedNormally(h, null);
2138 <        assertEquals(1, r.invocationCount);
2138 >        r.assertInvoked();
2139          }}
2140  
2141      public void testRunAfterEither_normalCompletion3() {
# Line 2260 | Line 2154 | public class CompletableFutureTest exten
2154          checkCompletedNormally(h, null);
2155          checkCompletedNormally(f, v1);
2156          checkCompletedNormally(g, v2);
2157 <        assertEquals(1, r.invocationCount);
2157 >        r.assertInvoked();
2158      }}
2159  
2160      /**
# Line 2281 | Line 2175 | public class CompletableFutureTest exten
2175          checkCompletedWithWrappedCFException(h, ex);
2176          g.complete(v1);
2177  
2178 <        assertEquals(0, r.invocationCount);
2178 >        r.assertNotInvoked();
2179          checkCompletedNormally(g, v1);
2180          checkCompletedWithWrappedCFException(f, ex);
2181          checkCompletedWithWrappedCFException(h, ex);
# Line 2301 | Line 2195 | public class CompletableFutureTest exten
2195          checkCompletedWithWrappedCFException(h, ex);
2196          f.complete(v1);
2197  
2198 <        assertEquals(0, r.invocationCount);
2198 >        r.assertNotInvoked();
2199          checkCompletedNormally(f, v1);
2200          checkCompletedWithWrappedCFException(g, ex);
2201          checkCompletedWithWrappedCFException(h, ex);
# Line 2324 | Line 2218 | public class CompletableFutureTest exten
2218          Integer v;
2219          try {
2220              assertNull(h.join());
2221 <            assertEquals(1, r.invocationCount);
2221 >            r.assertInvoked();
2222          } catch (CompletionException ok) {
2223              checkCompletedWithWrappedCFException(h, ex);
2224 <            assertEquals(0, r.invocationCount);
2224 >            r.assertNotInvoked();
2225          }
2226  
2227          checkCompletedWithWrappedCFException(g, ex);
# Line 2351 | Line 2245 | public class CompletableFutureTest exten
2245          Integer v;
2246          try {
2247              assertNull(h.join());
2248 <            assertEquals(1, r.invocationCount);
2248 >            r.assertInvoked();
2249          } catch (CompletionException ok) {
2250              checkCompletedWithWrappedCFException(h, ex);
2251 <            assertEquals(0, r.invocationCount);
2251 >            r.assertNotInvoked();
2252          }
2253  
2254          checkCompletedWithWrappedCFException(f, ex);
# Line 2416 | Line 2310 | public class CompletableFutureTest exten
2310          g.complete(v1);
2311  
2312          checkCancelled(f);
2313 <        assertEquals(0, r.invocationCount);
2313 >        r.assertNotInvoked();
2314          checkCompletedNormally(g, v1);
2315          checkCompletedWithWrappedCancellationException(h);
2316      }}
# Line 2436 | Line 2330 | public class CompletableFutureTest exten
2330          f.complete(v1);
2331  
2332          checkCancelled(g);
2333 <        assertEquals(0, r.invocationCount);
2333 >        r.assertNotInvoked();
2334          checkCompletedNormally(f, v1);
2335          checkCompletedWithWrappedCancellationException(h);
2336      }}
# Line 2458 | Line 2352 | public class CompletableFutureTest exten
2352          Integer v;
2353          try {
2354              assertNull(h.join());
2355 <            assertEquals(1, r.invocationCount);
2355 >            r.assertInvoked();
2356          } catch (CompletionException ok) {
2357              checkCompletedWithWrappedCancellationException(h);
2358 <            assertEquals(0, r.invocationCount);
2358 >            r.assertNotInvoked();
2359          }
2360  
2361          checkCancelled(g);
# Line 2485 | Line 2379 | public class CompletableFutureTest exten
2379          Integer v;
2380          try {
2381              assertNull(h.join());
2382 <            assertEquals(1, r.invocationCount);
2382 >            r.assertInvoked();
2383          } catch (CompletionException ok) {
2384              checkCompletedWithWrappedCancellationException(h);
2385 <            assertEquals(0, r.invocationCount);
2385 >            r.assertNotInvoked();
2386          }
2387  
2388          checkCancelled(f);
# Line 2511 | Line 2405 | public class CompletableFutureTest exten
2405  
2406          checkCompletedNormally(g, inc(v1));
2407          checkCompletedNormally(f, v1);
2408 <        assertEquals(1, r.invocationCount);
2408 >        r.assertInvoked();
2409      }}
2410  
2411      /**
# Line 2531 | Line 2425 | public class CompletableFutureTest exten
2425  
2426          checkCompletedWithWrappedCFException(g, ex);
2427          checkCompletedWithWrappedCFException(f, ex);
2428 <        assertEquals(0, r.invocationCount);
2428 >        r.assertNotInvoked();
2429      }}
2430  
2431      /**
# Line 2591 | Line 2485 | public class CompletableFutureTest exten
2485       */
2486      public void testAllOf_normal() throws Exception {
2487          for (int k = 1; k < 20; ++k) {
2488 <            CompletableFuture<Integer>[] fs = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2488 >            CompletableFuture<Integer>[] fs
2489 >                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2490              for (int i = 0; i < k; ++i)
2491                  fs[i] = new CompletableFuture<>();
2492              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 2605 | Line 2500 | public class CompletableFutureTest exten
2500          }
2501      }
2502  
2503 +    public void testAllOf_backwards() throws Exception {
2504 +        for (int k = 1; k < 20; ++k) {
2505 +            CompletableFuture<Integer>[] fs
2506 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2507 +            for (int i = 0; i < k; ++i)
2508 +                fs[i] = new CompletableFuture<>();
2509 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2510 +            for (int i = k - 1; i >= 0; i--) {
2511 +                checkIncomplete(f);
2512 +                checkIncomplete(CompletableFuture.allOf(fs));
2513 +                fs[i].complete(one);
2514 +            }
2515 +            checkCompletedNormally(f, null);
2516 +            checkCompletedNormally(CompletableFuture.allOf(fs), null);
2517 +        }
2518 +    }
2519 +
2520      /**
2521       * anyOf(no component futures) returns an incomplete future
2522       */
# Line 2663 | Line 2575 | public class CompletableFutureTest exten
2575          Runnable[] throwingActions = {
2576              () -> CompletableFuture.supplyAsync(null),
2577              () -> CompletableFuture.supplyAsync(null, exec),
2578 <            () -> CompletableFuture.supplyAsync(supplyOne, null),
2578 >            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null),
2579  
2580              () -> CompletableFuture.runAsync(null),
2581              () -> CompletableFuture.runAsync(null, exec),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines