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.40 by jsr166, Mon Jun 2 01:11:53 2014 UTC vs.
Revision 1.44 by jsr166, Mon Jun 2 06:06:30 2014 UTC

# Line 339 | Line 339 | public class CompletableFutureTest exten
339      static final class IncAction implements Consumer<Integer> {
340          int invocationCount = 0;
341          Integer value;
342        public boolean ran() { return invocationCount == 1; }
342          public void accept(Integer x) {
343              invocationCount++;
344              value = inc(x);
# Line 348 | Line 347 | public class CompletableFutureTest exten
347      static final class IncFunction implements Function<Integer,Integer> {
348          int invocationCount = 0;
349          Integer value;
351        public boolean ran() { return invocationCount == 1; }
350          public Integer apply(Integer x) {
351              invocationCount++;
352              return value = inc(x);
# Line 358 | Line 356 | public class CompletableFutureTest exten
356          int invocationCount = 0;
357          Integer value;
358          // Check this action was invoked exactly once when result is computed.
361        public boolean ran() { return invocationCount == 1; }
359          public void accept(Integer x, Integer y) {
360              invocationCount++;
361              value = subtract(x, y);
# Line 368 | Line 365 | public class CompletableFutureTest exten
365          int invocationCount = 0;
366          Integer value;
367          // Check this action was invoked exactly once when result is computed.
371        public boolean ran() { return invocationCount == 1; }
368          public Integer apply(Integer x, Integer y) {
369              invocationCount++;
370              return value = subtract(x, y);
371          }
372      }
373      static final class Noop implements Runnable {
374 <        boolean ran;
375 <        public void run() { ran = true; }
374 >        int invocationCount = 0;
375 >        public void run() {
376 >            invocationCount++;
377 >        }
378      }
379  
380      static final class FailingSupplier implements Supplier<Integer> {
381 <        boolean ran;
382 <        public Integer get() { ran = true; throw new CFException(); }
381 >        int invocationCount = 0;
382 >        public Integer get() {
383 >            invocationCount++;
384 >            throw new CFException();
385 >        }
386      }
387      static final class FailingConsumer implements Consumer<Integer> {
388 <        boolean ran;
389 <        public void accept(Integer x) { ran = true; throw new CFException(); }
388 >        int invocationCount = 0;
389 >        public void accept(Integer x) {
390 >            invocationCount++;
391 >            throw new CFException();
392 >        }
393      }
394      static final class FailingBiConsumer implements BiConsumer<Integer, Integer> {
395 <        boolean ran;
396 <        public void accept(Integer x, Integer y) { ran = true; throw new CFException(); }
395 >        int invocationCount = 0;
396 >        public void accept(Integer x, Integer y) {
397 >            invocationCount++;
398 >            throw new CFException();
399 >        }
400      }
401      static final class FailingFunction implements Function<Integer, Integer> {
402 <        boolean ran;
403 <        public Integer apply(Integer x) { ran = true; throw new CFException(); }
402 >        int invocationCount = 0;
403 >        public Integer apply(Integer x) {
404 >            invocationCount++;
405 >            throw new CFException();
406 >        }
407      }
408      static final class FailingBiFunction implements BiFunction<Integer, Integer, Integer> {
409 <        boolean ran;
410 <        public Integer apply(Integer x, Integer y) { ran = true; throw new CFException(); }
409 >        int invocationCount = 0;
410 >        public Integer apply(Integer x, Integer y) {
411 >            invocationCount++;
412 >            throw new CFException();
413 >        }
414      }
415      static final class FailingNoop implements Runnable {
416 <        boolean ran;
417 <        public void run() { ran = true; throw new CFException(); }
416 >        int invocationCount = 0;
417 >        public void run() {
418 >            invocationCount++;
419 >            throw new CFException();
420 >        }
421      }
422  
423      static final class CompletableFutureInc
424          implements Function<Integer, CompletableFuture<Integer>> {
425 <        boolean ran;
425 >        int invocationCount = 0;
426          public CompletableFuture<Integer> apply(Integer x) {
427 <            ran = true;
427 >            invocationCount++;
428              CompletableFuture<Integer> f = new CompletableFuture<>();
429 <            f.complete(Integer.valueOf(x.intValue() + 1));
429 >            f.complete(inc(x));
430              return f;
431          }
432      }
433  
434      static final class FailingCompletableFutureFunction
435          implements Function<Integer, CompletableFuture<Integer>> {
436 <        boolean ran;
436 >        int invocationCount = 0;
437          public CompletableFuture<Integer> apply(Integer x) {
438 <            ran = true; throw new CFException();
438 >            invocationCount++;
439 >            throw new CFException();
440          }
441      }
442  
# Line 438 | Line 455 | public class CompletableFutureTest exten
455      }
456  
457      static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
458 <        boolean ran;
458 >        int invocationCount = 0;
459          public Integer apply(Integer x, Throwable t) {
460 <            ran = true;
460 >            invocationCount++;
461              return (t == null) ? two : three;
462          }
463      }
# Line 679 | Line 696 | public class CompletableFutureTest exten
696          f = new CompletableFuture<>();
697          f.completeExceptionally(new CFException());
698          g = f.handle(r = new IntegerHandler());
699 <        assertTrue(r.ran);
699 >        assertEquals(1, r.invocationCount);
700 >        assertEquals(1, r.invocationCount);
701          checkCompletedNormally(g, three);
702  
703          f = new CompletableFuture<>();
704          g = f.handle(r = new IntegerHandler());
705 <        assertFalse(r.ran);
705 >        assertEquals(0, r.invocationCount);
706          f.completeExceptionally(new CFException());
707          checkCompletedNormally(g, three);
708 <        assertTrue(r.ran);
708 >        assertEquals(1, r.invocationCount);
709  
710          f = new CompletableFuture<>();
711          f.complete(one);
712          g = f.handle(r = new IntegerHandler());
713 <        assertTrue(r.ran);
713 >        assertEquals(1, r.invocationCount);
714          checkCompletedNormally(g, two);
715  
716          f = new CompletableFuture<>();
717          g = f.handle(r = new IntegerHandler());
718 <        assertFalse(r.ran);
718 >        assertEquals(0, r.invocationCount);
719          f.complete(one);
720 <        assertTrue(r.ran);
720 >        assertEquals(1, r.invocationCount);
721          checkCompletedNormally(g, two);
722      }
723  
# Line 710 | Line 728 | public class CompletableFutureTest exten
728          Noop r = new Noop();
729          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
730          assertNull(f.join());
731 <        assertTrue(r.ran);
731 >        assertEquals(1, r.invocationCount);
732          checkCompletedNormally(f, null);
733      }
734  
# Line 722 | Line 740 | public class CompletableFutureTest exten
740          ThreadExecutor exec = new ThreadExecutor();
741          CompletableFuture<Void> f = CompletableFuture.runAsync(r, exec);
742          assertNull(f.join());
743 <        assertTrue(r.ran);
743 >        assertEquals(1, r.invocationCount);
744          checkCompletedNormally(f, null);
745          assertEquals(1, exec.count.get());
746      }
# Line 734 | Line 752 | public class CompletableFutureTest exten
752          FailingNoop r = new FailingNoop();
753          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
754          checkCompletedWithWrappedCFException(f);
755 <        assertTrue(r.ran);
755 >        assertEquals(1, r.invocationCount);
756      }
757  
758      /**
# Line 764 | Line 782 | public class CompletableFutureTest exten
782          FailingSupplier r = new FailingSupplier();
783          CompletableFuture<Integer> f = CompletableFuture.supplyAsync(r);
784          checkCompletedWithWrappedCFException(f);
785 <        assertTrue(r.ran);
785 >        assertEquals(1, r.invocationCount);
786      }
787  
788      // seq completion methods
# Line 781 | Line 799 | public class CompletableFutureTest exten
799          g = f.thenRun(r = new Noop());
800          f.complete(null);
801          checkCompletedNormally(g, null);
802 <        assertTrue(r.ran);
802 >        assertEquals(1, r.invocationCount);
803  
804          f = new CompletableFuture<>();
805          f.complete(null);
806          g = f.thenRun(r = new Noop());
807          checkCompletedNormally(g, null);
808 <        assertTrue(r.ran);
808 >        assertEquals(1, r.invocationCount);
809      }
810  
811      /**
# Line 803 | Line 821 | public class CompletableFutureTest exten
821          g = f.thenRun(r = new Noop());
822          f.completeExceptionally(new CFException());
823          checkCompletedWithWrappedCFException(g);
824 <        assertFalse(r.ran);
824 >        assertEquals(0, r.invocationCount);
825  
826          f = new CompletableFuture<>();
827          f.completeExceptionally(new CFException());
828          g = f.thenRun(r = new Noop());
829          checkCompletedWithWrappedCFException(g);
830 <        assertFalse(r.ran);
830 >        assertEquals(0, r.invocationCount);
831      }
832  
833      /**
# Line 924 | Line 942 | public class CompletableFutureTest exten
942          CompletableFuture<Void> g = f.thenAccept(r);
943          f.complete(one);
944          checkCompletedWithWrappedCFException(g);
945 <        assertTrue(r.ran);
945 >        assertEquals(1, r.invocationCount);
946      }
947  
948      /**
# Line 943 | Line 961 | public class CompletableFutureTest exten
961       * of sources
962       */
963      public void testThenCombine_normalCompletion1() {
964 +        for (boolean createIncomplete : new boolean[] { true, false })
965 +        for (boolean fFirst : new boolean[] { true, false })
966          for (ExecutionMode m : ExecutionMode.values())
967          for (Integer v1 : new Integer[] { 1, null })
968          for (Integer v2 : new Integer[] { 2, null }) {
# Line 950 | Line 970 | public class CompletableFutureTest exten
970          final CompletableFuture<Integer> f = new CompletableFuture<>();
971          final CompletableFuture<Integer> g = new CompletableFuture<>();
972          final SubtractFunction r = new SubtractFunction();
973 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
973 >        CompletableFuture<Integer> h = null;
974 >        if (createIncomplete) h = m.thenCombine(f, g, r);
975  
976 <        f.complete(v1);
977 <        checkIncomplete(h);
978 <        assertFalse(r.ran());
979 <        g.complete(v2);
980 <
981 <        checkCompletedNormally(h, subtract(v1, v2));
982 <        checkCompletedNormally(f, v1);
983 <        checkCompletedNormally(g, v2);
984 <        }
985 <    }
986 <
966 <    public void testThenCombine_normalCompletion2() {
967 <        for (ExecutionMode m : ExecutionMode.values())
968 <        for (Integer v1 : new Integer[] { 1, null })
969 <        for (Integer v2 : new Integer[] { 2, null }) {
970 <
971 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
972 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
973 <        final SubtractFunction r = new SubtractFunction();
974 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
975 <
976 <        g.complete(v2);
977 <        checkIncomplete(h);
978 <        assertFalse(r.ran());
979 <        f.complete(v1);
980 <
981 <        checkCompletedNormally(h, subtract(v1, v2));
982 <        checkCompletedNormally(f, v1);
983 <        checkCompletedNormally(g, v2);
984 <        }
985 <    }
986 <
987 <    public void testThenCombine_normalCompletion3() {
988 <        for (ExecutionMode m : ExecutionMode.values())
989 <        for (Integer v1 : new Integer[] { 1, null })
990 <        for (Integer v2 : new Integer[] { 2, null }) {
991 <
992 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
993 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
994 <        final SubtractFunction r = new SubtractFunction();
995 <
996 <        g.complete(v2);
997 <        f.complete(v1);
998 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
999 <
1000 <        checkCompletedNormally(h, subtract(v1, v2));
1001 <        checkCompletedNormally(f, v1);
1002 <        checkCompletedNormally(g, v2);
1003 <        }
1004 <    }
1005 <
1006 <    public void testThenCombine_normalCompletion4() {
1007 <        for (ExecutionMode m : ExecutionMode.values())
1008 <        for (Integer v1 : new Integer[] { 1, null })
1009 <        for (Integer v2 : new Integer[] { 2, null }) {
1010 <
1011 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1012 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1013 <        final SubtractFunction r = new SubtractFunction();
1014 <
1015 <        f.complete(v1);
1016 <        g.complete(v2);
1017 <        final CompletableFuture<Integer> h = m.thenCombine(f, g, r);
976 >        if (fFirst)
977 >            f.complete(v1);
978 >        else
979 >            g.complete(v2);
980 >        if (createIncomplete) checkIncomplete(h);
981 >        assertEquals(0, r.invocationCount);
982 >        if (!fFirst)
983 >            f.complete(v1);
984 >        else
985 >            g.complete(v2);
986 >        if (!createIncomplete) h = m.thenCombine(f, g, r);
987  
988          checkCompletedNormally(h, subtract(v1, v2));
989          checkCompletedNormally(f, v1);
990          checkCompletedNormally(g, v2);
991 +        assertEquals(1, r.invocationCount);
992          }
993      }
994  
# Line 1042 | Line 1012 | public class CompletableFutureTest exten
1012  
1013          checkCompletedWithWrappedCFException(h, ex);
1014          checkCompletedWithWrappedCFException(f, ex);
1015 <        assertFalse(r.ran());
1015 >        assertEquals(0, r.invocationCount);
1016          checkCompletedNormally(g, v1);
1017          }
1018      }
# Line 1063 | Line 1033 | public class CompletableFutureTest exten
1033  
1034          checkCompletedWithWrappedCFException(h, ex);
1035          checkCompletedWithWrappedCFException(g, ex);
1036 <        assertFalse(r.ran());
1036 >        assertEquals(0, r.invocationCount);
1037          checkCompletedNormally(f, v1);
1038          }
1039      }
# Line 1083 | Line 1053 | public class CompletableFutureTest exten
1053  
1054          checkCompletedWithWrappedCFException(h, ex);
1055          checkCompletedWithWrappedCFException(g, ex);
1056 <        assertFalse(r.ran());
1056 >        assertEquals(0, r.invocationCount);
1057          checkCompletedNormally(f, v1);
1058          }
1059      }
# Line 1103 | Line 1073 | public class CompletableFutureTest exten
1073  
1074          checkCompletedWithWrappedCFException(h, ex);
1075          checkCompletedWithWrappedCFException(f, ex);
1076 <        assertFalse(r.ran());
1076 >        assertEquals(0, r.invocationCount);
1077          checkCompletedNormally(g, v1);
1078          }
1079      }
# Line 1170 | Line 1140 | public class CompletableFutureTest exten
1140  
1141          checkCompletedWithWrappedCancellationException(h);
1142          checkCancelled(f);
1143 <        assertFalse(r.ran());
1143 >        assertEquals(0, r.invocationCount);
1144          checkCompletedNormally(g, v1);
1145          }
1146      }
# Line 1191 | Line 1161 | public class CompletableFutureTest exten
1161  
1162          checkCompletedWithWrappedCancellationException(h);
1163          checkCancelled(g);
1164 <        assertFalse(r.ran());
1164 >        assertEquals(0, r.invocationCount);
1165          checkCompletedNormally(f, v1);
1166          }
1167      }
# Line 1211 | Line 1181 | public class CompletableFutureTest exten
1181  
1182          checkCompletedWithWrappedCancellationException(h);
1183          checkCancelled(g);
1184 <        assertFalse(r.ran());
1184 >        assertEquals(0, r.invocationCount);
1185          checkCompletedNormally(f, v1);
1186          }
1187      }
# Line 1231 | Line 1201 | public class CompletableFutureTest exten
1201  
1202          checkCompletedWithWrappedCancellationException(h);
1203          checkCancelled(f);
1204 <        assertFalse(r.ran());
1204 >        assertEquals(0, r.invocationCount);
1205          checkCompletedNormally(g, v1);
1206          }
1207      }
# Line 1252 | Line 1222 | public class CompletableFutureTest exten
1222  
1223          f.complete(v1);
1224          checkIncomplete(h);
1225 <        assertFalse(r.ran());
1225 >        assertEquals(0, r.invocationCount);
1226          g.complete(v2);
1227  
1228          checkCompletedNormally(h, null);
# Line 1274 | Line 1244 | public class CompletableFutureTest exten
1244  
1245          g.complete(v2);
1246          checkIncomplete(h);
1247 <        assertFalse(r.ran());
1247 >        assertEquals(0, r.invocationCount);
1248          f.complete(v1);
1249  
1250          checkCompletedNormally(h, null);
# Line 1344 | Line 1314 | public class CompletableFutureTest exten
1314  
1315          checkCompletedWithWrappedCFException(h, ex);
1316          checkCompletedWithWrappedCFException(f, ex);
1317 <        assertFalse(r.ran());
1317 >        assertEquals(0, r.invocationCount);
1318          checkCompletedNormally(g, v1);
1319          }
1320      }
# Line 1365 | Line 1335 | public class CompletableFutureTest exten
1335  
1336          checkCompletedWithWrappedCFException(h, ex);
1337          checkCompletedWithWrappedCFException(g, ex);
1338 <        assertFalse(r.ran());
1338 >        assertEquals(0, r.invocationCount);
1339          checkCompletedNormally(f, v1);
1340          }
1341      }
# Line 1385 | Line 1355 | public class CompletableFutureTest exten
1355  
1356          checkCompletedWithWrappedCFException(h, ex);
1357          checkCompletedWithWrappedCFException(g, ex);
1358 <        assertFalse(r.ran());
1358 >        assertEquals(0, r.invocationCount);
1359          checkCompletedNormally(f, v1);
1360          }
1361      }
# Line 1405 | Line 1375 | public class CompletableFutureTest exten
1375  
1376          checkCompletedWithWrappedCFException(h, ex);
1377          checkCompletedWithWrappedCFException(f, ex);
1378 <        assertFalse(r.ran());
1378 >        assertEquals(0, r.invocationCount);
1379          checkCompletedNormally(g, v1);
1380          }
1381      }
# Line 1472 | Line 1442 | public class CompletableFutureTest exten
1442  
1443          checkCompletedWithWrappedCancellationException(h);
1444          checkCancelled(f);
1445 <        assertFalse(r.ran());
1445 >        assertEquals(0, r.invocationCount);
1446          checkCompletedNormally(g, v1);
1447          }
1448      }
# Line 1493 | Line 1463 | public class CompletableFutureTest exten
1463  
1464          checkCompletedWithWrappedCancellationException(h);
1465          checkCancelled(g);
1466 <        assertFalse(r.ran());
1466 >        assertEquals(0, r.invocationCount);
1467          checkCompletedNormally(f, v1);
1468          }
1469      }
# Line 1513 | Line 1483 | public class CompletableFutureTest exten
1483  
1484          checkCompletedWithWrappedCancellationException(h);
1485          checkCancelled(g);
1486 <        assertFalse(r.ran());
1486 >        assertEquals(0, r.invocationCount);
1487          checkCompletedNormally(f, v1);
1488          }
1489      }
# Line 1533 | Line 1503 | public class CompletableFutureTest exten
1503  
1504          checkCompletedWithWrappedCancellationException(h);
1505          checkCancelled(f);
1506 <        assertFalse(r.ran());
1506 >        assertEquals(0, r.invocationCount);
1507          checkCompletedNormally(g, v1);
1508          }
1509      }
# Line 1554 | Line 1524 | public class CompletableFutureTest exten
1524  
1525          f.complete(v1);
1526          checkIncomplete(h);
1527 <        assertFalse(r.ran);
1527 >        assertEquals(0, r.invocationCount);
1528          g.complete(v2);
1529  
1530          checkCompletedNormally(h, null);
1531 <        assertTrue(r.ran);
1531 >        assertEquals(1, r.invocationCount);
1532          checkCompletedNormally(f, v1);
1533          checkCompletedNormally(g, v2);
1534          }
# Line 1576 | Line 1546 | public class CompletableFutureTest exten
1546  
1547          g.complete(v2);
1548          checkIncomplete(h);
1549 <        assertFalse(r.ran);
1549 >        assertEquals(0, r.invocationCount);
1550          f.complete(v1);
1551  
1552          checkCompletedNormally(h, null);
1553 <        assertTrue(r.ran);
1553 >        assertEquals(1, r.invocationCount);
1554          checkCompletedNormally(f, v1);
1555          checkCompletedNormally(g, v2);
1556          }
# Line 1600 | Line 1570 | public class CompletableFutureTest exten
1570          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1571  
1572          checkCompletedNormally(h, null);
1573 <        assertTrue(r.ran);
1573 >        assertEquals(1, r.invocationCount);
1574          checkCompletedNormally(f, v1);
1575          checkCompletedNormally(g, v2);
1576          }
# Line 1620 | Line 1590 | public class CompletableFutureTest exten
1590          final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1591  
1592          checkCompletedNormally(h, null);
1593 <        assertTrue(r.ran);
1593 >        assertEquals(1, r.invocationCount);
1594          checkCompletedNormally(f, v1);
1595          checkCompletedNormally(g, v2);
1596          }
# Line 1646 | Line 1616 | public class CompletableFutureTest exten
1616  
1617          checkCompletedWithWrappedCFException(h, ex);
1618          checkCompletedWithWrappedCFException(f, ex);
1619 <        assertFalse(r.ran);
1619 >        assertEquals(0, r.invocationCount);
1620          checkCompletedNormally(g, v1);
1621          }
1622      }
# Line 1667 | Line 1637 | public class CompletableFutureTest exten
1637  
1638          checkCompletedWithWrappedCFException(h, ex);
1639          checkCompletedWithWrappedCFException(g, ex);
1640 <        assertFalse(r.ran);
1640 >        assertEquals(0, r.invocationCount);
1641          checkCompletedNormally(f, v1);
1642          }
1643      }
# Line 1687 | Line 1657 | public class CompletableFutureTest exten
1657  
1658          checkCompletedWithWrappedCFException(h, ex);
1659          checkCompletedWithWrappedCFException(g, ex);
1660 <        assertFalse(r.ran);
1660 >        assertEquals(0, r.invocationCount);
1661          checkCompletedNormally(f, v1);
1662          }
1663      }
# Line 1707 | Line 1677 | public class CompletableFutureTest exten
1677  
1678          checkCompletedWithWrappedCFException(h, ex);
1679          checkCompletedWithWrappedCFException(f, ex);
1680 <        assertFalse(r.ran);
1680 >        assertEquals(0, r.invocationCount);
1681          checkCompletedNormally(g, v1);
1682          }
1683      }
# Line 1774 | Line 1744 | public class CompletableFutureTest exten
1744  
1745          checkCompletedWithWrappedCancellationException(h);
1746          checkCancelled(f);
1747 <        assertFalse(r.ran);
1747 >        assertEquals(0, r.invocationCount);
1748          checkCompletedNormally(g, v1);
1749          }
1750      }
# Line 1795 | Line 1765 | public class CompletableFutureTest exten
1765  
1766          checkCompletedWithWrappedCancellationException(h);
1767          checkCancelled(g);
1768 <        assertFalse(r.ran);
1768 >        assertEquals(0, r.invocationCount);
1769          checkCompletedNormally(f, v1);
1770          }
1771      }
# Line 1815 | Line 1785 | public class CompletableFutureTest exten
1785  
1786          checkCompletedWithWrappedCancellationException(h);
1787          checkCancelled(g);
1788 <        assertFalse(r.ran);
1788 >        assertEquals(0, r.invocationCount);
1789          checkCompletedNormally(f, v1);
1790          }
1791      }
# Line 1835 | Line 1805 | public class CompletableFutureTest exten
1805  
1806          checkCompletedWithWrappedCancellationException(h);
1807          checkCancelled(f);
1808 <        assertFalse(r.ran);
1808 >        assertEquals(0, r.invocationCount);
1809          checkCompletedNormally(g, v1);
1810          }
1811      }
# Line 1902 | Line 1872 | public class CompletableFutureTest exten
1872          // unspecified behavior
1873          assertTrue(Objects.equals(h.join(), inc(v1)) ||
1874                     Objects.equals(h.join(), inc(v2)));
1875 +        assertEquals(1, r.invocationCount);
1876          }
1877      }
1878  
# Line 1923 | Line 1894 | public class CompletableFutureTest exten
1894          checkCompletedWithWrappedCFException(h, ex);
1895          g.complete(v1);
1896  
1897 <        assertFalse(r.ran());
1897 >        assertEquals(0, r.invocationCount);
1898          checkCompletedNormally(g, v1);
1899          checkCompletedWithWrappedCFException(f, ex);
1900          checkCompletedWithWrappedCFException(h, ex);
# Line 1944 | Line 1915 | public class CompletableFutureTest exten
1915          checkCompletedWithWrappedCFException(h, ex);
1916          f.complete(v1);
1917  
1918 <        assertFalse(r.ran());
1918 >        assertEquals(0, r.invocationCount);
1919          checkCompletedNormally(f, v1);
1920          checkCompletedWithWrappedCFException(g, ex);
1921          checkCompletedWithWrappedCFException(h, ex);
# Line 1968 | Line 1939 | public class CompletableFutureTest exten
1939          Integer v;
1940          try {
1941              assertEquals(h.join(), inc(v1));
1942 <            assertTrue(r.ran());
1942 >            assertEquals(1, r.invocationCount);
1943          } catch (CompletionException ok) {
1944              checkCompletedWithWrappedCFException(h, ex);
1945 <            assertFalse(r.ran());
1945 >            assertEquals(0, r.invocationCount);
1946          }
1947  
1948          checkCompletedWithWrappedCFException(g, ex);
# Line 1996 | Line 1967 | public class CompletableFutureTest exten
1967          Integer v;
1968          try {
1969              assertEquals(h.join(), inc(v1));
1970 <            assertTrue(r.ran());
1970 >            assertEquals(1, r.invocationCount);
1971          } catch (CompletionException ok) {
1972              checkCompletedWithWrappedCFException(h, ex);
1973 <            assertFalse(r.ran());
1973 >            assertEquals(0, r.invocationCount);
1974          }
1975  
1976          checkCompletedWithWrappedCFException(f, ex);
2006        assertFalse(r.ran());
1977          checkCompletedNormally(g, v1);
1978          }
1979      }
# Line 2065 | Line 2035 | public class CompletableFutureTest exten
2035          g.complete(v1);
2036  
2037          checkCancelled(f);
2038 <        assertFalse(r.ran());
2038 >        assertEquals(0, r.invocationCount);
2039          checkCompletedNormally(g, v1);
2040          checkCompletedWithWrappedCancellationException(h);
2041          }
# Line 2086 | Line 2056 | public class CompletableFutureTest exten
2056          f.complete(v1);
2057  
2058          checkCancelled(g);
2059 <        assertFalse(r.ran());
2059 >        assertEquals(0, r.invocationCount);
2060          checkCompletedNormally(f, v1);
2061          checkCompletedWithWrappedCancellationException(h);
2062          }
# Line 2109 | Line 2079 | public class CompletableFutureTest exten
2079          Integer v;
2080          try {
2081              assertEquals(h.join(), inc(v1));
2082 <            assertTrue(r.ran());
2082 >            assertEquals(1, r.invocationCount);
2083          } catch (CompletionException ok) {
2084              checkCompletedWithWrappedCancellationException(h);
2085 <            assertFalse(r.ran());
2085 >            assertEquals(0, r.invocationCount);
2086          }
2087  
2088          checkCancelled(g);
# Line 2137 | Line 2107 | public class CompletableFutureTest exten
2107          Integer v;
2108          try {
2109              assertEquals(h.join(), inc(v1));
2110 <            assertTrue(r.ran());
2110 >            assertEquals(1, r.invocationCount);
2111          } catch (CompletionException ok) {
2112              checkCompletedWithWrappedCancellationException(h);
2113 <            assertFalse(r.ran());
2113 >            assertEquals(0, r.invocationCount);
2114          }
2115  
2116          checkCancelled(f);
# Line 2234 | Line 2204 | public class CompletableFutureTest exten
2204          checkCompletedWithWrappedCFException(h, ex);
2205          g.complete(v1);
2206  
2207 <        assertFalse(r.ran());
2207 >        assertEquals(0, r.invocationCount);
2208          checkCompletedNormally(g, v1);
2209          checkCompletedWithWrappedCFException(f, ex);
2210          checkCompletedWithWrappedCFException(h, ex);
# Line 2255 | Line 2225 | public class CompletableFutureTest exten
2225          checkCompletedWithWrappedCFException(h, ex);
2226          f.complete(v1);
2227  
2228 <        assertFalse(r.ran());
2228 >        assertEquals(0, r.invocationCount);
2229          checkCompletedNormally(f, v1);
2230          checkCompletedWithWrappedCFException(g, ex);
2231          checkCompletedWithWrappedCFException(h, ex);
# Line 2279 | Line 2249 | public class CompletableFutureTest exten
2249          Integer v;
2250          try {
2251              assertEquals(h.join(), null);
2252 <            assertTrue(r.ran());
2252 >            assertEquals(1, r.invocationCount);
2253              assertEquals(inc(v1), r.value);
2254          } catch (CompletionException ok) {
2255              checkCompletedWithWrappedCFException(h, ex);
2256 <            assertFalse(r.ran());
2256 >            assertEquals(0, r.invocationCount);
2257          }
2258  
2259          checkCompletedWithWrappedCFException(g, ex);
# Line 2308 | Line 2278 | public class CompletableFutureTest exten
2278          Integer v;
2279          try {
2280              assertEquals(h.join(), null);
2281 <            assertTrue(r.ran());
2281 >            assertEquals(1, r.invocationCount);
2282              assertEquals(inc(v1), r.value);
2283          } catch (CompletionException ok) {
2284              checkCompletedWithWrappedCFException(h, ex);
2285 <            assertFalse(r.ran());
2285 >            assertEquals(0, r.invocationCount);
2286          }
2287  
2288          checkCompletedWithWrappedCFException(f, ex);
2319        assertFalse(r.ran());
2289          checkCompletedNormally(g, v1);
2290          }
2291      }
# Line 2378 | Line 2347 | public class CompletableFutureTest exten
2347          g.complete(v1);
2348  
2349          checkCancelled(f);
2350 <        assertFalse(r.ran());
2350 >        assertEquals(0, r.invocationCount);
2351          checkCompletedNormally(g, v1);
2352          checkCompletedWithWrappedCancellationException(h);
2353          }
# Line 2399 | Line 2368 | public class CompletableFutureTest exten
2368          f.complete(v1);
2369  
2370          checkCancelled(g);
2371 <        assertFalse(r.ran());
2371 >        assertEquals(0, r.invocationCount);
2372          checkCompletedNormally(f, v1);
2373          checkCompletedWithWrappedCancellationException(h);
2374          }
# Line 2422 | Line 2391 | public class CompletableFutureTest exten
2391          Integer v;
2392          try {
2393              assertEquals(h.join(), null);
2394 <            assertTrue(r.ran());
2394 >            assertEquals(1, r.invocationCount);
2395              assertEquals(inc(v1), r.value);
2396          } catch (CompletionException ok) {
2397              checkCompletedWithWrappedCancellationException(h);
2398 <            assertFalse(r.ran());
2398 >            assertEquals(0, r.invocationCount);
2399          }
2400  
2401          checkCancelled(g);
# Line 2451 | Line 2420 | public class CompletableFutureTest exten
2420          Integer v;
2421          try {
2422              assertEquals(h.join(), null);
2423 <            assertTrue(r.ran());
2423 >            assertEquals(1, r.invocationCount);
2424              assertEquals(inc(v1), r.value);
2425          } catch (CompletionException ok) {
2426              checkCompletedWithWrappedCancellationException(h);
2427 <            assertFalse(r.ran());
2427 >            assertEquals(0, r.invocationCount);
2428          }
2429  
2430          checkCancelled(f);
# Line 2467 | Line 2436 | public class CompletableFutureTest exten
2436       * runAfterEither result completes normally after normal completion
2437       * of either source
2438       */
2439 <    public void testRunAfterEither() {
2440 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2441 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2442 <        Noop r = new Noop();
2474 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2475 <        f.complete(one);
2476 <        checkCompletedNormally(g, null);
2477 <        f2.complete(one);
2478 <        checkCompletedNormally(g, null);
2479 <        assertTrue(r.ran);
2439 >    public void testRunAfterEither_normalCompletion1() {
2440 >        for (ExecutionMode m : ExecutionMode.values())
2441 >        for (Integer v1 : new Integer[] { 1, null })
2442 >        for (Integer v2 : new Integer[] { 2, null }) {
2443  
2444 <        r = new Noop();
2445 <        f = new CompletableFuture<>();
2446 <        f.complete(one);
2447 <        f2 = new CompletableFuture<>();
2448 <        g = f.runAfterEither(f2, r);
2449 <        checkCompletedNormally(g, null);
2450 <        assertTrue(r.ran);
2444 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2445 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2446 >        final Noop r = new Noop();
2447 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2448 >
2449 >        f.complete(v1);
2450 >        checkCompletedNormally(h, null);
2451 >        assertEquals(1, r.invocationCount);
2452 >        g.complete(v2);
2453 >
2454 >        checkCompletedNormally(f, v1);
2455 >        checkCompletedNormally(g, v2);
2456 >        checkCompletedNormally(h, null);
2457 >        assertEquals(1, r.invocationCount);
2458 >        }
2459 >    }
2460 >
2461 >    public void testRunAfterEither_normalCompletion2() {
2462 >        for (ExecutionMode m : ExecutionMode.values())
2463 >        for (Integer v1 : new Integer[] { 1, null })
2464 >        for (Integer v2 : new Integer[] { 2, null }) {
2465 >
2466 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2467 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2468 >        final Noop r = new Noop();
2469 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2470 >
2471 >        g.complete(v2);
2472 >        checkCompletedNormally(h, null);
2473 >        assertEquals(1, r.invocationCount);
2474 >        f.complete(v1);
2475 >
2476 >        checkCompletedNormally(f, v1);
2477 >        checkCompletedNormally(g, v2);
2478 >        checkCompletedNormally(h, null);
2479 >        assertEquals(1, r.invocationCount);
2480 >        }
2481 >    }
2482 >    public void testRunAfterEither_normalCompletion3() {
2483 >        for (ExecutionMode m : ExecutionMode.values())
2484 >        for (Integer v1 : new Integer[] { 1, null })
2485 >        for (Integer v2 : new Integer[] { 2, null }) {
2486 >
2487 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2488 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2489 >        final Noop r = new Noop();
2490 >
2491 >        f.complete(v1);
2492 >        g.complete(v2);
2493 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2494 >
2495 >        checkCompletedNormally(h, null);
2496 >        checkCompletedNormally(f, v1);
2497 >        checkCompletedNormally(g, v2);
2498 >        assertEquals(1, r.invocationCount);
2499 >        }
2500      }
2501  
2502      /**
2503       * runAfterEither result completes exceptionally after exceptional
2504       * completion of either source
2505       */
2506 <    public void testRunAfterEither2() {
2507 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2508 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2497 <        Noop r = new Noop();
2498 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2499 <        f.completeExceptionally(new CFException());
2500 <        f2.complete(one);
2501 <        checkCompletedWithWrappedCFException(g);
2506 >    public void testRunAfterEither_exceptionalCompletion1() {
2507 >        for (ExecutionMode m : ExecutionMode.values())
2508 >        for (Integer v1 : new Integer[] { 1, null }) {
2509  
2510 <        r = new Noop();
2511 <        f = new CompletableFuture<>();
2512 <        f2 = new CompletableFuture<>();
2513 <        f2.completeExceptionally(new CFException());
2514 <        g = f.runAfterEither(f2, r);
2515 <        checkCompletedWithWrappedCFException(g);
2510 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2511 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2512 >        final Noop r = new Noop();
2513 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2514 >        final CFException ex = new CFException();
2515 >
2516 >        f.completeExceptionally(ex);
2517 >        checkCompletedWithWrappedCFException(h, ex);
2518 >        g.complete(v1);
2519 >
2520 >        assertEquals(0, r.invocationCount);
2521 >        checkCompletedNormally(g, v1);
2522 >        checkCompletedWithWrappedCFException(f, ex);
2523 >        checkCompletedWithWrappedCFException(h, ex);
2524 >        }
2525 >    }
2526 >
2527 >    public void testRunAfterEither_exceptionalCompletion2() {
2528 >        for (ExecutionMode m : ExecutionMode.values())
2529 >        for (Integer v1 : new Integer[] { 1, null }) {
2530 >
2531 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2532 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2533 >        final Noop r = new Noop();
2534 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2535 >        final CFException ex = new CFException();
2536 >
2537 >        g.completeExceptionally(ex);
2538 >        checkCompletedWithWrappedCFException(h, ex);
2539 >        f.complete(v1);
2540 >
2541 >        assertEquals(0, r.invocationCount);
2542 >        checkCompletedNormally(f, v1);
2543 >        checkCompletedWithWrappedCFException(g, ex);
2544 >        checkCompletedWithWrappedCFException(h, ex);
2545 >        }
2546 >    }
2547 >
2548 >    public void testRunAfterEither_exceptionalCompletion3() {
2549 >        for (ExecutionMode m : ExecutionMode.values())
2550 >        for (Integer v1 : new Integer[] { 1, null }) {
2551 >
2552 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2553 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2554 >        final Noop r = new Noop();
2555 >        final CFException ex = new CFException();
2556 >
2557 >        g.completeExceptionally(ex);
2558 >        f.complete(v1);
2559 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2560 >
2561 >        // unspecified behavior
2562 >        Integer v;
2563 >        try {
2564 >            assertEquals(h.join(), null);
2565 >            assertEquals(1, r.invocationCount);
2566 >        } catch (CompletionException ok) {
2567 >            checkCompletedWithWrappedCFException(h, ex);
2568 >            assertEquals(0, r.invocationCount);
2569 >        }
2570 >
2571 >        checkCompletedWithWrappedCFException(g, ex);
2572 >        checkCompletedNormally(f, v1);
2573 >        }
2574 >    }
2575 >
2576 >    public void testRunAfterEither_exceptionalCompletion4() {
2577 >        for (ExecutionMode m : ExecutionMode.values())
2578 >        for (Integer v1 : new Integer[] { 1, null }) {
2579 >
2580 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2581 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2582 >        final Noop r = new Noop();
2583 >        final CFException ex = new CFException();
2584 >
2585 >        f.completeExceptionally(ex);
2586 >        g.complete(v1);
2587 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2588 >
2589 >        // unspecified behavior
2590 >        Integer v;
2591 >        try {
2592 >            assertEquals(h.join(), null);
2593 >            assertEquals(1, r.invocationCount);
2594 >        } catch (CompletionException ok) {
2595 >            checkCompletedWithWrappedCFException(h, ex);
2596 >            assertEquals(0, r.invocationCount);
2597 >        }
2598 >
2599 >        checkCompletedWithWrappedCFException(f, ex);
2600 >        checkCompletedNormally(g, v1);
2601 >        }
2602      }
2603  
2604      /**
2605       * runAfterEither result completes exceptionally if action does
2606       */
2607 <    public void testRunAfterEither3() {
2608 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2609 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2610 <        FailingNoop r = new FailingNoop();
2611 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2612 <        f2.complete(two);
2613 <        checkCompletedWithWrappedCFException(g);
2607 >    public void testRunAfterEither_actionFailed1() {
2608 >        for (ExecutionMode m : ExecutionMode.values())
2609 >        for (Integer v1 : new Integer[] { 1, null })
2610 >        for (Integer v2 : new Integer[] { 2, null }) {
2611 >
2612 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2613 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2614 >        final FailingNoop r = new FailingNoop();
2615 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2616 >
2617 >        f.complete(v1);
2618 >        checkCompletedWithWrappedCFException(h);
2619 >        g.complete(v2);
2620 >        checkCompletedNormally(f, v1);
2621 >        checkCompletedNormally(g, v2);
2622 >        }
2623 >    }
2624 >
2625 >    public void testRunAfterEither_actionFailed2() {
2626 >        for (ExecutionMode m : ExecutionMode.values())
2627 >        for (Integer v1 : new Integer[] { 1, null })
2628 >        for (Integer v2 : new Integer[] { 2, null }) {
2629 >
2630 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2631 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2632 >        final FailingNoop r = new FailingNoop();
2633 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2634 >
2635 >        g.complete(v2);
2636 >        checkCompletedWithWrappedCFException(h);
2637 >        f.complete(v1);
2638 >        checkCompletedNormally(f, v1);
2639 >        checkCompletedNormally(g, v2);
2640 >        }
2641      }
2642  
2643      /**
2644       * runAfterEither result completes exceptionally if either source cancelled
2645       */
2646 <    public void testRunAfterEither4() {
2647 <        CompletableFuture<Integer> f = new CompletableFuture<>();
2648 <        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2649 <        Noop r = new Noop();
2650 <        CompletableFuture<Void> g = f.runAfterEither(f2, r);
2651 <        assertTrue(f.cancel(true));
2652 <        checkCompletedWithWrappedCancellationException(g);
2653 <        f = new CompletableFuture<>();
2654 <        f2 = new CompletableFuture<>();
2655 <        assertTrue(f2.cancel(true));
2656 <        checkCompletedWithWrappedCancellationException(g);
2646 >    public void testRunAfterEither_sourceCancelled1() {
2647 >        for (ExecutionMode m : ExecutionMode.values())
2648 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2649 >        for (Integer v1 : new Integer[] { 1, null }) {
2650 >
2651 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2652 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2653 >        final Noop r = new Noop();
2654 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2655 >
2656 >        assertTrue(f.cancel(mayInterruptIfRunning));
2657 >        checkCompletedWithWrappedCancellationException(h);
2658 >        g.complete(v1);
2659 >
2660 >        checkCancelled(f);
2661 >        assertEquals(0, r.invocationCount);
2662 >        checkCompletedNormally(g, v1);
2663 >        checkCompletedWithWrappedCancellationException(h);
2664 >        }
2665 >    }
2666 >
2667 >    public void testRunAfterEither_sourceCancelled2() {
2668 >        for (ExecutionMode m : ExecutionMode.values())
2669 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2670 >        for (Integer v1 : new Integer[] { 1, null }) {
2671 >
2672 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2673 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2674 >        final Noop r = new Noop();
2675 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2676 >
2677 >        assertTrue(g.cancel(mayInterruptIfRunning));
2678 >        checkCompletedWithWrappedCancellationException(h);
2679 >        f.complete(v1);
2680 >
2681 >        checkCancelled(g);
2682 >        assertEquals(0, r.invocationCount);
2683 >        checkCompletedNormally(f, v1);
2684 >        checkCompletedWithWrappedCancellationException(h);
2685 >        }
2686 >    }
2687 >
2688 >    public void testRunAfterEither_sourceCancelled3() {
2689 >        for (ExecutionMode m : ExecutionMode.values())
2690 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2691 >        for (Integer v1 : new Integer[] { 1, null }) {
2692 >
2693 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2694 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2695 >        final Noop r = new Noop();
2696 >
2697 >        assertTrue(g.cancel(mayInterruptIfRunning));
2698 >        f.complete(v1);
2699 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2700 >
2701 >        // unspecified behavior
2702 >        Integer v;
2703 >        try {
2704 >            assertEquals(h.join(), null);
2705 >            assertEquals(1, r.invocationCount);
2706 >        } catch (CompletionException ok) {
2707 >            checkCompletedWithWrappedCancellationException(h);
2708 >            assertEquals(0, r.invocationCount);
2709 >        }
2710 >
2711 >        checkCancelled(g);
2712 >        checkCompletedNormally(f, v1);
2713 >        }
2714 >    }
2715 >
2716 >    public void testRunAfterEither_sourceCancelled4() {
2717 >        for (ExecutionMode m : ExecutionMode.values())
2718 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2719 >        for (Integer v1 : new Integer[] { 1, null }) {
2720 >
2721 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2722 >        final CompletableFuture<Integer> g = new CompletableFuture<>();
2723 >        final Noop r = new Noop();
2724 >
2725 >        assertTrue(f.cancel(mayInterruptIfRunning));
2726 >        g.complete(v1);
2727 >        final CompletableFuture<Void> h = m.runAfterEither(f, g, r);
2728 >
2729 >        // unspecified behavior
2730 >        Integer v;
2731 >        try {
2732 >            assertEquals(h.join(), null);
2733 >            assertEquals(1, r.invocationCount);
2734 >        } catch (CompletionException ok) {
2735 >            checkCompletedWithWrappedCancellationException(h);
2736 >            assertEquals(0, r.invocationCount);
2737 >        }
2738 >
2739 >        checkCancelled(f);
2740 >        checkCompletedNormally(g, v1);
2741 >        }
2742      }
2743  
2744      /**
2745       * thenCompose result completes normally after normal completion of source
2746       */
2747 <    public void testThenCompose() {
2748 <        CompletableFuture<Integer> f, g;
2749 <        CompletableFutureInc r;
2747 >    public void testThenCompose_normalCompletion1() {
2748 >        for (ExecutionMode m : ExecutionMode.values())
2749 >        for (Integer v1 : new Integer[] { 1, null }) {
2750  
2751 <        f = new CompletableFuture<>();
2752 <        g = f.thenCompose(r = new CompletableFutureInc());
2753 <        f.complete(one);
2754 <        checkCompletedNormally(g, two);
2755 <        assertTrue(r.ran);
2751 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2752 >        final CompletableFutureInc r = new CompletableFutureInc();
2753 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2754 >        f.complete(v1);
2755 >        checkCompletedNormally(g, inc(v1));
2756 >        checkCompletedNormally(f, v1);
2757 >        assertEquals(1, r.invocationCount);
2758 >        }
2759 >    }
2760  
2761 <        f = new CompletableFuture<>();
2762 <        f.complete(one);
2763 <        g = f.thenCompose(r = new CompletableFutureInc());
2764 <        checkCompletedNormally(g, two);
2765 <        assertTrue(r.ran);
2761 >    public void testThenCompose_normalCompletion2() {
2762 >        for (ExecutionMode m : ExecutionMode.values())
2763 >        for (Integer v1 : new Integer[] { 1, null }) {
2764 >
2765 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2766 >        final CompletableFutureInc r = new CompletableFutureInc();
2767 >        f.complete(v1);
2768 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2769 >        checkCompletedNormally(g, inc(v1));
2770 >        checkCompletedNormally(f, v1);
2771 >        assertEquals(1, r.invocationCount);
2772 >        }
2773      }
2774  
2775      /**
2776       * thenCompose result completes exceptionally after exceptional
2777       * completion of source
2778       */
2779 <    public void testThenCompose2() {
2780 <        CompletableFuture<Integer> f, g;
2565 <        CompletableFutureInc r;
2779 >    public void testThenCompose_exceptionalCompletion1() {
2780 >        for (ExecutionMode m : ExecutionMode.values()) {
2781  
2782 <        f = new CompletableFuture<>();
2783 <        g = f.thenCompose(r = new CompletableFutureInc());
2784 <        f.completeExceptionally(new CFException());
2785 <        checkCompletedWithWrappedCFException(g);
2782 >        final CFException ex = new CFException();
2783 >        final CompletableFutureInc r = new CompletableFutureInc();
2784 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2785 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2786 >        f.completeExceptionally(ex);
2787 >        checkCompletedWithWrappedCFException(g, ex);
2788 >        checkCompletedWithWrappedCFException(f, ex);
2789 >        }
2790 >    }
2791  
2792 <        f = new CompletableFuture<>();
2793 <        f.completeExceptionally(new CFException());
2794 <        g = f.thenCompose(r = new CompletableFutureInc());
2795 <        checkCompletedWithWrappedCFException(g);
2792 >    public void testThenCompose_exceptionalCompletion2() {
2793 >        for (ExecutionMode m : ExecutionMode.values()) {
2794 >
2795 >        final CFException ex = new CFException();
2796 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2797 >        f.completeExceptionally(ex);
2798 >        final CompletableFutureInc r = new CompletableFutureInc();
2799 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2800 >        checkCompletedWithWrappedCFException(g, ex);
2801 >        checkCompletedWithWrappedCFException(f, ex);
2802 >        }
2803      }
2804  
2805      /**
2806       * thenCompose result completes exceptionally if action does
2807       */
2808 <    public void testThenCompose3() {
2809 <        CompletableFuture<Integer> f, g;
2810 <        FailingCompletableFutureFunction r;
2808 >    public void testThenCompose_actionFailed1() {
2809 >        for (ExecutionMode m : ExecutionMode.values())
2810 >        for (Integer v1 : new Integer[] { 1, null }) {
2811  
2812 <        f = new CompletableFuture<>();
2813 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2814 <        f.complete(one);
2812 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2813 >        final FailingCompletableFutureFunction r
2814 >            = new FailingCompletableFutureFunction();
2815 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2816 >        f.complete(v1);
2817          checkCompletedWithWrappedCFException(g);
2818 +        checkCompletedNormally(f, v1);
2819 +        }
2820 +    }
2821  
2822 <        f = new CompletableFuture<>();
2823 <        f.complete(one);
2824 <        g = f.thenCompose(r = new FailingCompletableFutureFunction());
2822 >    public void testThenCompose_actionFailed2() {
2823 >        for (ExecutionMode m : ExecutionMode.values())
2824 >        for (Integer v1 : new Integer[] { 1, null }) {
2825 >
2826 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2827 >        f.complete(v1);
2828 >        final FailingCompletableFutureFunction r
2829 >            = new FailingCompletableFutureFunction();
2830 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2831          checkCompletedWithWrappedCFException(g);
2832 +        checkCompletedNormally(f, v1);
2833 +        }
2834      }
2835  
2836      /**
2837       * thenCompose result completes exceptionally if source cancelled
2838       */
2839 <    public void testThenCompose4() {
2840 <        CompletableFuture<Integer> f, g;
2841 <        CompletableFutureInc r;
2839 >    public void testThenCompose_sourceCancelled1() {
2840 >        for (ExecutionMode m : ExecutionMode.values())
2841 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2842  
2843 <        f = new CompletableFuture<>();
2844 <        g = f.thenCompose(r = new CompletableFutureInc());
2845 <        assertTrue(f.cancel(true));
2843 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2844 >        final CompletableFutureInc r = new CompletableFutureInc();
2845 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2846 >        assertTrue(f.cancel(mayInterruptIfRunning));
2847          checkCompletedWithWrappedCancellationException(g);
2848 +        checkCancelled(f);
2849 +        }
2850 +    }
2851  
2852 <        f = new CompletableFuture<>();
2853 <        assertTrue(f.cancel(true));
2854 <        g = f.thenCompose(r = new CompletableFutureInc());
2852 >    public void testThenCompose_sourceCancelled2() {
2853 >        for (ExecutionMode m : ExecutionMode.values())
2854 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
2855 >
2856 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
2857 >        assertTrue(f.cancel(mayInterruptIfRunning));
2858 >        final CompletableFutureInc r = new CompletableFutureInc();
2859 >        final CompletableFuture<Integer> g = f.thenCompose(r);
2860          checkCompletedWithWrappedCancellationException(g);
2861 +        checkCancelled(f);
2862 +        }
2863      }
2864  
2865      // asyncs
# Line 2758 | Line 3009 | public class CompletableFutureTest exten
3009          checkCompletedWithWrappedCancellationException(g);
3010      }
3011  
2761    /**
2762     * runAfterEitherAsync result completes normally after normal
2763     * completion of sources
2764     */
2765    public void testRunAfterEitherAsync() {
2766        CompletableFuture<Integer> f = new CompletableFuture<>();
2767        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2768        Noop r = new Noop();
2769        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2770        f.complete(one);
2771        checkCompletedNormally(g, null);
2772        assertTrue(r.ran);
2773
2774        r = new Noop();
2775        f = new CompletableFuture<>();
2776        f.complete(one);
2777        f2 = new CompletableFuture<>();
2778        g = f.runAfterEitherAsync(f2, r);
2779        checkCompletedNormally(g, null);
2780        assertTrue(r.ran);
2781    }
2782
2783    /**
2784     * runAfterEitherAsync result completes exceptionally after exceptional
2785     * completion of source
2786     */
2787    public void testRunAfterEitherAsync2() {
2788        CompletableFuture<Integer> f = new CompletableFuture<>();
2789        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2790        Noop r = new Noop();
2791        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2792        f.completeExceptionally(new CFException());
2793        checkCompletedWithWrappedCFException(g);
2794
2795        r = new Noop();
2796        f = new CompletableFuture<>();
2797        f2 = new CompletableFuture<>();
2798        f2.completeExceptionally(new CFException());
2799        g = f.runAfterEitherAsync(f2, r);
2800        f.complete(one);
2801        checkCompletedWithWrappedCFException(g);
2802    }
2803
2804    /**
2805     * runAfterEitherAsync result completes exceptionally if action does
2806     */
2807    public void testRunAfterEitherAsync3() {
2808        CompletableFuture<Integer> f = new CompletableFuture<>();
2809        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2810        FailingNoop r = new FailingNoop();
2811        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2812        f.complete(one);
2813        checkCompletedWithWrappedCFException(g);
2814    }
2815
2816    /**
2817     * runAfterEitherAsync result completes exceptionally if either
2818     * source cancelled
2819     */
2820    public void testRunAfterEitherAsync4() {
2821        CompletableFuture<Integer> f = new CompletableFuture<>();
2822        CompletableFuture<Integer> f2 = new CompletableFuture<>();
2823        Noop r = new Noop();
2824        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r);
2825        assertTrue(f.cancel(true));
2826        checkCompletedWithWrappedCancellationException(g);
2827
2828        r = new Noop();
2829        f = new CompletableFuture<>();
2830        f2 = new CompletableFuture<>();
2831        assertTrue(f2.cancel(true));
2832        g = f.runAfterEitherAsync(f2, r);
2833        checkCompletedWithWrappedCancellationException(g);
2834    }
2835
2836    /**
2837     * thenComposeAsync result completes normally after normal
2838     * completion of source
2839     */
2840    public void testThenComposeAsync() {
2841        CompletableFuture<Integer> f, g;
2842        CompletableFutureInc r;
2843
2844        f = new CompletableFuture<>();
2845        g = f.thenComposeAsync(r = new CompletableFutureInc());
2846        f.complete(one);
2847        checkCompletedNormally(g, two);
2848
2849        f = new CompletableFuture<>();
2850        f.complete(one);
2851        g = f.thenComposeAsync(r = new CompletableFutureInc());
2852        checkCompletedNormally(g, two);
2853    }
2854
2855    /**
2856     * thenComposeAsync result completes exceptionally after
2857     * exceptional completion of source
2858     */
2859    public void testThenComposeAsync2() {
2860        CompletableFuture<Integer> f, g;
2861        CompletableFutureInc r;
2862
2863        f = new CompletableFuture<>();
2864        g = f.thenComposeAsync(r = new CompletableFutureInc());
2865        f.completeExceptionally(new CFException());
2866        checkCompletedWithWrappedCFException(g);
2867        assertFalse(r.ran);
2868
2869        f = new CompletableFuture<>();
2870        f.completeExceptionally(new CFException());
2871        g = f.thenComposeAsync(r = new CompletableFutureInc());
2872        checkCompletedWithWrappedCFException(g);
2873        assertFalse(r.ran);
2874    }
2875
2876    /**
2877     * thenComposeAsync result completes exceptionally if action does
2878     */
2879    public void testThenComposeAsync3() {
2880        CompletableFuture<Integer> f, g;
2881        FailingCompletableFutureFunction r;
2882
2883        f = new CompletableFuture<>();
2884        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2885        f.complete(one);
2886        checkCompletedWithWrappedCFException(g);
2887
2888        f = new CompletableFuture<>();
2889        f.complete(one);
2890        g = f.thenComposeAsync(r = new FailingCompletableFutureFunction());
2891        checkCompletedWithWrappedCFException(g);
2892    }
2893
2894    /**
2895     * thenComposeAsync result completes exceptionally if source cancelled
2896     */
2897    public void testThenComposeAsync4() {
2898        CompletableFuture<Integer> f, g;
2899        CompletableFutureInc r;
2900
2901        f = new CompletableFuture<>();
2902        g = f.thenComposeAsync(r = new CompletableFutureInc());
2903        assertTrue(f.cancel(true));
2904        checkCompletedWithWrappedCancellationException(g);
2905
2906        f = new CompletableFuture<>();
2907        assertTrue(f.cancel(true));
2908        g = f.thenComposeAsync(r = new CompletableFutureInc());
2909        checkCompletedWithWrappedCancellationException(g);
2910    }
2911
3012      // async with explicit executors
3013  
3014      /**
# Line 3056 | Line 3156 | public class CompletableFutureTest exten
3156          checkCompletedWithWrappedCancellationException(g);
3157      }
3158  
3059    /**
3060     * runAfterEitherAsync result completes normally after normal
3061     * completion of sources
3062     */
3063    public void testRunAfterEitherAsyncE() {
3064        CompletableFuture<Integer> f = new CompletableFuture<>();
3065        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3066        Noop r = new Noop();
3067        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3068        f.complete(one);
3069        checkCompletedNormally(g, null);
3070        assertTrue(r.ran);
3071
3072        r = new Noop();
3073        f = new CompletableFuture<>();
3074        f.complete(one);
3075        f2 = new CompletableFuture<>();
3076        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3077        checkCompletedNormally(g, null);
3078        assertTrue(r.ran);
3079    }
3080
3081    /**
3082     * runAfterEitherAsync result completes exceptionally after exceptional
3083     * completion of source
3084     */
3085    public void testRunAfterEitherAsync2E() {
3086        CompletableFuture<Integer> f = new CompletableFuture<>();
3087        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3088        Noop r = new Noop();
3089        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3090        f.completeExceptionally(new CFException());
3091        checkCompletedWithWrappedCFException(g);
3092
3093        r = new Noop();
3094        f = new CompletableFuture<>();
3095        f2 = new CompletableFuture<>();
3096        f2.completeExceptionally(new CFException());
3097        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3098        f.complete(one);
3099        checkCompletedWithWrappedCFException(g);
3100    }
3101
3102    /**
3103     * runAfterEitherAsync result completes exceptionally if action does
3104     */
3105    public void testRunAfterEitherAsync3E() {
3106        CompletableFuture<Integer> f = new CompletableFuture<>();
3107        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3108        FailingNoop r = new FailingNoop();
3109        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3110        f.complete(one);
3111        checkCompletedWithWrappedCFException(g);
3112    }
3113
3114    /**
3115     * runAfterEitherAsync result completes exceptionally if either
3116     * source cancelled
3117     */
3118    public void testRunAfterEitherAsync4E() {
3119        CompletableFuture<Integer> f = new CompletableFuture<>();
3120        CompletableFuture<Integer> f2 = new CompletableFuture<>();
3121        Noop r = new Noop();
3122        CompletableFuture<Void> g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3123        assertTrue(f.cancel(true));
3124        checkCompletedWithWrappedCancellationException(g);
3125
3126        r = new Noop();
3127        f = new CompletableFuture<>();
3128        f2 = new CompletableFuture<>();
3129        assertTrue(f2.cancel(true));
3130        g = f.runAfterEitherAsync(f2, r, new ThreadExecutor());
3131        checkCompletedWithWrappedCancellationException(g);
3132    }
3133
3134    /**
3135     * thenComposeAsync result completes normally after normal
3136     * completion of source
3137     */
3138    public void testThenComposeAsyncE() {
3139        CompletableFuture<Integer> f = new CompletableFuture<>();
3140        CompletableFutureInc r = new CompletableFutureInc();
3141        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3142        f.complete(one);
3143        checkCompletedNormally(g, two);
3144    }
3145
3146    /**
3147     * thenComposeAsync result completes exceptionally after
3148     * exceptional completion of source
3149     */
3150    public void testThenComposeAsync2E() {
3151        CompletableFuture<Integer> f = new CompletableFuture<>();
3152        CompletableFutureInc r = new CompletableFutureInc();
3153        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3154        f.completeExceptionally(new CFException());
3155        checkCompletedWithWrappedCFException(g);
3156    }
3157
3158    /**
3159     * thenComposeAsync result completes exceptionally if action does
3160     */
3161    public void testThenComposeAsync3E() {
3162        CompletableFuture<Integer> f = new CompletableFuture<>();
3163        FailingCompletableFutureFunction r = new FailingCompletableFutureFunction();
3164        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3165        f.complete(one);
3166        checkCompletedWithWrappedCFException(g);
3167    }
3168
3169    /**
3170     * thenComposeAsync result completes exceptionally if source cancelled
3171     */
3172    public void testThenComposeAsync4E() {
3173        CompletableFuture<Integer> f = new CompletableFuture<>();
3174        CompletableFutureInc r = new CompletableFutureInc();
3175        CompletableFuture<Integer> g = f.thenComposeAsync(r, new ThreadExecutor());
3176        assertTrue(f.cancel(true));
3177        checkCompletedWithWrappedCancellationException(g);
3178    }
3179
3159      // other static methods
3160  
3161      /**
# Line 3375 | Line 3354 | public class CompletableFutureTest exten
3354       * whenComplete action executes on normal completion, propagating
3355       * source result.
3356       */
3357 <    public void testWhenComplete1() {
3357 >    public void testWhenComplete_normalCompletion1() {
3358 >        for (boolean createIncomplete : new boolean[] { true, false })
3359 >        for (ExecutionMode m : ExecutionMode.values())
3360 >        for (Integer v1 : new Integer[] { 1, null }) {
3361 >
3362          final AtomicInteger a = new AtomicInteger();
3363 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3364 <        CompletableFuture<Integer> g =
3365 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3366 <        f.complete(three);
3367 <        checkCompletedNormally(f, three);
3368 <        checkCompletedNormally(g, three);
3363 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3364 >        if (!createIncomplete) f.complete(v1);
3365 >        final CompletableFuture<Integer> g =
3366 >            m.whenComplete(f,
3367 >                           (Integer x, Throwable t) -> {
3368 >                               threadAssertSame(x, v1);
3369 >                               threadAssertNull(t);
3370 >                               a.getAndIncrement();
3371 >                           });
3372 >        if (createIncomplete) f.complete(v1);
3373 >        checkCompletedNormally(f, v1);
3374 >        checkCompletedNormally(g, v1);
3375          assertEquals(a.get(), 1);
3376 +        }
3377      }
3378  
3379      /**
3380       * whenComplete action executes on exceptional completion, propagating
3381       * source result.
3382       */
3383 <    public void testWhenComplete2() {
3383 >    public void testWhenComplete_exceptionalCompletion() {
3384 >        for (boolean createIncomplete : new boolean[] { true, false })
3385 >        for (ExecutionMode m : ExecutionMode.values())
3386 >        for (Integer v1 : new Integer[] { 1, null }) {
3387 >
3388          final AtomicInteger a = new AtomicInteger();
3389 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3390 <        CompletableFuture<Integer> g =
3391 <            f.whenComplete((Integer x, Throwable t) -> a.getAndIncrement());
3392 <        f.completeExceptionally(new CFException());
3393 <        assertTrue(f.isCompletedExceptionally());
3394 <        assertTrue(g.isCompletedExceptionally());
3389 >        final CFException ex = new CFException();
3390 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3391 >        if (!createIncomplete) f.completeExceptionally(ex);
3392 >        final CompletableFuture<Integer> g = m.whenComplete
3393 >            (f,
3394 >             (Integer x, Throwable t) -> {
3395 >                threadAssertNull(x);
3396 >                threadAssertSame(t, ex);
3397 >                a.getAndIncrement();
3398 >            });
3399 >        if (createIncomplete) f.completeExceptionally(ex);
3400 >        checkCompletedWithWrappedCFException(f, ex);
3401 >        checkCompletedWithWrappedCFException(g, ex);
3402          assertEquals(a.get(), 1);
3403 +        }
3404      }
3405  
3406      /**
3407       * If a whenComplete action throws an exception when triggered by
3408       * a normal completion, it completes exceptionally
3409       */
3410 <    public void testWhenComplete3() {
3411 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3412 <        CompletableFuture<Integer> g =
3413 <            f.whenComplete((Integer x, Throwable t) ->
3412 <                           { throw new CFException(); } );
3413 <        f.complete(three);
3414 <        checkCompletedNormally(f, three);
3415 <        assertTrue(g.isCompletedExceptionally());
3416 <        checkCompletedWithWrappedCFException(g);
3417 <    }
3418 <
3419 <    /**
3420 <     * whenCompleteAsync action executes on normal completion, propagating
3421 <     * source result.
3422 <     */
3423 <    public void testWhenCompleteAsync1() {
3424 <        final AtomicInteger a = new AtomicInteger();
3425 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3426 <        CompletableFuture<Integer> g =
3427 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3428 <        f.complete(three);
3429 <        checkCompletedNormally(f, three);
3430 <        checkCompletedNormally(g, three);
3431 <        assertEquals(a.get(), 1);
3432 <    }
3410 >    public void testWhenComplete_actionFailed() {
3411 >        for (boolean createIncomplete : new boolean[] { true, false })
3412 >        for (ExecutionMode m : ExecutionMode.values())
3413 >        for (Integer v1 : new Integer[] { 1, null }) {
3414  
3415 <    /**
3416 <     * whenCompleteAsync action executes on exceptional completion, propagating
3417 <     * source result.
3418 <     */
3419 <    public void testWhenCompleteAsync2() {
3420 <        final AtomicInteger a = new AtomicInteger();
3421 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3422 <        CompletableFuture<Integer> g =
3423 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement());
3424 <        f.completeExceptionally(new CFException());
3425 <        checkCompletedWithWrappedCFException(f);
3426 <        checkCompletedWithWrappedCFException(g);
3415 >        final CFException ex = new CFException();
3416 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3417 >        if (!createIncomplete) f.complete(v1);
3418 >        final CompletableFuture<Integer> g = m.whenComplete
3419 >            (f,
3420 >             (Integer x, Throwable t) -> {
3421 >                threadAssertSame(x, v1);
3422 >                threadAssertNull(t);
3423 >                throw ex;
3424 >            });
3425 >        if (createIncomplete) f.complete(v1);
3426 >        checkCompletedNormally(f, v1);
3427 >        checkCompletedWithWrappedCFException(g, ex);
3428 >        }
3429      }
3430  
3431      /**
3432 <     * If a whenCompleteAsync action throws an exception when
3433 <     * triggered by a normal completion, it completes exceptionally
3432 >     * If a whenComplete action throws an exception when triggered by
3433 >     * a source completion that also throws an exception, the source
3434 >     * exception takes precedence.
3435       */
3436 <    public void testWhenCompleteAsync3() {
3437 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3438 <        CompletableFuture<Integer> g =
3439 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3456 <                           { throw new CFException(); } );
3457 <        f.complete(three);
3458 <        checkCompletedNormally(f, three);
3459 <        checkCompletedWithWrappedCFException(g);
3460 <    }
3436 >    public void testWhenComplete_actionFailedSourceFailed() {
3437 >        for (boolean createIncomplete : new boolean[] { true, false })
3438 >        for (ExecutionMode m : ExecutionMode.values())
3439 >        for (Integer v1 : new Integer[] { 1, null }) {
3440  
3441 <    /**
3442 <     * whenCompleteAsync action executes on normal completion, propagating
3443 <     * source result.
3465 <     */
3466 <    public void testWhenCompleteAsync1e() {
3467 <        final AtomicInteger a = new AtomicInteger();
3468 <        ThreadExecutor exec = new ThreadExecutor();
3469 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3470 <        CompletableFuture<Integer> g =
3471 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3472 <                                exec);
3473 <        f.complete(three);
3474 <        checkCompletedNormally(f, three);
3475 <        checkCompletedNormally(g, three);
3476 <        assertEquals(a.get(), 1);
3477 <    }
3441 >        final CFException ex1 = new CFException();
3442 >        final CFException ex2 = new CFException();
3443 >        final CompletableFuture<Integer> f = new CompletableFuture<>();
3444  
3445 <    /**
3446 <     * whenCompleteAsync action executes on exceptional completion, propagating
3447 <     * source result.
3448 <     */
3449 <    public void testWhenCompleteAsync2e() {
3450 <        final AtomicInteger a = new AtomicInteger();
3451 <        ThreadExecutor exec = new ThreadExecutor();
3452 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3453 <        CompletableFuture<Integer> g =
3488 <            f.whenCompleteAsync((Integer x, Throwable t) -> a.getAndIncrement(),
3489 <                                exec);
3490 <        f.completeExceptionally(new CFException());
3491 <        checkCompletedWithWrappedCFException(f);
3492 <        checkCompletedWithWrappedCFException(g);
3493 <    }
3445 >        if (!createIncomplete) f.completeExceptionally(ex1);
3446 >        final CompletableFuture<Integer> g = m.whenComplete
3447 >            (f,
3448 >             (Integer x, Throwable t) -> {
3449 >                threadAssertSame(t, ex1);
3450 >                threadAssertNull(x);
3451 >                throw ex2;
3452 >            });
3453 >        if (createIncomplete) f.completeExceptionally(ex1);
3454  
3455 <    /**
3456 <     * If a whenCompleteAsync action throws an exception when triggered
3457 <     * by a normal completion, it completes exceptionally
3498 <     */
3499 <    public void testWhenCompleteAsync3e() {
3500 <        ThreadExecutor exec = new ThreadExecutor();
3501 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3502 <        CompletableFuture<Integer> g =
3503 <            f.whenCompleteAsync((Integer x, Throwable t) ->
3504 <                                { throw new CFException(); },
3505 <                                exec);
3506 <        f.complete(three);
3507 <        checkCompletedNormally(f, three);
3508 <        checkCompletedWithWrappedCFException(g);
3455 >        checkCompletedWithWrappedCFException(f, ex1);
3456 >        checkCompletedWithWrappedCFException(g, ex1);
3457 >        }
3458      }
3459  
3460      /**
# Line 3518 | Line 3467 | public class CompletableFutureTest exten
3467  
3468          f = new CompletableFuture<>();
3469          g = f.handleAsync(r = new IntegerHandler());
3470 <        assertFalse(r.ran);
3470 >        assertEquals(0, r.invocationCount);
3471          f.completeExceptionally(new CFException());
3472          checkCompletedWithWrappedCFException(f);
3473          checkCompletedNormally(g, three);
3474 <        assertTrue(r.ran);
3474 >        assertEquals(1, r.invocationCount);
3475  
3476          f = new CompletableFuture<>();
3477          g = f.handleAsync(r = new IntegerHandler());
3478 <        assertFalse(r.ran);
3478 >        assertEquals(0, r.invocationCount);
3479          f.completeExceptionally(new CFException());
3480          checkCompletedWithWrappedCFException(f);
3481          checkCompletedNormally(g, three);
3482 <        assertTrue(r.ran);
3482 >        assertEquals(1, r.invocationCount);
3483  
3484          f = new CompletableFuture<>();
3485          g = f.handleAsync(r = new IntegerHandler());
3486 <        assertFalse(r.ran);
3486 >        assertEquals(0, r.invocationCount);
3487          f.complete(one);
3488          checkCompletedNormally(f, one);
3489          checkCompletedNormally(g, two);
3490 <        assertTrue(r.ran);
3490 >        assertEquals(1, r.invocationCount);
3491  
3492          f = new CompletableFuture<>();
3493          g = f.handleAsync(r = new IntegerHandler());
3494 <        assertFalse(r.ran);
3494 >        assertEquals(0, r.invocationCount);
3495          f.complete(one);
3496          checkCompletedNormally(f, one);
3497          checkCompletedNormally(g, two);
3498 <        assertTrue(r.ran);
3498 >        assertEquals(1, r.invocationCount);
3499      }
3500  
3501      /**
# Line 3561 | Line 3510 | public class CompletableFutureTest exten
3510  
3511          f = new CompletableFuture<>();
3512          g = f.handleAsync(r = new IntegerHandler(), exec);
3513 <        assertFalse(r.ran);
3513 >        assertEquals(0, r.invocationCount);
3514          f.completeExceptionally(new CFException());
3515          checkCompletedWithWrappedCFException(f);
3516          checkCompletedNormally(g, three);
3517 <        assertTrue(r.ran);
3517 >        assertEquals(1, r.invocationCount);
3518  
3519          f = new CompletableFuture<>();
3520          g = f.handleAsync(r = new IntegerHandler(), exec);
3521 <        assertFalse(r.ran);
3521 >        assertEquals(0, r.invocationCount);
3522          f.completeExceptionally(new CFException());
3523          checkCompletedWithWrappedCFException(f);
3524          checkCompletedNormally(g, three);
3525 <        assertTrue(r.ran);
3525 >        assertEquals(1, r.invocationCount);
3526  
3527          f = new CompletableFuture<>();
3528          g = f.handleAsync(r = new IntegerHandler(), exec);
3529 <        assertFalse(r.ran);
3529 >        assertEquals(0, r.invocationCount);
3530          f.complete(one);
3531          checkCompletedNormally(f, one);
3532          checkCompletedNormally(g, two);
3533 <        assertTrue(r.ran);
3533 >        assertEquals(1, r.invocationCount);
3534  
3535          f = new CompletableFuture<>();
3536          g = f.handleAsync(r = new IntegerHandler(), exec);
3537 <        assertFalse(r.ran);
3537 >        assertEquals(0, r.invocationCount);
3538          f.complete(one);
3539          checkCompletedNormally(f, one);
3540          checkCompletedNormally(g, two);
3541 <        assertTrue(r.ran);
3541 >        assertEquals(1, r.invocationCount);
3542      }
3543  
3544   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines