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.61 by jsr166, Wed Jun 4 04:34:49 2014 UTC vs.
Revision 1.70 by jsr166, Fri Jun 6 19:48:38 2014 UTC

# Line 320 | Line 320 | public class CompletableFutureTest exten
320          checkCompletedNormally(f, "test");
321      }
322  
323 <    static final class IntegerSupplier implements Supplier<Integer> {
324 <        final ExecutionMode m;
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 +    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 <            this.m = m;
349 >            super(m);
350              this.value = value;
351          }
352          public Integer get() {
353 <            m.checkExecutionMode();
333 <            invocationCount++;
353 >            invoked();
354              return value;
355          }
356      }
# Line 340 | Line 360 | public class CompletableFutureTest exten
360          return (x == null) ? null : x + 1;
361      }
362  
363 <    static final class IncAction implements Consumer<Integer> {
364 <        int invocationCount = 0;
365 <        Integer value;
363 >    class NoopConsumer extends CheckedIntegerAction
364 >        implements Consumer<Integer>
365 >    {
366 >        NoopConsumer(ExecutionMode m) { super(m); }
367          public void accept(Integer x) {
368 <            invocationCount++;
369 <            value = inc(x);
368 >            invoked();
369 >            value = 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      }
# Line 368 | Line 388 | public class CompletableFutureTest exten
388              - ((y == null) ? 99 : y.intValue());
389      }
390  
391 <    static final class SubtractAction implements BiConsumer<Integer, Integer> {
392 <        final ExecutionMode m;
393 <        int invocationCount = 0;
394 <        Integer value;
375 <        // Check this action was invoked exactly once when result is computed.
376 <        SubtractAction(ExecutionMode m) { this.m = m; }
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();
379 <            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.
388 <        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();
391 <            invocationCount++;
406 >            invoked();
407              return value = subtract(x, y);
408          }
409      }
410  
411 <    static final class Noop implements Runnable {
412 <        final ExecutionMode m;
398 <        int invocationCount = 0;
399 <        Noop(ExecutionMode m) { this.m = m; }
411 >    class Noop extends CheckedAction implements Runnable {
412 >        Noop(ExecutionMode m) { super(m); }
413          public void run() {
414 <            m.checkExecutionMode();
402 <            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();
412 <            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;
459 <        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();
462 <            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;
485 <        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 997 | 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 1013 | 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      /**
# Line 1031 | Line 1043 | public class CompletableFutureTest exten
1043          final CompletableFuture<Integer> f = m.supplyAsync(r);
1044          assertSame(v1, f.join());
1045          checkCompletedNormally(f, v1);
1046 <        assertEquals(1, r.invocationCount);
1046 >        r.assertInvoked();
1047      }}
1048  
1049      /**
# Line 1047 | Line 1059 | public class CompletableFutureTest exten
1059          FailingSupplier r = new FailingSupplier(m);
1060          CompletableFuture<Integer> f = m.supplyAsync(r);
1061          checkCompletedWithWrappedCFException(f);
1062 <        assertEquals(1, r.invocationCount);
1062 >        r.assertInvoked();
1063      }}
1064  
1065      // seq completion methods
# Line 1071 | 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 1094 | 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 1116 | 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 1159 | Line 1171 | public class CompletableFutureTest exten
1171  
1172          checkCompletedNormally(g, inc(v1));
1173          checkCompletedNormally(f, v1);
1174 <        assertEquals(1, r.invocationCount);
1174 >        r.assertValue(inc(v1));
1175      }}
1176  
1177      /**
# Line 1182 | 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 1204 | 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 1237 | 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 NoopConsumer r = new NoopConsumer(m);
1253          if (!createIncomplete) f.complete(v1);
1254          final CompletableFuture<Void> g = m.thenAccept(f, r);
1255          if (createIncomplete) {
# Line 1246 | Line 1258 | public class CompletableFutureTest exten
1258          }
1259  
1260          checkCompletedNormally(g, null);
1261 +        r.assertValue(v1);
1262          checkCompletedNormally(f, v1);
1250        assertEquals(1, r.invocationCount);
1251        assertEquals(inc(v1), r.value);
1263      }}
1264  
1265      /**
# Line 1261 | Line 1272 | public class CompletableFutureTest exten
1272      {
1273          final CFException ex = new CFException();
1274          final CompletableFuture<Integer> f = new CompletableFuture<>();
1275 <        final IncAction r = new IncAction();
1275 >        final NoopConsumer r = new NoopConsumer(m);
1276          if (!createIncomplete) f.completeExceptionally(ex);
1277          final CompletableFuture<Void> g = m.thenAccept(f, r);
1278          if (createIncomplete) {
# Line 1271 | Line 1282 | public class CompletableFutureTest exten
1282  
1283          checkCompletedWithWrappedCFException(g, ex);
1284          checkCompletedWithWrappedCFException(f, ex);
1285 <        assertEquals(0, r.invocationCount);
1285 >        r.assertNotInvoked();
1286      }}
1287  
1288      /**
# Line 1283 | Line 1294 | public class CompletableFutureTest exten
1294          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1295      {
1296          final CompletableFuture<Integer> f = new CompletableFuture<>();
1297 <        final IncAction r = new IncAction();
1297 >        final NoopConsumer r = new NoopConsumer(m);
1298          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1299          final CompletableFuture<Void> g = m.thenAccept(f, r);
1300          if (createIncomplete) {
# Line 1293 | Line 1304 | public class CompletableFutureTest exten
1304  
1305          checkCompletedWithWrappedCancellationException(g);
1306          checkCancelled(f);
1307 <        assertEquals(0, r.invocationCount);
1307 >        r.assertNotInvoked();
1308      }}
1309  
1310      /**
# Line 1338 | Line 1349 | public class CompletableFutureTest exten
1349          final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
1350          if (createIncomplete) {
1351              checkIncomplete(h);
1352 <            assertEquals(0, r.invocationCount);
1352 >            r.assertNotInvoked();
1353              if (!fFirst) f.complete(v1); else g.complete(v2);
1354          }
1355  
1356          checkCompletedNormally(h, subtract(v1, v2));
1357          checkCompletedNormally(f, v1);
1358          checkCompletedNormally(g, v2);
1359 <        assertEquals(1, r.invocationCount);
1359 >        r.assertValue(subtract(v1, v2));
1360      }}
1361  
1362      /**
# Line 1373 | Line 1384 | public class CompletableFutureTest exten
1384          }
1385  
1386          checkCompletedWithWrappedCFException(h, ex);
1387 <        assertEquals(0, r.invocationCount);
1387 >        r.assertNotInvoked();
1388          checkCompletedNormally(fFirst ? f : g, v1);
1389          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1390      }}
# Line 1403 | Line 1414 | public class CompletableFutureTest exten
1414  
1415          checkCompletedWithWrappedCancellationException(h);
1416          checkCancelled(!fFirst ? f : g);
1417 <        assertEquals(0, r.invocationCount);
1417 >        r.assertNotInvoked();
1418          checkCompletedNormally(fFirst ? f : g, v1);
1419      }}
1420  
# Line 1455 | Line 1466 | public class CompletableFutureTest exten
1466          final CompletableFuture<Void> h = m.thenAcceptBoth(f, g, r);
1467          if (createIncomplete) {
1468              checkIncomplete(h);
1469 <            assertEquals(0, r.invocationCount);
1469 >            r.assertNotInvoked();
1470              if (!fFirst) f.complete(v1); else g.complete(v2);
1471          }
1472  
1473          checkCompletedNormally(h, null);
1474 <        assertEquals(subtract(v1, v2), r.value);
1474 >        r.assertValue(subtract(v1, v2));
1475          checkCompletedNormally(f, v1);
1476          checkCompletedNormally(g, v2);
1477      }}
# Line 1490 | Line 1501 | public class CompletableFutureTest exten
1501          }
1502  
1503          checkCompletedWithWrappedCFException(h, ex);
1504 <        assertEquals(0, r.invocationCount);
1504 >        r.assertNotInvoked();
1505          checkCompletedNormally(fFirst ? f : g, v1);
1506          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1507      }}
# Line 1520 | Line 1531 | public class CompletableFutureTest exten
1531  
1532          checkCompletedWithWrappedCancellationException(h);
1533          checkCancelled(!fFirst ? f : g);
1534 <        assertEquals(0, r.invocationCount);
1534 >        r.assertNotInvoked();
1535          checkCompletedNormally(fFirst ? f : g, v1);
1536      }}
1537  
# Line 1572 | Line 1583 | public class CompletableFutureTest exten
1583          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1584          if (createIncomplete) {
1585              checkIncomplete(h);
1586 <            assertEquals(0, r.invocationCount);
1586 >            r.assertNotInvoked();
1587              if (!fFirst) f.complete(v1); else g.complete(v2);
1588          }
1589  
1590          checkCompletedNormally(h, null);
1591 <        assertEquals(1, r.invocationCount);
1591 >        r.assertInvoked();
1592          checkCompletedNormally(f, v1);
1593          checkCompletedNormally(g, v2);
1594      }}
# Line 1607 | Line 1618 | public class CompletableFutureTest exten
1618          }
1619  
1620          checkCompletedWithWrappedCFException(h, ex);
1621 <        assertEquals(0, r.invocationCount);
1621 >        r.assertNotInvoked();
1622          checkCompletedNormally(fFirst ? f : g, v1);
1623          checkCompletedWithWrappedCFException(!fFirst ? f : g, ex);
1624      }}
# Line 1638 | Line 1649 | public class CompletableFutureTest exten
1649  
1650          checkCompletedWithWrappedCancellationException(h);
1651          checkCancelled(!fFirst ? f : g);
1652 <        assertEquals(0, r.invocationCount);
1652 >        r.assertNotInvoked();
1653          checkCompletedNormally(fFirst ? f : g, v1);
1654      }}
1655  
# Line 1653 | Line 1664 | public class CompletableFutureTest exten
1664      {
1665          final CompletableFuture<Integer> f = new CompletableFuture<>();
1666          final CompletableFuture<Integer> g = new CompletableFuture<>();
1667 <        final FailingRunnable r = new FailingRunnable(m);
1667 >        final FailingRunnable r1 = new FailingRunnable(m);
1668 >        final FailingRunnable r2 = new FailingRunnable(m);
1669  
1670 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r);
1670 >        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1671          if (fFirst) {
1672              f.complete(v1);
1673              g.complete(v2);
# Line 1663 | Line 1675 | public class CompletableFutureTest exten
1675              g.complete(v2);
1676              f.complete(v1);
1677          }
1678 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r);
1678 >        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1679  
1680          checkCompletedWithWrappedCFException(h1);
1681          checkCompletedWithWrappedCFException(h2);
# Line 1677 | Line 1689 | public class CompletableFutureTest exten
1689       */
1690      public void testApplyToEither_normalCompletion() {
1691          for (ExecutionMode m : ExecutionMode.values())
1680        for (boolean createIncomplete : new boolean[] { true, false })
1681        for (boolean fFirst : new boolean[] { true, false })
1692          for (Integer v1 : new Integer[] { 1, null })
1693          for (Integer v2 : new Integer[] { 2, null })
1694      {
1695          final CompletableFuture<Integer> f = new CompletableFuture<>();
1696          final CompletableFuture<Integer> g = new CompletableFuture<>();
1697 <        final IncFunction r = new IncFunction(m);
1698 <
1689 <        if (!createIncomplete)
1690 <            if (fFirst) f.complete(v1); else g.complete(v2);
1691 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1692 <        if (createIncomplete) {
1693 <            checkIncomplete(h);
1694 <            assertEquals(0, r.invocationCount);
1695 <            if (fFirst) f.complete(v1); else g.complete(v2);
1696 <        }
1697 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1698 <        if (!fFirst) f.complete(v1); else g.complete(v2);
1699 <
1700 <        checkCompletedNormally(f, v1);
1701 <        checkCompletedNormally(g, v2);
1702 <        checkCompletedNormally(h, inc(fFirst ? v1 : v2));
1703 <    }}
1697 >        final IncFunction[] rs = new IncFunction[6];
1698 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1699  
1700 <    public void testApplyToEither_normalCompletionBothAvailable() {
1701 <        for (ExecutionMode m : ExecutionMode.values())
1702 <        for (boolean fFirst : new boolean[] { true, false })
1703 <        for (Integer v1 : new Integer[] { 1, null })
1704 <        for (Integer v2 : new Integer[] { 2, null })
1705 <    {
1706 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1707 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1708 <        final IncFunction r = new IncFunction(m);
1709 <
1710 <        if (fFirst) {
1711 <            f.complete(v1);
1712 <            g.complete(v2);
1713 <        } else {
1719 <            g.complete(v2);
1720 <            f.complete(v1);
1721 <        }
1700 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1701 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1702 >        checkIncomplete(h0);
1703 >        checkIncomplete(h1);
1704 >        rs[0].assertNotInvoked();
1705 >        rs[1].assertNotInvoked();
1706 >        f.complete(v1);
1707 >        checkCompletedNormally(h0, inc(v1));
1708 >        checkCompletedNormally(h1, inc(v1));
1709 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1710 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1711 >        checkCompletedNormally(h2, inc(v1));
1712 >        checkCompletedNormally(h3, inc(v1));
1713 >        g.complete(v2);
1714  
1715 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1715 >        // unspecified behavior - both source completions available
1716 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1717 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1718 >        rs[4].assertValue(h4.join());
1719 >        rs[5].assertValue(h5.join());
1720 >        assertTrue(Objects.equals(inc(v1), h4.join()) ||
1721 >                   Objects.equals(inc(v2), h4.join()));
1722 >        assertTrue(Objects.equals(inc(v1), h5.join()) ||
1723 >                   Objects.equals(inc(v2), h5.join()));
1724  
1725          checkCompletedNormally(f, v1);
1726          checkCompletedNormally(g, v2);
1727 <
1728 <        // unspecified behavior
1729 <        assertTrue(Objects.equals(h.join(), inc(v1)) ||
1730 <                   Objects.equals(h.join(), inc(v2)));
1731 <        assertEquals(1, r.invocationCount);
1727 >        checkCompletedNormally(h0, inc(v1));
1728 >        checkCompletedNormally(h1, inc(v1));
1729 >        checkCompletedNormally(h2, inc(v1));
1730 >        checkCompletedNormally(h3, inc(v1));
1731 >        for (int i = 0; i < 4; i++) rs[i].assertValue(inc(v1));
1732      }}
1733  
1734      /**
1735       * applyToEither result completes exceptionally after exceptional
1736       * completion of either source
1737       */
1738 <    public void testApplyToEither_exceptionalCompletion1() {
1738 >    public void testApplyToEither_exceptionalCompletion() {
1739          for (ExecutionMode m : ExecutionMode.values())
1740        for (boolean createIncomplete : new boolean[] { true, false })
1741        for (boolean fFirst : new boolean[] { true, false })
1740          for (Integer v1 : new Integer[] { 1, null })
1741      {
1742          final CompletableFuture<Integer> f = new CompletableFuture<>();
1743          final CompletableFuture<Integer> g = new CompletableFuture<>();
1744          final CFException ex = new CFException();
1745 <        final IncFunction r = new IncFunction(m);
1745 >        final IncFunction[] rs = new IncFunction[6];
1746 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1747  
1748 <        if (!createIncomplete) (fFirst ? f : g).completeExceptionally(ex);
1749 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1750 <        if (createIncomplete) {
1751 <            checkIncomplete(h);
1752 <            assertEquals(0, r.invocationCount);
1753 <            (fFirst ? f : g).completeExceptionally(ex);
1754 <        }
1748 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1749 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1750 >        checkIncomplete(h0);
1751 >        checkIncomplete(h1);
1752 >        rs[0].assertNotInvoked();
1753 >        rs[1].assertNotInvoked();
1754 >        f.completeExceptionally(ex);
1755 >        checkCompletedWithWrappedCFException(h0, ex);
1756 >        checkCompletedWithWrappedCFException(h1, ex);
1757 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1758 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1759 >        checkCompletedWithWrappedCFException(h2, ex);
1760 >        checkCompletedWithWrappedCFException(h3, ex);
1761 >        g.complete(v1);
1762  
1763 <        checkCompletedWithWrappedCFException(h, ex);
1764 <        (!fFirst ? f : g).complete(v1);
1763 >        // unspecified behavior - both source completions available
1764 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1765 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1766 >        try {
1767 >            assertEquals(inc(v1), h4.join());
1768 >            rs[4].assertValue(inc(v1));
1769 >        } catch (CompletionException ok) {
1770 >            checkCompletedWithWrappedCFException(h4, ex);
1771 >            rs[4].assertNotInvoked();
1772 >        }
1773 >        try {
1774 >            assertEquals(inc(v1), h5.join());
1775 >            rs[5].assertValue(inc(v1));
1776 >        } catch (CompletionException ok) {
1777 >            checkCompletedWithWrappedCFException(h5, ex);
1778 >            rs[5].assertNotInvoked();
1779 >        }
1780  
1781 <        assertEquals(0, r.invocationCount);
1782 <        checkCompletedNormally(!fFirst ? f : g, v1);
1783 <        checkCompletedWithWrappedCFException(fFirst ? f : g, ex);
1784 <        checkCompletedWithWrappedCFException(h, ex);
1781 >        checkCompletedWithWrappedCFException(f, ex);
1782 >        checkCompletedNormally(g, v1);
1783 >        checkCompletedWithWrappedCFException(h0, ex);
1784 >        checkCompletedWithWrappedCFException(h1, ex);
1785 >        checkCompletedWithWrappedCFException(h2, ex);
1786 >        checkCompletedWithWrappedCFException(h3, ex);
1787 >        checkCompletedWithWrappedCFException(h4, ex);
1788 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1789      }}
1790  
1791      public void testApplyToEither_exceptionalCompletion2() {
1792          for (ExecutionMode m : ExecutionMode.values())
1768        for (boolean reverseArgs : new boolean[] { true, false })
1793          for (boolean fFirst : new boolean[] { true, false })
1794          for (Integer v1 : new Integer[] { 1, null })
1795      {
1796          final CompletableFuture<Integer> f = new CompletableFuture<>();
1797          final CompletableFuture<Integer> g = new CompletableFuture<>();
1774        final IncFunction r1 = new IncFunction(m);
1775        final IncFunction r2 = new IncFunction(m);
1798          final CFException ex = new CFException();
1799 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1800 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1801 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1799 >        final IncFunction[] rs = new IncFunction[6];
1800 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1801 >
1802 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1803 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1804          if (fFirst) {
1805              f.complete(v1);
1806              g.completeExceptionally(ex);
# Line 1784 | Line 1808 | public class CompletableFutureTest exten
1808              g.completeExceptionally(ex);
1809              f.complete(v1);
1810          }
1811 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1811 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1812 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1813  
1814 <        // unspecified behavior
1814 >        // unspecified behavior - both source completions available
1815 >        try {
1816 >            assertEquals(inc(v1), h0.join());
1817 >            rs[0].assertValue(inc(v1));
1818 >        } catch (CompletionException ok) {
1819 >            checkCompletedWithWrappedCFException(h0, ex);
1820 >            rs[0].assertNotInvoked();
1821 >        }
1822          try {
1823              assertEquals(inc(v1), h1.join());
1824 <            assertEquals(1, r1.invocationCount);
1824 >            rs[1].assertValue(inc(v1));
1825          } catch (CompletionException ok) {
1826              checkCompletedWithWrappedCFException(h1, ex);
1827 <            assertEquals(0, r1.invocationCount);
1827 >            rs[1].assertNotInvoked();
1828          }
1797
1829          try {
1830              assertEquals(inc(v1), h2.join());
1831 <            assertEquals(1, r2.invocationCount);
1831 >            rs[2].assertValue(inc(v1));
1832          } catch (CompletionException ok) {
1833              checkCompletedWithWrappedCFException(h2, ex);
1834 <            assertEquals(0, r2.invocationCount);
1834 >            rs[2].assertNotInvoked();
1835 >        }
1836 >        try {
1837 >            assertEquals(inc(v1), h3.join());
1838 >            rs[3].assertValue(inc(v1));
1839 >        } catch (CompletionException ok) {
1840 >            checkCompletedWithWrappedCFException(h3, ex);
1841 >            rs[3].assertNotInvoked();
1842          }
1843  
1806        checkCompletedWithWrappedCFException(g, ex);
1807        checkCompletedNormally(f, v1);
1808    }}
1809
1810    /**
1811     * applyToEither result completes exceptionally if action does
1812     */
1813    public void testApplyToEither_actionFailed1() {
1814        for (ExecutionMode m : ExecutionMode.values())
1815        for (Integer v1 : new Integer[] { 1, null })
1816        for (Integer v2 : new Integer[] { 2, null })
1817    {
1818        final CompletableFuture<Integer> f = new CompletableFuture<>();
1819        final CompletableFuture<Integer> g = new CompletableFuture<>();
1820        final FailingFunction r = new FailingFunction(m);
1821        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1822
1823        f.complete(v1);
1824        checkCompletedWithWrappedCFException(h);
1825        g.complete(v2);
1826        checkCompletedNormally(f, v1);
1827        checkCompletedNormally(g, v2);
1828    }}
1829
1830    public void testApplyToEither_actionFailed2() {
1831        for (ExecutionMode m : ExecutionMode.values())
1832        for (Integer v1 : new Integer[] { 1, null })
1833        for (Integer v2 : new Integer[] { 2, null })
1834    {
1835        final CompletableFuture<Integer> f = new CompletableFuture<>();
1836        final CompletableFuture<Integer> g = new CompletableFuture<>();
1837        final FailingFunction r = new FailingFunction(m);
1838        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1839
1840        g.complete(v2);
1841        checkCompletedWithWrappedCFException(h);
1842        f.complete(v1);
1844          checkCompletedNormally(f, v1);
1845 <        checkCompletedNormally(g, v2);
1845 >        checkCompletedWithWrappedCFException(g, ex);
1846      }}
1847  
1848      /**
1849       * applyToEither result completes exceptionally if either source cancelled
1850       */
1851 <    public void testApplyToEither_sourceCancelled1() {
1851 >    public void testApplyToEither_sourceCancelled() {
1852          for (ExecutionMode m : ExecutionMode.values())
1853          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1853        for (boolean createIncomplete : new boolean[] { true, false })
1854        for (boolean fFirst : new boolean[] { true, false })
1854          for (Integer v1 : new Integer[] { 1, null })
1855      {
1856          final CompletableFuture<Integer> f = new CompletableFuture<>();
1857          final CompletableFuture<Integer> g = new CompletableFuture<>();
1858 <        final IncFunction r = new IncFunction(m);
1858 >        final IncFunction[] rs = new IncFunction[6];
1859 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1860  
1861 <        if (!createIncomplete) assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1862 <        final CompletableFuture<Integer> h = m.applyToEither(f, g, r);
1863 <        if (createIncomplete) {
1864 <            checkIncomplete(h);
1865 <            assertEquals(0, r.invocationCount);
1866 <            assertTrue((fFirst ? f : g).cancel(mayInterruptIfRunning));
1867 <        }
1861 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1862 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1863 >        checkIncomplete(h0);
1864 >        checkIncomplete(h1);
1865 >        rs[0].assertNotInvoked();
1866 >        rs[1].assertNotInvoked();
1867 >        f.cancel(mayInterruptIfRunning);
1868 >        checkCompletedWithWrappedCancellationException(h0);
1869 >        checkCompletedWithWrappedCancellationException(h1);
1870 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1871 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1872 >        checkCompletedWithWrappedCancellationException(h2);
1873 >        checkCompletedWithWrappedCancellationException(h3);
1874 >        g.complete(v1);
1875  
1876 <        checkCompletedWithWrappedCancellationException(h);
1877 <        (!fFirst ? f : g).complete(v1);
1876 >        // unspecified behavior - both source completions available
1877 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1878 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1879 >        try {
1880 >            assertEquals(inc(v1), h4.join());
1881 >            rs[4].assertValue(inc(v1));
1882 >        } catch (CompletionException ok) {
1883 >            checkCompletedWithWrappedCancellationException(h4);
1884 >            rs[4].assertNotInvoked();
1885 >        }
1886 >        try {
1887 >            assertEquals(inc(v1), h5.join());
1888 >            rs[5].assertValue(inc(v1));
1889 >        } catch (CompletionException ok) {
1890 >            checkCompletedWithWrappedCancellationException(h5);
1891 >            rs[5].assertNotInvoked();
1892 >        }
1893  
1894 <        assertEquals(0, r.invocationCount);
1895 <        checkCompletedNormally(!fFirst ? f : g, v1);
1896 <        checkCancelled(fFirst ? f : g);
1897 <        checkCompletedWithWrappedCancellationException(h);
1894 >        checkCancelled(f);
1895 >        checkCompletedNormally(g, v1);
1896 >        checkCompletedWithWrappedCancellationException(h0);
1897 >        checkCompletedWithWrappedCancellationException(h1);
1898 >        checkCompletedWithWrappedCancellationException(h2);
1899 >        checkCompletedWithWrappedCancellationException(h3);
1900 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
1901      }}
1902  
1903      public void testApplyToEither_sourceCancelled2() {
1904          for (ExecutionMode m : ExecutionMode.values())
1905          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1881        for (boolean reverseArgs : new boolean[] { true, false })
1906          for (boolean fFirst : new boolean[] { true, false })
1907          for (Integer v1 : new Integer[] { 1, null })
1908      {
1909          final CompletableFuture<Integer> f = new CompletableFuture<>();
1910          final CompletableFuture<Integer> g = new CompletableFuture<>();
1911 <        final IncFunction r1 = new IncFunction(m);
1912 <        final IncFunction r2 = new IncFunction(m);
1889 <        final CFException ex = new CFException();
1890 <        final CompletableFuture<Integer> j = (reverseArgs ? g : f);
1891 <        final CompletableFuture<Integer> k = (reverseArgs ? f : g);
1911 >        final IncFunction[] rs = new IncFunction[6];
1912 >        for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1913  
1914 <        final CompletableFuture<Integer> h1 = m.applyToEither(j, k, r1);
1914 >        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1915 >        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1916          if (fFirst) {
1917              f.complete(v1);
1918 <            assertTrue(g.cancel(mayInterruptIfRunning));
1918 >            g.cancel(mayInterruptIfRunning);
1919          } else {
1920 <            assertTrue(g.cancel(mayInterruptIfRunning));
1920 >            g.cancel(mayInterruptIfRunning);
1921              f.complete(v1);
1922          }
1923 <        final CompletableFuture<Integer> h2 = m.applyToEither(j, k, r2);
1923 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1924 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1925  
1926 <        // unspecified behavior
1926 >        // unspecified behavior - both source completions available
1927 >        try {
1928 >            assertEquals(inc(v1), h0.join());
1929 >            rs[0].assertValue(inc(v1));
1930 >        } catch (CompletionException ok) {
1931 >            checkCompletedWithWrappedCancellationException(h0);
1932 >            rs[0].assertNotInvoked();
1933 >        }
1934          try {
1935              assertEquals(inc(v1), h1.join());
1936 <            assertEquals(1, r1.invocationCount);
1936 >            rs[1].assertValue(inc(v1));
1937          } catch (CompletionException ok) {
1938              checkCompletedWithWrappedCancellationException(h1);
1939 <            assertEquals(0, r1.invocationCount);
1939 >            rs[1].assertNotInvoked();
1940          }
1911
1941          try {
1942              assertEquals(inc(v1), h2.join());
1943 <            assertEquals(1, r2.invocationCount);
1943 >            rs[2].assertValue(inc(v1));
1944          } catch (CompletionException ok) {
1945              checkCompletedWithWrappedCancellationException(h2);
1946 <            assertEquals(0, r2.invocationCount);
1946 >            rs[2].assertNotInvoked();
1947 >        }
1948 >        try {
1949 >            assertEquals(inc(v1), h3.join());
1950 >            rs[3].assertValue(inc(v1));
1951 >        } catch (CompletionException ok) {
1952 >            checkCompletedWithWrappedCancellationException(h3);
1953 >            rs[3].assertNotInvoked();
1954          }
1955  
1920        checkCancelled(g);
1956          checkCompletedNormally(f, v1);
1957 +        checkCancelled(g);
1958      }}
1959  
1960      /**
1961 <     * acceptEither result completes normally after normal completion
1926 <     * of either source
1961 >     * applyToEither result completes exceptionally if action does
1962       */
1963 <    public void testAcceptEither_normalCompletion1() {
1963 >    public void testApplyToEither_actionFailed() {
1964          for (ExecutionMode m : ExecutionMode.values())
1965          for (Integer v1 : new Integer[] { 1, null })
1966          for (Integer v2 : new Integer[] { 2, null })
1967      {
1968          final CompletableFuture<Integer> f = new CompletableFuture<>();
1969          final CompletableFuture<Integer> g = new CompletableFuture<>();
1970 <        final IncAction r = new IncAction();
1971 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1970 >        final FailingFunction[] rs = new FailingFunction[6];
1971 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1972  
1973 +        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
1974 +        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
1975          f.complete(v1);
1976 <        checkCompletedNormally(h, null);
1977 <        assertEquals(inc(v1), r.value);
1978 <        g.complete(v2);
1979 <
1980 <        checkCompletedNormally(f, v1);
1981 <        checkCompletedNormally(g, v2);
1982 <        checkCompletedNormally(h, null);
1946 <    }}
1947 <
1948 <    public void testAcceptEither_normalCompletion2() {
1949 <        for (ExecutionMode m : ExecutionMode.values())
1950 <        for (Integer v1 : new Integer[] { 1, null })
1951 <        for (Integer v2 : new Integer[] { 2, null })
1952 <    {
1953 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1954 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1955 <        final IncAction r = new IncAction();
1956 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
1976 >        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
1977 >        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
1978 >        checkCompletedWithWrappedCFException(h0);
1979 >        checkCompletedWithWrappedCFException(h1);
1980 >        checkCompletedWithWrappedCFException(h2);
1981 >        checkCompletedWithWrappedCFException(h3);
1982 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
1983  
1984          g.complete(v2);
1985 <        checkCompletedNormally(h, null);
1986 <        assertEquals(inc(v2), r.value);
1987 <        f.complete(v1);
1985 >
1986 >        // unspecified behavior - both source completions available
1987 >        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
1988 >        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
1989 >
1990 >        checkCompletedWithWrappedCFException(h4);
1991 >        assertTrue(Objects.equals(v1, rs[4].value) ||
1992 >                   Objects.equals(v2, rs[4].value));
1993 >        checkCompletedWithWrappedCFException(h5);
1994 >        assertTrue(Objects.equals(v1, rs[5].value) ||
1995 >                   Objects.equals(v2, rs[5].value));
1996  
1997          checkCompletedNormally(f, v1);
1998          checkCompletedNormally(g, v2);
1965        checkCompletedNormally(h, null);
1999      }}
2000  
2001 <    public void testAcceptEither_normalCompletion3() {
2001 >    /**
2002 >     * acceptEither result completes normally after normal completion
2003 >     * of either source
2004 >     */
2005 >    public void testAcceptEither_normalCompletion() {
2006          for (ExecutionMode m : ExecutionMode.values())
2007          for (Integer v1 : new Integer[] { 1, null })
2008          for (Integer v2 : new Integer[] { 2, null })
2009      {
2010          final CompletableFuture<Integer> f = new CompletableFuture<>();
2011          final CompletableFuture<Integer> g = new CompletableFuture<>();
2012 <        final IncAction r = new IncAction();
2012 >        final NoopConsumer[] rs = new NoopConsumer[6];
2013 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2014  
2015 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2016 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2017 +        checkIncomplete(h0);
2018 +        checkIncomplete(h1);
2019 +        rs[0].assertNotInvoked();
2020 +        rs[1].assertNotInvoked();
2021          f.complete(v1);
2022 +        checkCompletedNormally(h0, null);
2023 +        checkCompletedNormally(h1, null);
2024 +        rs[0].assertValue(v1);
2025 +        rs[1].assertValue(v1);
2026 +        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2027 +        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2028 +        checkCompletedNormally(h2, null);
2029 +        checkCompletedNormally(h3, null);
2030 +        rs[2].assertValue(v1);
2031 +        rs[3].assertValue(v1);
2032          g.complete(v2);
1979        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2033  
2034 <        checkCompletedNormally(h, null);
2034 >        // unspecified behavior - both source completions available
2035 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2036 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2037 >        checkCompletedNormally(h4, null);
2038 >        checkCompletedNormally(h5, null);
2039 >        assertTrue(Objects.equals(v1, rs[4].value) ||
2040 >                   Objects.equals(v2, rs[4].value));
2041 >        assertTrue(Objects.equals(v1, rs[5].value) ||
2042 >                   Objects.equals(v2, rs[5].value));
2043 >
2044          checkCompletedNormally(f, v1);
2045          checkCompletedNormally(g, v2);
2046 <
2047 <        // unspecified behavior
2048 <        assertTrue(Objects.equals(r.value, inc(v1)) ||
2049 <                   Objects.equals(r.value, inc(v2)));
2046 >        checkCompletedNormally(h0, null);
2047 >        checkCompletedNormally(h1, null);
2048 >        checkCompletedNormally(h2, null);
2049 >        checkCompletedNormally(h3, null);
2050 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2051      }}
2052  
2053      /**
2054       * acceptEither result completes exceptionally after exceptional
2055       * completion of either source
2056       */
2057 <    public void testAcceptEither_exceptionalCompletion1() {
2057 >    public void testAcceptEither_exceptionalCompletion() {
2058          for (ExecutionMode m : ExecutionMode.values())
2059          for (Integer v1 : new Integer[] { 1, null })
2060      {
2061          final CompletableFuture<Integer> f = new CompletableFuture<>();
2062          final CompletableFuture<Integer> g = new CompletableFuture<>();
2000        final IncAction r = new IncAction();
2001        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2063          final CFException ex = new CFException();
2064 +        final NoopConsumer[] rs = new NoopConsumer[6];
2065 +        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2066  
2067 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2068 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2069 +        checkIncomplete(h0);
2070 +        checkIncomplete(h1);
2071 +        rs[0].assertNotInvoked();
2072 +        rs[1].assertNotInvoked();
2073          f.completeExceptionally(ex);
2074 <        checkCompletedWithWrappedCFException(h, ex);
2075 <        g.complete(v1);
2076 <
2077 <        assertEquals(0, r.invocationCount);
2078 <        checkCompletedNormally(g, v1);
2079 <        checkCompletedWithWrappedCFException(f, ex);
2011 <        checkCompletedWithWrappedCFException(h, ex);
2012 <    }}
2013 <
2014 <    public void testAcceptEither_exceptionalCompletion2() {
2015 <        for (ExecutionMode m : ExecutionMode.values())
2016 <        for (Integer v1 : new Integer[] { 1, null })
2017 <    {
2018 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2019 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2020 <        final IncAction r = new IncAction();
2021 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2022 <        final CFException ex = new CFException();
2023 <
2024 <        g.completeExceptionally(ex);
2025 <        checkCompletedWithWrappedCFException(h, ex);
2026 <        f.complete(v1);
2074 >        checkCompletedWithWrappedCFException(h0, ex);
2075 >        checkCompletedWithWrappedCFException(h1, ex);
2076 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2077 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2078 >        checkCompletedWithWrappedCFException(h2, ex);
2079 >        checkCompletedWithWrappedCFException(h3, ex);
2080  
2081 <        assertEquals(0, r.invocationCount);
2029 <        checkCompletedNormally(f, v1);
2030 <        checkCompletedWithWrappedCFException(g, ex);
2031 <        checkCompletedWithWrappedCFException(h, ex);
2032 <    }}
2033 <
2034 <    public void testAcceptEither_exceptionalCompletion3() {
2035 <        for (ExecutionMode m : ExecutionMode.values())
2036 <        for (Integer v1 : new Integer[] { 1, null })
2037 <    {
2038 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2039 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2040 <        final IncAction r = new IncAction();
2041 <        final CFException ex = new CFException();
2042 <
2043 <        g.completeExceptionally(ex);
2044 <        f.complete(v1);
2045 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2081 >        g.complete(v1);
2082  
2083 <        // unspecified behavior
2084 <        Integer v;
2083 >        // unspecified behavior - both source completions available
2084 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2085 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2086          try {
2087 <            assertNull(h.join());
2088 <            assertEquals(1, r.invocationCount);
2052 <            assertEquals(inc(v1), r.value);
2087 >            assertNull(h4.join());
2088 >            rs[4].assertValue(v1);
2089          } catch (CompletionException ok) {
2090 <            checkCompletedWithWrappedCFException(h, ex);
2091 <            assertEquals(0, r.invocationCount);
2090 >            checkCompletedWithWrappedCFException(h4, ex);
2091 >            rs[4].assertNotInvoked();
2092          }
2057
2058        checkCompletedWithWrappedCFException(g, ex);
2059        checkCompletedNormally(f, v1);
2060    }}
2061
2062    public void testAcceptEither_exceptionalCompletion4() {
2063        for (ExecutionMode m : ExecutionMode.values())
2064        for (Integer v1 : new Integer[] { 1, null })
2065    {
2066        final CompletableFuture<Integer> f = new CompletableFuture<>();
2067        final CompletableFuture<Integer> g = new CompletableFuture<>();
2068        final IncAction r = new IncAction();
2069        final CFException ex = new CFException();
2070
2071        f.completeExceptionally(ex);
2072        g.complete(v1);
2073        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2074
2075        // unspecified behavior
2076        Integer v;
2093          try {
2094 <            assertNull(h.join());
2095 <            assertEquals(1, r.invocationCount);
2080 <            assertEquals(inc(v1), r.value);
2094 >            assertNull(h5.join());
2095 >            rs[5].assertValue(v1);
2096          } catch (CompletionException ok) {
2097 <            checkCompletedWithWrappedCFException(h, ex);
2098 <            assertEquals(0, r.invocationCount);
2097 >            checkCompletedWithWrappedCFException(h5, ex);
2098 >            rs[5].assertNotInvoked();
2099          }
2100  
2101          checkCompletedWithWrappedCFException(f, ex);
2102          checkCompletedNormally(g, v1);
2103 +        checkCompletedWithWrappedCFException(h0, ex);
2104 +        checkCompletedWithWrappedCFException(h1, ex);
2105 +        checkCompletedWithWrappedCFException(h2, ex);
2106 +        checkCompletedWithWrappedCFException(h3, ex);
2107 +        checkCompletedWithWrappedCFException(h4, ex);
2108 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2109      }}
2110  
2111 <    /**
2091 <     * acceptEither result completes exceptionally if action does
2092 <     */
2093 <    public void testAcceptEither_actionFailed1() {
2111 >    public void testAcceptEither_exceptionalCompletion2() {
2112          for (ExecutionMode m : ExecutionMode.values())
2113 +        for (boolean fFirst : new boolean[] { true, false })
2114          for (Integer v1 : new Integer[] { 1, null })
2096        for (Integer v2 : new Integer[] { 2, null })
2115      {
2116          final CompletableFuture<Integer> f = new CompletableFuture<>();
2117          final CompletableFuture<Integer> g = new CompletableFuture<>();
2118 <        final FailingConsumer r = new FailingConsumer(m);
2119 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2118 >        final CFException ex = new CFException();
2119 >        final NoopConsumer[] rs = new NoopConsumer[6];
2120 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2121  
2122 <        f.complete(v1);
2123 <        checkCompletedWithWrappedCFException(h);
2124 <        g.complete(v2);
2125 <        checkCompletedNormally(f, v1);
2126 <        checkCompletedNormally(g, v2);
2127 <    }}
2122 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2123 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2124 >        if (fFirst) {
2125 >            f.complete(v1);
2126 >            g.completeExceptionally(ex);
2127 >        } else {
2128 >            g.completeExceptionally(ex);
2129 >            f.complete(v1);
2130 >        }
2131 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2132 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2133  
2134 <    public void testAcceptEither_actionFailed2() {
2135 <        for (ExecutionMode m : ExecutionMode.values())
2136 <        for (Integer v1 : new Integer[] { 1, null })
2137 <        for (Integer v2 : new Integer[] { 2, null })
2138 <    {
2139 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2141 <        final FailingConsumer r = new FailingConsumer(m);
2142 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2134 >        // unspecified behavior - both source completions available
2135 >        try {
2136 >            assertEquals(null, h0.join());
2137 >            rs[0].assertValue(v1);
2138 >        } catch (CompletionException ok) {
2139 >            checkCompletedWithWrappedCFException(h0, ex);
2140 >            rs[0].assertNotInvoked();
2141 >        }
2142 >        try {
2143 >            assertEquals(null, h1.join());
2144 >            rs[1].assertValue(v1);
2145 >        } catch (CompletionException ok) {
2146 >            checkCompletedWithWrappedCFException(h1, ex);
2147 >            rs[1].assertNotInvoked();
2148 >        }
2149 >        try {
2150 >            assertEquals(null, h2.join());
2151 >            rs[2].assertValue(v1);
2152 >        } catch (CompletionException ok) {
2153 >            checkCompletedWithWrappedCFException(h2, ex);
2154 >            rs[2].assertNotInvoked();
2155 >        }
2156 >        try {
2157 >            assertEquals(null, h3.join());
2158 >            rs[3].assertValue(v1);
2159 >        } catch (CompletionException ok) {
2160 >            checkCompletedWithWrappedCFException(h3, ex);
2161 >            rs[3].assertNotInvoked();
2162 >        }
2163  
2120        g.complete(v2);
2121        checkCompletedWithWrappedCFException(h);
2122        f.complete(v1);
2164          checkCompletedNormally(f, v1);
2165 <        checkCompletedNormally(g, v2);
2165 >        checkCompletedWithWrappedCFException(g, ex);
2166      }}
2167  
2168      /**
2169       * acceptEither result completes exceptionally if either source cancelled
2170       */
2171 <    public void testAcceptEither_sourceCancelled1() {
2131 <        for (ExecutionMode m : ExecutionMode.values())
2132 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2133 <        for (Integer v1 : new Integer[] { 1, null })
2134 <    {
2135 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2136 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2137 <        final IncAction r = new IncAction();
2138 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2139 <
2140 <        assertTrue(f.cancel(mayInterruptIfRunning));
2141 <        checkCompletedWithWrappedCancellationException(h);
2142 <        g.complete(v1);
2143 <
2144 <        checkCancelled(f);
2145 <        assertEquals(0, r.invocationCount);
2146 <        checkCompletedNormally(g, v1);
2147 <        checkCompletedWithWrappedCancellationException(h);
2148 <    }}
2149 <
2150 <    public void testAcceptEither_sourceCancelled2() {
2171 >    public void testAcceptEither_sourceCancelled() {
2172          for (ExecutionMode m : ExecutionMode.values())
2173          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2174          for (Integer v1 : new Integer[] { 1, null })
2175      {
2176          final CompletableFuture<Integer> f = new CompletableFuture<>();
2177          final CompletableFuture<Integer> g = new CompletableFuture<>();
2178 <        final IncAction r = new IncAction();
2179 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2178 >        final NoopConsumer[] rs = new NoopConsumer[6];
2179 >        for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2180  
2181 <        assertTrue(g.cancel(mayInterruptIfRunning));
2182 <        checkCompletedWithWrappedCancellationException(h);
2183 <        f.complete(v1);
2181 >        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2182 >        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2183 >        checkIncomplete(h0);
2184 >        checkIncomplete(h1);
2185 >        rs[0].assertNotInvoked();
2186 >        rs[1].assertNotInvoked();
2187 >        f.cancel(mayInterruptIfRunning);
2188 >        checkCompletedWithWrappedCancellationException(h0);
2189 >        checkCompletedWithWrappedCancellationException(h1);
2190 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2191 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2192 >        checkCompletedWithWrappedCancellationException(h2);
2193 >        checkCompletedWithWrappedCancellationException(h3);
2194  
2195 <        checkCancelled(g);
2165 <        assertEquals(0, r.invocationCount);
2166 <        checkCompletedNormally(f, v1);
2167 <        checkCompletedWithWrappedCancellationException(h);
2168 <    }}
2169 <
2170 <    public void testAcceptEither_sourceCancelled3() {
2171 <        for (ExecutionMode m : ExecutionMode.values())
2172 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2173 <        for (Integer v1 : new Integer[] { 1, null })
2174 <    {
2175 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2176 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2177 <        final IncAction r = new IncAction();
2178 <
2179 <        assertTrue(g.cancel(mayInterruptIfRunning));
2180 <        f.complete(v1);
2181 <        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2195 >        g.complete(v1);
2196  
2197 <        // unspecified behavior
2198 <        Integer v;
2197 >        // unspecified behavior - both source completions available
2198 >        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2199 >        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2200          try {
2201 <            assertNull(h.join());
2202 <            assertEquals(1, r.invocationCount);
2188 <            assertEquals(inc(v1), r.value);
2201 >            assertNull(h4.join());
2202 >            rs[4].assertValue(v1);
2203          } catch (CompletionException ok) {
2204 <            checkCompletedWithWrappedCancellationException(h);
2205 <            assertEquals(0, r.invocationCount);
2204 >            checkCompletedWithWrappedCancellationException(h4);
2205 >            rs[4].assertNotInvoked();
2206          }
2193
2194        checkCancelled(g);
2195        checkCompletedNormally(f, v1);
2196    }}
2197
2198    public void testAcceptEither_sourceCancelled4() {
2199        for (ExecutionMode m : ExecutionMode.values())
2200        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2201        for (Integer v1 : new Integer[] { 1, null })
2202    {
2203        final CompletableFuture<Integer> f = new CompletableFuture<>();
2204        final CompletableFuture<Integer> g = new CompletableFuture<>();
2205        final IncAction r = new IncAction();
2206
2207        assertTrue(f.cancel(mayInterruptIfRunning));
2208        g.complete(v1);
2209        final CompletableFuture<Void> h = m.acceptEither(f, g, r);
2210
2211        // unspecified behavior
2212        Integer v;
2207          try {
2208 <            assertNull(h.join());
2209 <            assertEquals(1, r.invocationCount);
2216 <            assertEquals(inc(v1), r.value);
2208 >            assertNull(h5.join());
2209 >            rs[5].assertValue(v1);
2210          } catch (CompletionException ok) {
2211 <            checkCompletedWithWrappedCancellationException(h);
2212 <            assertEquals(0, r.invocationCount);
2211 >            checkCompletedWithWrappedCancellationException(h5);
2212 >            rs[5].assertNotInvoked();
2213          }
2214  
2215          checkCancelled(f);
2216          checkCompletedNormally(g, v1);
2217 +        checkCompletedWithWrappedCancellationException(h0);
2218 +        checkCompletedWithWrappedCancellationException(h1);
2219 +        checkCompletedWithWrappedCancellationException(h2);
2220 +        checkCompletedWithWrappedCancellationException(h3);
2221 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2222      }}
2223  
2224      /**
2225 <     * runAfterEither result completes normally after normal completion
2228 <     * of either source
2225 >     * acceptEither result completes exceptionally if action does
2226       */
2227 <    public void testRunAfterEither_normalCompletion1() {
2227 >    public void testAcceptEither_actionFailed() {
2228          for (ExecutionMode m : ExecutionMode.values())
2229          for (Integer v1 : new Integer[] { 1, null })
2230          for (Integer v2 : new Integer[] { 2, null })
2231      {
2232          final CompletableFuture<Integer> f = new CompletableFuture<>();
2233          final CompletableFuture<Integer> g = new CompletableFuture<>();
2234 <        final Noop r = new Noop(m);
2235 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2234 >        final FailingConsumer[] rs = new FailingConsumer[6];
2235 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2236  
2237 +        final CompletableFuture<Void> h0 = m.acceptEither(f, g, rs[0]);
2238 +        final CompletableFuture<Void> h1 = m.acceptEither(g, f, rs[1]);
2239          f.complete(v1);
2240 <        checkCompletedNormally(h, null);
2241 <        assertEquals(1, r.invocationCount);
2240 >        final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2241 >        final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2242 >        checkCompletedWithWrappedCFException(h0);
2243 >        checkCompletedWithWrappedCFException(h1);
2244 >        checkCompletedWithWrappedCFException(h2);
2245 >        checkCompletedWithWrappedCFException(h3);
2246 >        for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2247 >
2248          g.complete(v2);
2249  
2250 +        // unspecified behavior - both source completions available
2251 +        final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2252 +        final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2253 +
2254 +        checkCompletedWithWrappedCFException(h4);
2255 +        assertTrue(Objects.equals(v1, rs[4].value) ||
2256 +                   Objects.equals(v2, rs[4].value));
2257 +        checkCompletedWithWrappedCFException(h5);
2258 +        assertTrue(Objects.equals(v1, rs[5].value) ||
2259 +                   Objects.equals(v2, rs[5].value));
2260 +
2261          checkCompletedNormally(f, v1);
2262          checkCompletedNormally(g, v2);
2247        checkCompletedNormally(h, null);
2248        assertEquals(1, r.invocationCount);
2263      }}
2264  
2265 <    public void testRunAfterEither_normalCompletion2() {
2265 >    /**
2266 >     * runAfterEither result completes normally after normal completion
2267 >     * of either source
2268 >     */
2269 >    public void testRunAfterEither_normalCompletion() {
2270          for (ExecutionMode m : ExecutionMode.values())
2271          for (Integer v1 : new Integer[] { 1, null })
2272          for (Integer v2 : new Integer[] { 2, null })
2273      {
2274          final CompletableFuture<Integer> f = new CompletableFuture<>();
2275          final CompletableFuture<Integer> g = new CompletableFuture<>();
2276 <        final Noop r = new Noop(m);
2277 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2276 >        final Noop[] rs = new Noop[6];
2277 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2278  
2279 <        g.complete(v2);
2280 <        checkCompletedNormally(h, null);
2281 <        assertEquals(1, r.invocationCount);
2279 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2280 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2281 >        checkIncomplete(h0);
2282 >        checkIncomplete(h1);
2283 >        rs[0].assertNotInvoked();
2284 >        rs[1].assertNotInvoked();
2285          f.complete(v1);
2286 +        checkCompletedNormally(h0, null);
2287 +        checkCompletedNormally(h1, null);
2288 +        rs[0].assertInvoked();
2289 +        rs[1].assertInvoked();
2290 +        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2291 +        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2292 +        checkCompletedNormally(h2, null);
2293 +        checkCompletedNormally(h3, null);
2294 +        rs[2].assertInvoked();
2295 +        rs[3].assertInvoked();
2296  
2266        checkCompletedNormally(f, v1);
2267        checkCompletedNormally(g, v2);
2268        checkCompletedNormally(h, null);
2269        assertEquals(1, r.invocationCount);
2270        }}
2271
2272    public void testRunAfterEither_normalCompletion3() {
2273        for (ExecutionMode m : ExecutionMode.values())
2274        for (Integer v1 : new Integer[] { 1, null })
2275        for (Integer v2 : new Integer[] { 2, null })
2276    {
2277        final CompletableFuture<Integer> f = new CompletableFuture<>();
2278        final CompletableFuture<Integer> g = new CompletableFuture<>();
2279        final Noop r = new Noop(m);
2280
2281        f.complete(v1);
2297          g.complete(v2);
2283        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2298  
2299 <        checkCompletedNormally(h, null);
2299 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2300 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2301 >
2302          checkCompletedNormally(f, v1);
2303          checkCompletedNormally(g, v2);
2304 <        assertEquals(1, r.invocationCount);
2304 >        checkCompletedNormally(h0, null);
2305 >        checkCompletedNormally(h1, null);
2306 >        checkCompletedNormally(h2, null);
2307 >        checkCompletedNormally(h3, null);
2308 >        checkCompletedNormally(h4, null);
2309 >        checkCompletedNormally(h5, null);
2310 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2311      }}
2312  
2313      /**
2314       * runAfterEither result completes exceptionally after exceptional
2315       * completion of either source
2316       */
2317 <    public void testRunAfterEither_exceptionalCompletion1() {
2317 >    public void testRunAfterEither_exceptionalCompletion() {
2318          for (ExecutionMode m : ExecutionMode.values())
2319          for (Integer v1 : new Integer[] { 1, null })
2320      {
2321          final CompletableFuture<Integer> f = new CompletableFuture<>();
2322          final CompletableFuture<Integer> g = new CompletableFuture<>();
2301        final Noop r = new Noop(m);
2302        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323          final CFException ex = new CFException();
2324 +        final Noop[] rs = new Noop[6];
2325 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2326  
2327 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2328 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2329 +        checkIncomplete(h0);
2330 +        checkIncomplete(h1);
2331 +        rs[0].assertNotInvoked();
2332 +        rs[1].assertNotInvoked();
2333          f.completeExceptionally(ex);
2334 <        checkCompletedWithWrappedCFException(h, ex);
2334 >        checkCompletedWithWrappedCFException(h0, ex);
2335 >        checkCompletedWithWrappedCFException(h1, ex);
2336 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2337 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2338 >        checkCompletedWithWrappedCFException(h2, ex);
2339 >        checkCompletedWithWrappedCFException(h3, ex);
2340 >
2341          g.complete(v1);
2342  
2343 <        assertEquals(0, r.invocationCount);
2344 <        checkCompletedNormally(g, v1);
2343 >        // unspecified behavior - both source completions available
2344 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2345 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2346 >        try {
2347 >            assertNull(h4.join());
2348 >            rs[4].assertInvoked();
2349 >        } catch (CompletionException ok) {
2350 >            checkCompletedWithWrappedCFException(h4, ex);
2351 >            rs[4].assertNotInvoked();
2352 >        }
2353 >        try {
2354 >            assertNull(h5.join());
2355 >            rs[5].assertInvoked();
2356 >        } catch (CompletionException ok) {
2357 >            checkCompletedWithWrappedCFException(h5, ex);
2358 >            rs[5].assertNotInvoked();
2359 >        }
2360 >
2361          checkCompletedWithWrappedCFException(f, ex);
2362 <        checkCompletedWithWrappedCFException(h, ex);
2362 >        checkCompletedNormally(g, v1);
2363 >        checkCompletedWithWrappedCFException(h0, ex);
2364 >        checkCompletedWithWrappedCFException(h1, ex);
2365 >        checkCompletedWithWrappedCFException(h2, ex);
2366 >        checkCompletedWithWrappedCFException(h3, ex);
2367 >        checkCompletedWithWrappedCFException(h4, ex);
2368 >        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2369      }}
2370  
2371      public void testRunAfterEither_exceptionalCompletion2() {
2372          for (ExecutionMode m : ExecutionMode.values())
2373 +        for (boolean fFirst : new boolean[] { true, false })
2374          for (Integer v1 : new Integer[] { 1, null })
2375      {
2376          final CompletableFuture<Integer> f = new CompletableFuture<>();
2377          final CompletableFuture<Integer> g = new CompletableFuture<>();
2321        final Noop r = new Noop(m);
2322        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2323        final CFException ex = new CFException();
2324
2325        g.completeExceptionally(ex);
2326        checkCompletedWithWrappedCFException(h, ex);
2327        f.complete(v1);
2328
2329        assertEquals(0, r.invocationCount);
2330        checkCompletedNormally(f, v1);
2331        checkCompletedWithWrappedCFException(g, ex);
2332        checkCompletedWithWrappedCFException(h, ex);
2333    }}
2334
2335    public void testRunAfterEither_exceptionalCompletion3() {
2336        for (ExecutionMode m : ExecutionMode.values())
2337        for (Integer v1 : new Integer[] { 1, null })
2338    {
2339        final CompletableFuture<Integer> f = new CompletableFuture<>();
2340        final CompletableFuture<Integer> g = new CompletableFuture<>();
2341        final Noop r = new Noop(m);
2378          final CFException ex = new CFException();
2379 +        final Noop[] rs = new Noop[6];
2380 +        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2381  
2382 <        g.completeExceptionally(ex);
2383 <        f.complete(v1);
2384 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2382 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2383 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2384 >        if (fFirst) {
2385 >            f.complete(v1);
2386 >            g.completeExceptionally(ex);
2387 >        } else {
2388 >            g.completeExceptionally(ex);
2389 >            f.complete(v1);
2390 >        }
2391 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2392 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2393  
2394 <        // unspecified behavior
2349 <        Integer v;
2394 >        // unspecified behavior - both source completions available
2395          try {
2396 <            assertNull(h.join());
2397 <            assertEquals(1, r.invocationCount);
2396 >            assertEquals(null, h0.join());
2397 >            rs[0].assertInvoked();
2398          } catch (CompletionException ok) {
2399 <            checkCompletedWithWrappedCFException(h, ex);
2400 <            assertEquals(0, r.invocationCount);
2399 >            checkCompletedWithWrappedCFException(h0, ex);
2400 >            rs[0].assertNotInvoked();
2401 >        }
2402 >        try {
2403 >            assertEquals(null, h1.join());
2404 >            rs[1].assertInvoked();
2405 >        } catch (CompletionException ok) {
2406 >            checkCompletedWithWrappedCFException(h1, ex);
2407 >            rs[1].assertNotInvoked();
2408 >        }
2409 >        try {
2410 >            assertEquals(null, h2.join());
2411 >            rs[2].assertInvoked();
2412 >        } catch (CompletionException ok) {
2413 >            checkCompletedWithWrappedCFException(h2, ex);
2414 >            rs[2].assertNotInvoked();
2415 >        }
2416 >        try {
2417 >            assertEquals(null, h3.join());
2418 >            rs[3].assertInvoked();
2419 >        } catch (CompletionException ok) {
2420 >            checkCompletedWithWrappedCFException(h3, ex);
2421 >            rs[3].assertNotInvoked();
2422          }
2423  
2358        checkCompletedWithWrappedCFException(g, ex);
2424          checkCompletedNormally(f, v1);
2425 +        checkCompletedWithWrappedCFException(g, ex);
2426      }}
2427  
2428 <    public void testRunAfterEither_exceptionalCompletion4() {
2428 >    /**
2429 >     * runAfterEither result completes exceptionally if either source cancelled
2430 >     */
2431 >    public void testRunAfterEither_sourceCancelled() {
2432          for (ExecutionMode m : ExecutionMode.values())
2433 +        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2434          for (Integer v1 : new Integer[] { 1, null })
2435      {
2436          final CompletableFuture<Integer> f = new CompletableFuture<>();
2437          final CompletableFuture<Integer> g = new CompletableFuture<>();
2438 <        final Noop r = new Noop(m);
2439 <        final CFException ex = new CFException();
2438 >        final Noop[] rs = new Noop[6];
2439 >        for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2440 >
2441 >        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2442 >        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2443 >        checkIncomplete(h0);
2444 >        checkIncomplete(h1);
2445 >        rs[0].assertNotInvoked();
2446 >        rs[1].assertNotInvoked();
2447 >        f.cancel(mayInterruptIfRunning);
2448 >        checkCompletedWithWrappedCancellationException(h0);
2449 >        checkCompletedWithWrappedCancellationException(h1);
2450 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2451 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2452 >        checkCompletedWithWrappedCancellationException(h2);
2453 >        checkCompletedWithWrappedCancellationException(h3);
2454  
2371        f.completeExceptionally(ex);
2455          g.complete(v1);
2373        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2456  
2457 <        // unspecified behavior
2458 <        Integer v;
2457 >        // unspecified behavior - both source completions available
2458 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2459 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2460          try {
2461 <            assertNull(h.join());
2462 <            assertEquals(1, r.invocationCount);
2461 >            assertNull(h4.join());
2462 >            rs[4].assertInvoked();
2463          } catch (CompletionException ok) {
2464 <            checkCompletedWithWrappedCFException(h, ex);
2465 <            assertEquals(0, r.invocationCount);
2464 >            checkCompletedWithWrappedCancellationException(h4);
2465 >            rs[4].assertNotInvoked();
2466 >        }
2467 >        try {
2468 >            assertNull(h5.join());
2469 >            rs[5].assertInvoked();
2470 >        } catch (CompletionException ok) {
2471 >            checkCompletedWithWrappedCancellationException(h5);
2472 >            rs[5].assertNotInvoked();
2473          }
2474  
2475 <        checkCompletedWithWrappedCFException(f, ex);
2475 >        checkCancelled(f);
2476          checkCompletedNormally(g, v1);
2477 +        checkCompletedWithWrappedCancellationException(h0);
2478 +        checkCompletedWithWrappedCancellationException(h1);
2479 +        checkCompletedWithWrappedCancellationException(h2);
2480 +        checkCompletedWithWrappedCancellationException(h3);
2481 +        for (int i = 0; i < 4; i++) rs[i].assertNotInvoked();
2482      }}
2483  
2484      /**
2485       * runAfterEither result completes exceptionally if action does
2486       */
2487 <    public void testRunAfterEither_actionFailed1() {
2487 >    public void testRunAfterEither_actionFailed() {
2488          for (ExecutionMode m : ExecutionMode.values())
2489          for (Integer v1 : new Integer[] { 1, null })
2490          for (Integer v2 : new Integer[] { 2, null })
2491      {
2492          final CompletableFuture<Integer> f = new CompletableFuture<>();
2493          final CompletableFuture<Integer> g = new CompletableFuture<>();
2494 <        final FailingRunnable r = new FailingRunnable(m);
2495 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2494 >        final FailingRunnable[] rs = new FailingRunnable[6];
2495 >        for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
2496  
2497 +        final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
2498 +        final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
2499          f.complete(v1);
2500 <        checkCompletedWithWrappedCFException(h);
2500 >        final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2501 >        final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2502 >        checkCompletedWithWrappedCFException(h0);
2503 >        checkCompletedWithWrappedCFException(h1);
2504 >        checkCompletedWithWrappedCFException(h2);
2505 >        checkCompletedWithWrappedCFException(h3);
2506 >        for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2507          g.complete(v2);
2508 <        checkCompletedNormally(f, v1);
2509 <        checkCompletedNormally(g, v2);
2510 <    }}
2508 >        final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2509 >        final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2510 >        checkCompletedWithWrappedCFException(h4);
2511 >        checkCompletedWithWrappedCFException(h5);
2512  
2409    public void testRunAfterEither_actionFailed2() {
2410        for (ExecutionMode m : ExecutionMode.values())
2411        for (Integer v1 : new Integer[] { 1, null })
2412        for (Integer v2 : new Integer[] { 2, null })
2413    {
2414        final CompletableFuture<Integer> f = new CompletableFuture<>();
2415        final CompletableFuture<Integer> g = new CompletableFuture<>();
2416        final FailingRunnable r = new FailingRunnable(m);
2417        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2418
2419        g.complete(v2);
2420        checkCompletedWithWrappedCFException(h);
2421        f.complete(v1);
2513          checkCompletedNormally(f, v1);
2514          checkCompletedNormally(g, v2);
2515 <    }}
2425 <
2426 <    /**
2427 <     * runAfterEither result completes exceptionally if either source cancelled
2428 <     */
2429 <    public void testRunAfterEither_sourceCancelled1() {
2430 <        for (ExecutionMode m : ExecutionMode.values())
2431 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2432 <        for (Integer v1 : new Integer[] { 1, null })
2433 <    {
2434 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2435 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2436 <        final Noop r = new Noop(m);
2437 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2438 <
2439 <        assertTrue(f.cancel(mayInterruptIfRunning));
2440 <        checkCompletedWithWrappedCancellationException(h);
2441 <        g.complete(v1);
2442 <
2443 <        checkCancelled(f);
2444 <        assertEquals(0, r.invocationCount);
2445 <        checkCompletedNormally(g, v1);
2446 <        checkCompletedWithWrappedCancellationException(h);
2447 <    }}
2448 <
2449 <    public void testRunAfterEither_sourceCancelled2() {
2450 <        for (ExecutionMode m : ExecutionMode.values())
2451 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2452 <        for (Integer v1 : new Integer[] { 1, null })
2453 <    {
2454 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2455 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2456 <        final Noop r = new Noop(m);
2457 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2458 <
2459 <        assertTrue(g.cancel(mayInterruptIfRunning));
2460 <        checkCompletedWithWrappedCancellationException(h);
2461 <        f.complete(v1);
2462 <
2463 <        checkCancelled(g);
2464 <        assertEquals(0, r.invocationCount);
2465 <        checkCompletedNormally(f, v1);
2466 <        checkCompletedWithWrappedCancellationException(h);
2467 <    }}
2468 <
2469 <    public void testRunAfterEither_sourceCancelled3() {
2470 <        for (ExecutionMode m : ExecutionMode.values())
2471 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2472 <        for (Integer v1 : new Integer[] { 1, null })
2473 <    {
2474 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2475 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2476 <        final Noop r = new Noop(m);
2477 <
2478 <        assertTrue(g.cancel(mayInterruptIfRunning));
2479 <        f.complete(v1);
2480 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2481 <
2482 <        // unspecified behavior
2483 <        Integer v;
2484 <        try {
2485 <            assertNull(h.join());
2486 <            assertEquals(1, r.invocationCount);
2487 <        } catch (CompletionException ok) {
2488 <            checkCompletedWithWrappedCancellationException(h);
2489 <            assertEquals(0, r.invocationCount);
2490 <        }
2491 <
2492 <        checkCancelled(g);
2493 <        checkCompletedNormally(f, v1);
2494 <    }}
2495 <
2496 <    public void testRunAfterEither_sourceCancelled4() {
2497 <        for (ExecutionMode m : ExecutionMode.values())
2498 <        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2499 <        for (Integer v1 : new Integer[] { 1, null })
2500 <    {
2501 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2502 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2503 <        final Noop r = new Noop(m);
2504 <
2505 <        assertTrue(f.cancel(mayInterruptIfRunning));
2506 <        g.complete(v1);
2507 <        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2508 <
2509 <        // unspecified behavior
2510 <        Integer v;
2511 <        try {
2512 <            assertNull(h.join());
2513 <            assertEquals(1, r.invocationCount);
2514 <        } catch (CompletionException ok) {
2515 <            checkCompletedWithWrappedCancellationException(h);
2516 <            assertEquals(0, r.invocationCount);
2517 <        }
2518 <
2519 <        checkCancelled(f);
2520 <        checkCompletedNormally(g, v1);
2515 >        for (int i = 0; i < 6; i++) rs[i].assertInvoked();
2516      }}
2517  
2518      /**
# Line 2536 | Line 2531 | public class CompletableFutureTest exten
2531  
2532          checkCompletedNormally(g, inc(v1));
2533          checkCompletedNormally(f, v1);
2534 <        assertEquals(1, r.invocationCount);
2534 >        r.assertValue(v1);
2535      }}
2536  
2537      /**
# Line 2556 | Line 2551 | public class CompletableFutureTest exten
2551  
2552          checkCompletedWithWrappedCFException(g, ex);
2553          checkCompletedWithWrappedCFException(f, ex);
2554 <        assertEquals(0, r.invocationCount);
2554 >        r.assertNotInvoked();
2555      }}
2556  
2557      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines