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.223 by jsr166, Mon Dec 16 22:36:39 2019 UTC vs.
Revision 1.224 by dl, Tue Jan 26 13:33:05 2021 UTC

# Line 77 | Line 77 | public class CompletableFutureTest exten
77      <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
78          checkTimedGet(f, expectedValue);
79  
80 <        assertEquals(expectedValue, f.join());
81 <        assertEquals(expectedValue, f.getNow(null));
80 >        mustEqual(expectedValue, f.join());
81 >        mustEqual(expectedValue, f.getNow(null));
82  
83          T result = null;
84          try {
85              result = f.get();
86          } catch (Throwable fail) { threadUnexpectedException(fail); }
87 <        assertEquals(expectedValue, result);
87 >        mustEqual(expectedValue, result);
88  
89          assertTrue(f.isDone());
90          assertFalse(f.isCancelled());
# Line 208 | Line 208 | public class CompletableFutureTest exten
208       * by methods isDone, isCancelled, and getNow
209       */
210      public void testConstructor() {
211 <        CompletableFuture<Integer> f = new CompletableFuture<>();
211 >        CompletableFuture<Item> f = new CompletableFuture<>();
212          checkIncomplete(f);
213      }
214  
# Line 217 | Line 217 | public class CompletableFutureTest exten
217       * isCancelled, join, get, and getNow
218       */
219      public void testComplete() {
220 <        for (Integer v1 : new Integer[] { 1, null })
220 >        for (Item v1 : new Item[] { one, null })
221      {
222 <        CompletableFuture<Integer> f = new CompletableFuture<>();
222 >        CompletableFuture<Item> f = new CompletableFuture<>();
223          checkIncomplete(f);
224          assertTrue(f.complete(v1));
225          assertFalse(f.complete(v1));
# Line 231 | Line 231 | public class CompletableFutureTest exten
231       * methods isDone, isCancelled, join, get, and getNow
232       */
233      public void testCompleteExceptionally() {
234 <        CompletableFuture<Integer> f = new CompletableFuture<>();
234 >        CompletableFuture<Item> f = new CompletableFuture<>();
235          CFException ex = new CFException();
236          checkIncomplete(f);
237          f.completeExceptionally(ex);
# Line 245 | Line 245 | public class CompletableFutureTest exten
245      public void testCancel() {
246          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
247      {
248 <        CompletableFuture<Integer> f = new CompletableFuture<>();
248 >        CompletableFuture<Item> f = new CompletableFuture<>();
249          checkIncomplete(f);
250          assertTrue(f.cancel(mayInterruptIfRunning));
251          assertTrue(f.cancel(mayInterruptIfRunning));
# Line 257 | Line 257 | public class CompletableFutureTest exten
257       * obtrudeValue forces completion with given value
258       */
259      public void testObtrudeValue() {
260 <        CompletableFuture<Integer> f = new CompletableFuture<>();
260 >        CompletableFuture<Item> f = new CompletableFuture<>();
261          checkIncomplete(f);
262          assertTrue(f.complete(one));
263          checkCompletedNormally(f, one);
# Line 280 | Line 280 | public class CompletableFutureTest exten
280       * obtrudeException forces completion with given exception
281       */
282      public void testObtrudeException() {
283 <        for (Integer v1 : new Integer[] { 1, null })
283 >        for (Item v1 : new Item[] { one, null })
284      {
285          CFException ex;
286 <        CompletableFuture<Integer> f;
286 >        CompletableFuture<Item> f;
287  
288          f = new CompletableFuture<>();
289          assertTrue(f.complete(v1));
# Line 315 | Line 315 | public class CompletableFutureTest exten
315       */
316      public void testGetNumberOfDependents() {
317          for (ExecutionMode m : ExecutionMode.values())
318 <        for (Integer v1 : new Integer[] { 1, null })
318 >        for (Item v1 : new Item[] { one, null })
319      {
320 <        CompletableFuture<Integer> f = new CompletableFuture<>();
321 <        assertEquals(0, f.getNumberOfDependents());
320 >        CompletableFuture<Item> f = new CompletableFuture<>();
321 >        mustEqual(0, f.getNumberOfDependents());
322          final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
323 <        assertEquals(1, f.getNumberOfDependents());
324 <        assertEquals(0, g.getNumberOfDependents());
323 >        mustEqual(1, f.getNumberOfDependents());
324 >        mustEqual(0, g.getNumberOfDependents());
325          final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
326 <        assertEquals(2, f.getNumberOfDependents());
327 <        assertEquals(0, h.getNumberOfDependents());
326 >        mustEqual(2, f.getNumberOfDependents());
327 >        mustEqual(0, h.getNumberOfDependents());
328          assertTrue(f.complete(v1));
329          checkCompletedNormally(g, null);
330          checkCompletedNormally(h, null);
331 <        assertEquals(0, f.getNumberOfDependents());
332 <        assertEquals(0, g.getNumberOfDependents());
333 <        assertEquals(0, h.getNumberOfDependents());
331 >        mustEqual(0, f.getNumberOfDependents());
332 >        mustEqual(0, g.getNumberOfDependents());
333 >        mustEqual(0, h.getNumberOfDependents());
334      }}
335  
336      /**
# Line 340 | Line 340 | public class CompletableFutureTest exten
340          CompletableFuture<String> f = new CompletableFuture<>();
341          assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
342          if (testImplementationDetails)
343 <            assertEquals(identityString(f) + "[Not completed]",
343 >            mustEqual(identityString(f) + "[Not completed]",
344                           f.toString());
345      }
346  
# Line 349 | Line 349 | public class CompletableFutureTest exten
349          assertTrue(f.complete("foo"));
350          assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
351          if (testImplementationDetails)
352 <            assertEquals(identityString(f) + "[Completed normally]",
352 >            mustEqual(identityString(f) + "[Completed normally]",
353                           f.toString());
354      }
355  
# Line 387 | Line 387 | public class CompletableFutureTest exten
387          CheckedAction(ExecutionMode m) { this.m = m; }
388          void invoked() {
389              m.checkExecutionMode();
390 <            assertEquals(0, invocationCount++);
390 >            mustEqual(0, invocationCount++);
391          }
392 <        void assertNotInvoked() { assertEquals(0, invocationCount); }
393 <        void assertInvoked() { assertEquals(1, invocationCount); }
392 >        void assertNotInvoked() { mustEqual(0, invocationCount); }
393 >        void assertInvoked() { mustEqual(1, invocationCount); }
394      }
395  
396 <    abstract static class CheckedIntegerAction extends CheckedAction {
397 <        Integer value;
398 <        CheckedIntegerAction(ExecutionMode m) { super(m); }
399 <        void assertValue(Integer expected) {
396 >    abstract static class CheckedItemAction extends CheckedAction {
397 >        Item value;
398 >        CheckedItemAction(ExecutionMode m) { super(m); }
399 >        void assertValue(Item expected) {
400              assertInvoked();
401 <            assertEquals(expected, value);
401 >            mustEqual(expected, value);
402          }
403      }
404  
405 <    static class IntegerSupplier extends CheckedAction
406 <        implements Supplier<Integer>
405 >    static class ItemSupplier extends CheckedAction
406 >        implements Supplier<Item>
407      {
408 <        final Integer value;
409 <        IntegerSupplier(ExecutionMode m, Integer value) {
408 >        final Item value;
409 >        ItemSupplier(ExecutionMode m, Item value) {
410              super(m);
411              this.value = value;
412          }
413 <        public Integer get() {
413 >        public Item get() {
414              invoked();
415              return value;
416          }
417      }
418  
419      // A function that handles and produces null values as well.
420 <    static Integer inc(Integer x) {
421 <        return (x == null) ? null : x + 1;
420 >    static Item inc(Item x) {
421 >        return (x == null) ? null : new Item(x.value + 1);
422      }
423  
424 <    static class NoopConsumer extends CheckedIntegerAction
425 <        implements Consumer<Integer>
424 >    static class NoopConsumer extends CheckedItemAction
425 >        implements Consumer<Item>
426      {
427          NoopConsumer(ExecutionMode m) { super(m); }
428 <        public void accept(Integer x) {
428 >        public void accept(Item x) {
429              invoked();
430              value = x;
431          }
432      }
433  
434 <    static class IncFunction extends CheckedIntegerAction
435 <        implements Function<Integer,Integer>
434 >    static class IncFunction extends CheckedItemAction
435 >        implements Function<Item,Item>
436      {
437          IncFunction(ExecutionMode m) { super(m); }
438 <        public Integer apply(Integer x) {
438 >        public Item apply(Item x) {
439              invoked();
440              return value = inc(x);
441          }
# Line 443 | Line 443 | public class CompletableFutureTest exten
443  
444      // Choose non-commutative actions for better coverage
445      // A non-commutative function that handles and produces null values as well.
446 <    static Integer subtract(Integer x, Integer y) {
446 >    static Item subtract(Item x, Item y) {
447          return (x == null && y == null) ? null :
448 <            ((x == null) ? 42 : x.intValue())
449 <            - ((y == null) ? 99 : y.intValue());
448 >            new Item(((x == null) ? 42 : x.value)
449 >                    - ((y == null) ? 99 : y.value));
450      }
451  
452 <    static class SubtractAction extends CheckedIntegerAction
453 <        implements BiConsumer<Integer, Integer>
452 >    static class SubtractAction extends CheckedItemAction
453 >        implements BiConsumer<Item, Item>
454      {
455          SubtractAction(ExecutionMode m) { super(m); }
456 <        public void accept(Integer x, Integer y) {
456 >        public void accept(Item x, Item y) {
457              invoked();
458              value = subtract(x, y);
459          }
460      }
461  
462 <    static class SubtractFunction extends CheckedIntegerAction
463 <        implements BiFunction<Integer, Integer, Integer>
462 >    static class SubtractFunction extends CheckedItemAction
463 >        implements BiFunction<Item, Item, Item>
464      {
465          SubtractFunction(ExecutionMode m) { super(m); }
466 <        public Integer apply(Integer x, Integer y) {
466 >        public Item apply(Item x, Item y) {
467              invoked();
468              return value = subtract(x, y);
469          }
# Line 477 | Line 477 | public class CompletableFutureTest exten
477      }
478  
479      static class FailingSupplier extends CheckedAction
480 <        implements Supplier<Integer>
480 >        implements Supplier<Item>
481      {
482          final CFException ex;
483          FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
484 <        public Integer get() {
484 >        public Item get() {
485              invoked();
486              throw ex;
487          }
488      }
489  
490 <    static class FailingConsumer extends CheckedIntegerAction
491 <        implements Consumer<Integer>
490 >    static class FailingConsumer extends CheckedItemAction
491 >        implements Consumer<Item>
492      {
493          final CFException ex;
494          FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
495 <        public void accept(Integer x) {
495 >        public void accept(Item x) {
496              invoked();
497              value = x;
498              throw ex;
499          }
500      }
501  
502 <    static class FailingBiConsumer extends CheckedIntegerAction
503 <        implements BiConsumer<Integer, Integer>
502 >    static class FailingBiConsumer extends CheckedItemAction
503 >        implements BiConsumer<Item, Item>
504      {
505          final CFException ex;
506          FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
507 <        public void accept(Integer x, Integer y) {
507 >        public void accept(Item x, Item y) {
508              invoked();
509              value = subtract(x, y);
510              throw ex;
511          }
512      }
513  
514 <    static class FailingFunction extends CheckedIntegerAction
515 <        implements Function<Integer, Integer>
514 >    static class FailingFunction extends CheckedItemAction
515 >        implements Function<Item, Item>
516      {
517          final CFException ex;
518          FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
519 <        public Integer apply(Integer x) {
519 >        public Item apply(Item x) {
520              invoked();
521              value = x;
522              throw ex;
523          }
524      }
525  
526 <    static class FailingBiFunction extends CheckedIntegerAction
527 <        implements BiFunction<Integer, Integer, Integer>
526 >    static class FailingBiFunction extends CheckedItemAction
527 >        implements BiFunction<Item, Item, Item>
528      {
529          final CFException ex;
530          FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
531 <        public Integer apply(Integer x, Integer y) {
531 >        public Item apply(Item x, Item y) {
532              invoked();
533              value = subtract(x, y);
534              throw ex;
# Line 544 | Line 544 | public class CompletableFutureTest exten
544          }
545      }
546  
547 <    static class CompletableFutureInc extends CheckedIntegerAction
548 <        implements Function<Integer, CompletableFuture<Integer>>
547 >    static class CompletableFutureInc extends CheckedItemAction
548 >        implements Function<Item, CompletableFuture<Item>>
549      {
550          CompletableFutureInc(ExecutionMode m) { super(m); }
551 <        public CompletableFuture<Integer> apply(Integer x) {
551 >        public CompletableFuture<Item> apply(Item x) {
552              invoked();
553              value = x;
554              return CompletableFuture.completedFuture(inc(x));
# Line 556 | Line 556 | public class CompletableFutureTest exten
556      }
557  
558      static class FailingExceptionalCompletableFutureFunction extends CheckedAction
559 <        implements Function<Throwable, CompletableFuture<Integer>>
559 >        implements Function<Throwable, CompletableFuture<Item>>
560      {
561          final CFException ex;
562          FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
563 <        public CompletableFuture<Integer> apply(Throwable x) {
563 >        public CompletableFuture<Item> apply(Throwable x) {
564              invoked();
565              throw ex;
566          }
567      }
568  
569      static class ExceptionalCompletableFutureFunction extends CheckedAction
570 <        implements Function<Throwable, CompletionStage<Integer>> {
571 <        final Integer value = 3;
570 >        implements Function<Throwable, CompletionStage<Item>> {
571 >        final Item value = three;
572          ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
573 <        public CompletionStage<Integer> apply(Throwable x) {
573 >        public CompletionStage<Item> apply(Throwable x) {
574              invoked();
575              return CompletableFuture.completedFuture(value);
576          }
577      }
578  
579 <    static class FailingCompletableFutureFunction extends CheckedIntegerAction
580 <        implements Function<Integer, CompletableFuture<Integer>>
579 >    static class FailingCompletableFutureFunction extends CheckedItemAction
580 >        implements Function<Item, CompletableFuture<Item>>
581      {
582          final CFException ex;
583          FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
584 <        public CompletableFuture<Integer> apply(Integer x) {
584 >        public CompletableFuture<Item> apply(Item x) {
585              invoked();
586              value = x;
587              throw ex;
# Line 703 | Line 703 | public class CompletableFutureTest exten
703          },
704          ASYNC {
705              public void checkExecutionMode() {
706 <                assertEquals(defaultExecutorIsCommonPool,
706 >                mustEqual(defaultExecutorIsCommonPool,
707                               (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
708              }
709              public CompletableFuture<Void> runAsync(Runnable a) {
# Line 924 | Line 924 | public class CompletableFutureTest exten
924      public void testExceptionally_normalCompletion() {
925          for (ExecutionMode m : ExecutionMode.values())
926          for (boolean createIncomplete : new boolean[] { true, false })
927 <        for (Integer v1 : new Integer[] { 1, null })
927 >        for (Item v1 : new Item[] { one, null })
928      {
929          final AtomicInteger ran = new AtomicInteger(0);
930 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
930 >        final CompletableFuture<Item> f = new CompletableFuture<>();
931          if (!createIncomplete) assertTrue(f.complete(v1));
932 <        final CompletableFuture<Integer> g = m.exceptionally
932 >        final CompletableFuture<Item> g = m.exceptionally
933              (f, (Throwable t) -> {
934                  ran.getAndIncrement();
935                  throw new AssertionError("should not be called");
# Line 938 | Line 938 | public class CompletableFutureTest exten
938  
939          checkCompletedNormally(g, v1);
940          checkCompletedNormally(f, v1);
941 <        assertEquals(0, ran.get());
941 >        mustEqual(0, ran.get());
942      }}
943  
944      /**
# Line 948 | Line 948 | public class CompletableFutureTest exten
948      public void testExceptionally_exceptionalCompletion() {
949          for (ExecutionMode m : ExecutionMode.values())
950          for (boolean createIncomplete : new boolean[] { true, false })
951 <        for (Integer v1 : new Integer[] { 1, null })
951 >        for (Item v1 : new Item[] { one, null })
952      {
953          final AtomicInteger ran = new AtomicInteger(0);
954          final CFException ex = new CFException();
955 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
955 >        final CompletableFuture<Item> f = new CompletableFuture<>();
956          if (!createIncomplete) f.completeExceptionally(ex);
957 <        final CompletableFuture<Integer> g = m.exceptionally
957 >        final CompletableFuture<Item> g = m.exceptionally
958              (f, (Throwable t) -> {
959                  m.checkExecutionMode();
960                  assertSame(t, ex);
# Line 964 | Line 964 | public class CompletableFutureTest exten
964          if (createIncomplete) f.completeExceptionally(ex);
965  
966          checkCompletedNormally(g, v1);
967 <        assertEquals(1, ran.get());
967 >        mustEqual(1, ran.get());
968      }}
969  
970      /**
# Line 978 | Line 978 | public class CompletableFutureTest exten
978          final AtomicInteger ran = new AtomicInteger(0);
979          final CFException ex1 = new CFException();
980          final CFException ex2 = new CFException();
981 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
981 >        final CompletableFuture<Item> f = new CompletableFuture<>();
982          if (!createIncomplete) f.completeExceptionally(ex1);
983 <        final CompletableFuture<Integer> g = m.exceptionally
983 >        final CompletableFuture<Item> g = m.exceptionally
984              (f, (Throwable t) -> {
985                  m.checkExecutionMode();
986                  assertSame(t, ex1);
# Line 991 | Line 991 | public class CompletableFutureTest exten
991  
992          checkCompletedWithWrappedException(g, ex2);
993          checkCompletedExceptionally(f, ex1);
994 <        assertEquals(1, ran.get());
994 >        mustEqual(1, ran.get());
995      }}
996  
997      /**
# Line 1001 | Line 1001 | public class CompletableFutureTest exten
1001      public void testWhenComplete_normalCompletion() {
1002          for (ExecutionMode m : ExecutionMode.values())
1003          for (boolean createIncomplete : new boolean[] { true, false })
1004 <        for (Integer v1 : new Integer[] { 1, null })
1004 >        for (Item v1 : new Item[] { one, null })
1005      {
1006          final AtomicInteger ran = new AtomicInteger(0);
1007 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1007 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1008          if (!createIncomplete) assertTrue(f.complete(v1));
1009 <        final CompletableFuture<Integer> g = m.whenComplete
1009 >        final CompletableFuture<Item> g = m.whenComplete
1010              (f,
1011 <             (Integer result, Throwable t) -> {
1011 >             (Item result, Throwable t) -> {
1012                  m.checkExecutionMode();
1013                  assertSame(result, v1);
1014                  assertNull(t);
# Line 1018 | Line 1018 | public class CompletableFutureTest exten
1018  
1019          checkCompletedNormally(g, v1);
1020          checkCompletedNormally(f, v1);
1021 <        assertEquals(1, ran.get());
1021 >        mustEqual(1, ran.get());
1022      }}
1023  
1024      /**
# Line 1031 | Line 1031 | public class CompletableFutureTest exten
1031      {
1032          final AtomicInteger ran = new AtomicInteger(0);
1033          final CFException ex = new CFException();
1034 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1034 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1035          if (!createIncomplete) f.completeExceptionally(ex);
1036 <        final CompletableFuture<Integer> g = m.whenComplete
1036 >        final CompletableFuture<Item> g = m.whenComplete
1037              (f,
1038 <             (Integer result, Throwable t) -> {
1038 >             (Item result, Throwable t) -> {
1039                  m.checkExecutionMode();
1040                  assertNull(result);
1041                  assertSame(t, ex);
# Line 1045 | Line 1045 | public class CompletableFutureTest exten
1045  
1046          checkCompletedWithWrappedException(g, ex);
1047          checkCompletedExceptionally(f, ex);
1048 <        assertEquals(1, ran.get());
1048 >        mustEqual(1, ran.get());
1049      }}
1050  
1051      /**
# Line 1058 | Line 1058 | public class CompletableFutureTest exten
1058          for (boolean createIncomplete : new boolean[] { true, false })
1059      {
1060          final AtomicInteger ran = new AtomicInteger(0);
1061 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1061 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1062          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1063 <        final CompletableFuture<Integer> g = m.whenComplete
1063 >        final CompletableFuture<Item> g = m.whenComplete
1064              (f,
1065 <             (Integer result, Throwable t) -> {
1065 >             (Item result, Throwable t) -> {
1066                  m.checkExecutionMode();
1067                  assertNull(result);
1068                  assertTrue(t instanceof CancellationException);
# Line 1072 | Line 1072 | public class CompletableFutureTest exten
1072  
1073          checkCompletedWithWrappedCancellationException(g);
1074          checkCancelled(f);
1075 <        assertEquals(1, ran.get());
1075 >        mustEqual(1, ran.get());
1076      }}
1077  
1078      /**
# Line 1082 | Line 1082 | public class CompletableFutureTest exten
1082      public void testWhenComplete_sourceCompletedNormallyActionFailed() {
1083          for (boolean createIncomplete : new boolean[] { true, false })
1084          for (ExecutionMode m : ExecutionMode.values())
1085 <        for (Integer v1 : new Integer[] { 1, null })
1085 >        for (Item v1 : new Item[] { one, null })
1086      {
1087          final AtomicInteger ran = new AtomicInteger(0);
1088          final CFException ex = new CFException();
1089 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1089 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1090          if (!createIncomplete) assertTrue(f.complete(v1));
1091 <        final CompletableFuture<Integer> g = m.whenComplete
1091 >        final CompletableFuture<Item> g = m.whenComplete
1092              (f,
1093 <             (Integer result, Throwable t) -> {
1093 >             (Item result, Throwable t) -> {
1094                  m.checkExecutionMode();
1095                  assertSame(result, v1);
1096                  assertNull(t);
# Line 1101 | Line 1101 | public class CompletableFutureTest exten
1101  
1102          checkCompletedWithWrappedException(g, ex);
1103          checkCompletedNormally(f, v1);
1104 <        assertEquals(1, ran.get());
1104 >        mustEqual(1, ran.get());
1105      }}
1106  
1107      /**
# Line 1116 | Line 1116 | public class CompletableFutureTest exten
1116          final AtomicInteger ran = new AtomicInteger(0);
1117          final CFException ex1 = new CFException();
1118          final CFException ex2 = new CFException();
1119 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1119 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1120  
1121          if (!createIncomplete) f.completeExceptionally(ex1);
1122 <        final CompletableFuture<Integer> g = m.whenComplete
1122 >        final CompletableFuture<Item> g = m.whenComplete
1123              (f,
1124 <             (Integer result, Throwable t) -> {
1124 >             (Item result, Throwable t) -> {
1125                  m.checkExecutionMode();
1126                  assertSame(t, ex1);
1127                  assertNull(result);
# Line 1133 | Line 1133 | public class CompletableFutureTest exten
1133          checkCompletedWithWrappedException(g, ex1);
1134          checkCompletedExceptionally(f, ex1);
1135          if (testImplementationDetails) {
1136 <            assertEquals(1, ex1.getSuppressed().length);
1136 >            mustEqual(1, ex1.getSuppressed().length);
1137              assertSame(ex2, ex1.getSuppressed()[0]);
1138          }
1139 <        assertEquals(1, ran.get());
1139 >        mustEqual(1, ran.get());
1140      }}
1141  
1142      /**
# Line 1146 | Line 1146 | public class CompletableFutureTest exten
1146      public void testHandle_normalCompletion() {
1147          for (ExecutionMode m : ExecutionMode.values())
1148          for (boolean createIncomplete : new boolean[] { true, false })
1149 <        for (Integer v1 : new Integer[] { 1, null })
1149 >        for (Item v1 : new Item[] { one, null })
1150      {
1151 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1151 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1152          final AtomicInteger ran = new AtomicInteger(0);
1153          if (!createIncomplete) assertTrue(f.complete(v1));
1154 <        final CompletableFuture<Integer> g = m.handle
1154 >        final CompletableFuture<Item> g = m.handle
1155              (f,
1156 <             (Integer result, Throwable t) -> {
1156 >             (Item result, Throwable t) -> {
1157                  m.checkExecutionMode();
1158                  assertSame(result, v1);
1159                  assertNull(t);
# Line 1164 | Line 1164 | public class CompletableFutureTest exten
1164  
1165          checkCompletedNormally(g, inc(v1));
1166          checkCompletedNormally(f, v1);
1167 <        assertEquals(1, ran.get());
1167 >        mustEqual(1, ran.get());
1168      }}
1169  
1170      /**
# Line 1174 | Line 1174 | public class CompletableFutureTest exten
1174      public void testHandle_exceptionalCompletion() {
1175          for (ExecutionMode m : ExecutionMode.values())
1176          for (boolean createIncomplete : new boolean[] { true, false })
1177 <        for (Integer v1 : new Integer[] { 1, null })
1177 >        for (Item v1 : new Item[] { one, null })
1178      {
1179 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1179 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1180          final AtomicInteger ran = new AtomicInteger(0);
1181          final CFException ex = new CFException();
1182          if (!createIncomplete) f.completeExceptionally(ex);
1183 <        final CompletableFuture<Integer> g = m.handle
1183 >        final CompletableFuture<Item> g = m.handle
1184              (f,
1185 <             (Integer result, Throwable t) -> {
1185 >             (Item result, Throwable t) -> {
1186                  m.checkExecutionMode();
1187                  assertNull(result);
1188                  assertSame(t, ex);
# Line 1193 | Line 1193 | public class CompletableFutureTest exten
1193  
1194          checkCompletedNormally(g, v1);
1195          checkCompletedExceptionally(f, ex);
1196 <        assertEquals(1, ran.get());
1196 >        mustEqual(1, ran.get());
1197      }}
1198  
1199      /**
# Line 1204 | Line 1204 | public class CompletableFutureTest exten
1204          for (ExecutionMode m : ExecutionMode.values())
1205          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1206          for (boolean createIncomplete : new boolean[] { true, false })
1207 <        for (Integer v1 : new Integer[] { 1, null })
1207 >        for (Item v1 : new Item[] { one, null })
1208      {
1209 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1209 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1210          final AtomicInteger ran = new AtomicInteger(0);
1211          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
1212 <        final CompletableFuture<Integer> g = m.handle
1212 >        final CompletableFuture<Item> g = m.handle
1213              (f,
1214 <             (Integer result, Throwable t) -> {
1214 >             (Item result, Throwable t) -> {
1215                  m.checkExecutionMode();
1216                  assertNull(result);
1217                  assertTrue(t instanceof CancellationException);
# Line 1222 | Line 1222 | public class CompletableFutureTest exten
1222  
1223          checkCompletedNormally(g, v1);
1224          checkCancelled(f);
1225 <        assertEquals(1, ran.get());
1225 >        mustEqual(1, ran.get());
1226      }}
1227  
1228      /**
# Line 1232 | Line 1232 | public class CompletableFutureTest exten
1232      public void testHandle_sourceCompletedNormallyActionFailed() {
1233          for (ExecutionMode m : ExecutionMode.values())
1234          for (boolean createIncomplete : new boolean[] { true, false })
1235 <        for (Integer v1 : new Integer[] { 1, null })
1235 >        for (Item v1 : new Item[] { one, null })
1236      {
1237 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1237 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1238          final AtomicInteger ran = new AtomicInteger(0);
1239          final CFException ex = new CFException();
1240          if (!createIncomplete) assertTrue(f.complete(v1));
1241 <        final CompletableFuture<Integer> g = m.handle
1241 >        final CompletableFuture<Item> g = m.handle
1242              (f,
1243 <             (Integer result, Throwable t) -> {
1243 >             (Item result, Throwable t) -> {
1244                  m.checkExecutionMode();
1245                  assertSame(result, v1);
1246                  assertNull(t);
# Line 1251 | Line 1251 | public class CompletableFutureTest exten
1251  
1252          checkCompletedWithWrappedException(g, ex);
1253          checkCompletedNormally(f, v1);
1254 <        assertEquals(1, ran.get());
1254 >        mustEqual(1, ran.get());
1255      }}
1256  
1257      /**
# Line 1266 | Line 1266 | public class CompletableFutureTest exten
1266          final AtomicInteger ran = new AtomicInteger(0);
1267          final CFException ex1 = new CFException();
1268          final CFException ex2 = new CFException();
1269 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1269 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1270  
1271          if (!createIncomplete) f.completeExceptionally(ex1);
1272 <        final CompletableFuture<Integer> g = m.handle
1272 >        final CompletableFuture<Item> g = m.handle
1273              (f,
1274 <             (Integer result, Throwable t) -> {
1274 >             (Item result, Throwable t) -> {
1275                  m.checkExecutionMode();
1276                  assertNull(result);
1277                  assertSame(ex1, t);
# Line 1282 | Line 1282 | public class CompletableFutureTest exten
1282  
1283          checkCompletedWithWrappedException(g, ex2);
1284          checkCompletedExceptionally(f, ex1);
1285 <        assertEquals(1, ran.get());
1285 >        mustEqual(1, ran.get());
1286      }}
1287  
1288      /**
# Line 1328 | Line 1328 | public class CompletableFutureTest exten
1328              assertSame(e.ex, t);
1329          }
1330  
1331 <        assertEquals(1, e.count.get());
1331 >        mustEqual(1, e.count.get());
1332      }
1333  
1334      /**
# Line 1340 | Line 1340 | public class CompletableFutureTest exten
1340              ExecutionMode.EXECUTOR,
1341          };
1342          for (ExecutionMode m : executionModes)
1343 <        for (Integer v1 : new Integer[] { 1, null })
1343 >        for (Item v1 : new Item[] { one, null })
1344      {
1345 <        final IntegerSupplier r = new IntegerSupplier(m, v1);
1346 <        final CompletableFuture<Integer> f = m.supplyAsync(r);
1345 >        final ItemSupplier r = new ItemSupplier(m, v1);
1346 >        final CompletableFuture<Item> f = m.supplyAsync(r);
1347          assertSame(v1, f.join());
1348          checkCompletedNormally(f, v1);
1349          r.assertInvoked();
# Line 1360 | Line 1360 | public class CompletableFutureTest exten
1360          for (ExecutionMode m : executionModes)
1361      {
1362          FailingSupplier r = new FailingSupplier(m);
1363 <        CompletableFuture<Integer> f = m.supplyAsync(r);
1363 >        CompletableFuture<Item> f = m.supplyAsync(r);
1364          checkCompletedWithWrappedException(f, r.ex);
1365          r.assertInvoked();
1366      }}
# Line 1375 | Line 1375 | public class CompletableFutureTest exten
1375              assertSame(e.ex, t);
1376          }
1377  
1378 <        assertEquals(1, e.count.get());
1378 >        mustEqual(1, e.count.get());
1379      }
1380  
1381      // seq completion methods
# Line 1385 | Line 1385 | public class CompletableFutureTest exten
1385       */
1386      public void testThenRun_normalCompletion() {
1387          for (ExecutionMode m : ExecutionMode.values())
1388 <        for (Integer v1 : new Integer[] { 1, null })
1388 >        for (Item v1 : new Item[] { one, null })
1389      {
1390 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1390 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1391          final Noop[] rs = new Noop[6];
1392          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1393  
# Line 1420 | Line 1420 | public class CompletableFutureTest exten
1420          for (ExecutionMode m : ExecutionMode.values())
1421      {
1422          final CFException ex = new CFException();
1423 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1423 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1424          final Noop[] rs = new Noop[6];
1425          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1426  
# Line 1452 | Line 1452 | public class CompletableFutureTest exten
1452          for (ExecutionMode m : ExecutionMode.values())
1453          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1454      {
1455 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1455 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1456          final Noop[] rs = new Noop[6];
1457          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
1458  
# Line 1482 | Line 1482 | public class CompletableFutureTest exten
1482       */
1483      public void testThenRun_actionFailed() {
1484          for (ExecutionMode m : ExecutionMode.values())
1485 <        for (Integer v1 : new Integer[] { 1, null })
1485 >        for (Item v1 : new Item[] { one, null })
1486      {
1487 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1487 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1488          final FailingRunnable[] rs = new FailingRunnable[6];
1489          for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
1490  
# Line 1510 | Line 1510 | public class CompletableFutureTest exten
1510       */
1511      public void testThenApply_normalCompletion() {
1512          for (ExecutionMode m : ExecutionMode.values())
1513 <        for (Integer v1 : new Integer[] { 1, null })
1513 >        for (Item v1 : new Item[] { one, null })
1514      {
1515 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1515 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1516          final IncFunction[] rs = new IncFunction[4];
1517          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1518  
1519 <        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1520 <        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1519 >        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
1520 >        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
1521          checkIncomplete(h0);
1522          checkIncomplete(h1);
1523          assertTrue(f.complete(v1));
1524 <        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1525 <        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1524 >        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
1525 >        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
1526  
1527          checkCompletedNormally(h0, inc(v1));
1528          checkCompletedNormally(h1, inc(v1));
# Line 1540 | Line 1540 | public class CompletableFutureTest exten
1540          for (ExecutionMode m : ExecutionMode.values())
1541      {
1542          final CFException ex = new CFException();
1543 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1543 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1544          final IncFunction[] rs = new IncFunction[4];
1545          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1546  
1547 <        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1548 <        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1547 >        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
1548 >        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
1549          assertTrue(f.completeExceptionally(ex));
1550 <        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1551 <        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1550 >        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
1551 >        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
1552  
1553          checkCompletedWithWrappedException(h0, ex);
1554          checkCompletedWithWrappedException(h1, ex);
# Line 1565 | Line 1565 | public class CompletableFutureTest exten
1565          for (ExecutionMode m : ExecutionMode.values())
1566          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1567      {
1568 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1568 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1569          final IncFunction[] rs = new IncFunction[4];
1570          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
1571  
1572 <        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1573 <        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1572 >        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
1573 >        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
1574          assertTrue(f.cancel(mayInterruptIfRunning));
1575 <        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1576 <        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1575 >        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
1576 >        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
1577  
1578          checkCompletedWithWrappedCancellationException(h0);
1579          checkCompletedWithWrappedCancellationException(h1);
# Line 1588 | Line 1588 | public class CompletableFutureTest exten
1588       */
1589      public void testThenApply_actionFailed() {
1590          for (ExecutionMode m : ExecutionMode.values())
1591 <        for (Integer v1 : new Integer[] { 1, null })
1591 >        for (Item v1 : new Item[] { one, null })
1592      {
1593 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1593 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1594          final FailingFunction[] rs = new FailingFunction[4];
1595          for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
1596  
1597 <        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
1598 <        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
1597 >        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
1598 >        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
1599          assertTrue(f.complete(v1));
1600 <        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1601 <        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1600 >        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
1601 >        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
1602  
1603          checkCompletedWithWrappedException(h0, rs[0].ex);
1604          checkCompletedWithWrappedException(h1, rs[1].ex);
# Line 1612 | Line 1612 | public class CompletableFutureTest exten
1612       */
1613      public void testThenAccept_normalCompletion() {
1614          for (ExecutionMode m : ExecutionMode.values())
1615 <        for (Integer v1 : new Integer[] { 1, null })
1615 >        for (Item v1 : new Item[] { one, null })
1616      {
1617 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1617 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1618          final NoopConsumer[] rs = new NoopConsumer[4];
1619          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1620  
# Line 1642 | Line 1642 | public class CompletableFutureTest exten
1642          for (ExecutionMode m : ExecutionMode.values())
1643      {
1644          final CFException ex = new CFException();
1645 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1645 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1646          final NoopConsumer[] rs = new NoopConsumer[4];
1647          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1648  
# Line 1667 | Line 1667 | public class CompletableFutureTest exten
1667          for (ExecutionMode m : ExecutionMode.values())
1668          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1669      {
1670 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1670 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1671          final NoopConsumer[] rs = new NoopConsumer[4];
1672          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
1673  
# Line 1690 | Line 1690 | public class CompletableFutureTest exten
1690       */
1691      public void testThenAccept_actionFailed() {
1692          for (ExecutionMode m : ExecutionMode.values())
1693 <        for (Integer v1 : new Integer[] { 1, null })
1693 >        for (Item v1 : new Item[] { one, null })
1694      {
1695 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1695 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1696          final FailingConsumer[] rs = new FailingConsumer[4];
1697          for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
1698  
# Line 1716 | Line 1716 | public class CompletableFutureTest exten
1716      public void testThenCombine_normalCompletion() {
1717          for (ExecutionMode m : ExecutionMode.values())
1718          for (boolean fFirst : new boolean[] { true, false })
1719 <        for (Integer v1 : new Integer[] { 1, null })
1720 <        for (Integer v2 : new Integer[] { 2, null })
1719 >        for (Item v1 : new Item[] { one, null })
1720 >        for (Item v2 : new Item[] { two, null })
1721      {
1722 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1723 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1722 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1723 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1724          final SubtractFunction[] rs = new SubtractFunction[6];
1725          for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
1726  
1727 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1728 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1729 <        final Integer w1 =  fFirst ? v1 : v2;
1730 <        final Integer w2 = !fFirst ? v1 : v2;
1727 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1728 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1729 >        final Item w1 =  fFirst ? v1 : v2;
1730 >        final Item w2 = !fFirst ? v1 : v2;
1731  
1732 <        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
1733 <        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
1732 >        final CompletableFuture<Item> h0 = m.thenCombine(f, g, rs[0]);
1733 >        final CompletableFuture<Item> h1 = m.thenCombine(fst, fst, rs[1]);
1734          assertTrue(fst.complete(w1));
1735 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
1736 <        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
1735 >        final CompletableFuture<Item> h2 = m.thenCombine(f, g, rs[2]);
1736 >        final CompletableFuture<Item> h3 = m.thenCombine(fst, fst, rs[3]);
1737          checkIncomplete(h0); rs[0].assertNotInvoked();
1738          checkIncomplete(h2); rs[2].assertNotInvoked();
1739          checkCompletedNormally(h1, subtract(w1, w1));
# Line 1741 | Line 1741 | public class CompletableFutureTest exten
1741          rs[1].assertValue(subtract(w1, w1));
1742          rs[3].assertValue(subtract(w1, w1));
1743          assertTrue(snd.complete(w2));
1744 <        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
1744 >        final CompletableFuture<Item> h4 = m.thenCombine(f, g, rs[4]);
1745  
1746          checkCompletedNormally(h0, subtract(v1, v2));
1747          checkCompletedNormally(h2, subtract(v1, v2));
# Line 1762 | Line 1762 | public class CompletableFutureTest exten
1762          for (ExecutionMode m : ExecutionMode.values())
1763          for (boolean fFirst : new boolean[] { true, false })
1764          for (boolean failFirst : new boolean[] { true, false })
1765 <        for (Integer v1 : new Integer[] { 1, null })
1765 >        for (Item v1 : new Item[] { one, null })
1766      {
1767 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1768 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1767 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1768 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1769          final CFException ex = new CFException();
1770          final SubtractFunction r1 = new SubtractFunction(m);
1771          final SubtractFunction r2 = new SubtractFunction(m);
1772          final SubtractFunction r3 = new SubtractFunction(m);
1773  
1774 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1775 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1774 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1775 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1776          final Callable<Boolean> complete1 = failFirst ?
1777              () -> fst.completeExceptionally(ex) :
1778              () -> fst.complete(v1);
# Line 1780 | Line 1780 | public class CompletableFutureTest exten
1780              () -> snd.complete(v1) :
1781              () -> snd.completeExceptionally(ex);
1782  
1783 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1783 >        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
1784          assertTrue(complete1.call());
1785 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1785 >        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
1786          checkIncomplete(h1);
1787          checkIncomplete(h2);
1788          assertTrue(complete2.call());
1789 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1789 >        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
1790  
1791          checkCompletedWithWrappedException(h1, ex);
1792          checkCompletedWithWrappedException(h2, ex);
# Line 1806 | Line 1806 | public class CompletableFutureTest exten
1806          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1807          for (boolean fFirst : new boolean[] { true, false })
1808          for (boolean failFirst : new boolean[] { true, false })
1809 <        for (Integer v1 : new Integer[] { 1, null })
1809 >        for (Item v1 : new Item[] { one, null })
1810      {
1811 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1812 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1811 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1812 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1813          final SubtractFunction r1 = new SubtractFunction(m);
1814          final SubtractFunction r2 = new SubtractFunction(m);
1815          final SubtractFunction r3 = new SubtractFunction(m);
1816  
1817 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1818 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1817 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1818 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1819          final Callable<Boolean> complete1 = failFirst ?
1820              () -> fst.cancel(mayInterruptIfRunning) :
1821              () -> fst.complete(v1);
# Line 1823 | Line 1823 | public class CompletableFutureTest exten
1823              () -> snd.complete(v1) :
1824              () -> snd.cancel(mayInterruptIfRunning);
1825  
1826 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1826 >        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
1827          assertTrue(complete1.call());
1828 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1828 >        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
1829          checkIncomplete(h1);
1830          checkIncomplete(h2);
1831          assertTrue(complete2.call());
1832 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1832 >        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
1833  
1834          checkCompletedWithWrappedCancellationException(h1);
1835          checkCompletedWithWrappedCancellationException(h2);
# Line 1847 | Line 1847 | public class CompletableFutureTest exten
1847      public void testThenCombine_actionFailed() {
1848          for (ExecutionMode m : ExecutionMode.values())
1849          for (boolean fFirst : new boolean[] { true, false })
1850 <        for (Integer v1 : new Integer[] { 1, null })
1851 <        for (Integer v2 : new Integer[] { 2, null })
1850 >        for (Item v1 : new Item[] { one, null })
1851 >        for (Item v2 : new Item[] { two, null })
1852      {
1853 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1854 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1853 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1854 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1855          final FailingBiFunction r1 = new FailingBiFunction(m);
1856          final FailingBiFunction r2 = new FailingBiFunction(m);
1857          final FailingBiFunction r3 = new FailingBiFunction(m);
1858  
1859 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1860 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1861 <        final Integer w1 =  fFirst ? v1 : v2;
1862 <        final Integer w2 = !fFirst ? v1 : v2;
1859 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1860 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1861 >        final Item w1 =  fFirst ? v1 : v2;
1862 >        final Item w2 = !fFirst ? v1 : v2;
1863  
1864 <        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
1864 >        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
1865          assertTrue(fst.complete(w1));
1866 <        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
1866 >        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
1867          assertTrue(snd.complete(w2));
1868 <        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1868 >        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
1869  
1870          checkCompletedWithWrappedException(h1, r1.ex);
1871          checkCompletedWithWrappedException(h2, r2.ex);
# Line 1884 | Line 1884 | public class CompletableFutureTest exten
1884      public void testThenAcceptBoth_normalCompletion() {
1885          for (ExecutionMode m : ExecutionMode.values())
1886          for (boolean fFirst : new boolean[] { true, false })
1887 <        for (Integer v1 : new Integer[] { 1, null })
1888 <        for (Integer v2 : new Integer[] { 2, null })
1887 >        for (Item v1 : new Item[] { one, null })
1888 >        for (Item v2 : new Item[] { two, null })
1889      {
1890 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1891 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1890 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1891 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1892          final SubtractAction r1 = new SubtractAction(m);
1893          final SubtractAction r2 = new SubtractAction(m);
1894          final SubtractAction r3 = new SubtractAction(m);
1895  
1896 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1897 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1898 <        final Integer w1 =  fFirst ? v1 : v2;
1899 <        final Integer w2 = !fFirst ? v1 : v2;
1896 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1897 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1898 >        final Item w1 =  fFirst ? v1 : v2;
1899 >        final Item w2 = !fFirst ? v1 : v2;
1900  
1901          final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
1902          assertTrue(fst.complete(w1));
# Line 1926 | Line 1926 | public class CompletableFutureTest exten
1926          for (ExecutionMode m : ExecutionMode.values())
1927          for (boolean fFirst : new boolean[] { true, false })
1928          for (boolean failFirst : new boolean[] { true, false })
1929 <        for (Integer v1 : new Integer[] { 1, null })
1929 >        for (Item v1 : new Item[] { one, null })
1930      {
1931 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1932 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1931 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1932 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1933          final CFException ex = new CFException();
1934          final SubtractAction r1 = new SubtractAction(m);
1935          final SubtractAction r2 = new SubtractAction(m);
1936          final SubtractAction r3 = new SubtractAction(m);
1937  
1938 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1939 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1938 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1939 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1940          final Callable<Boolean> complete1 = failFirst ?
1941              () -> fst.completeExceptionally(ex) :
1942              () -> fst.complete(v1);
# Line 1970 | Line 1970 | public class CompletableFutureTest exten
1970          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1971          for (boolean fFirst : new boolean[] { true, false })
1972          for (boolean failFirst : new boolean[] { true, false })
1973 <        for (Integer v1 : new Integer[] { 1, null })
1973 >        for (Item v1 : new Item[] { one, null })
1974      {
1975 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
1976 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
1975 >        final CompletableFuture<Item> f = new CompletableFuture<>();
1976 >        final CompletableFuture<Item> g = new CompletableFuture<>();
1977          final SubtractAction r1 = new SubtractAction(m);
1978          final SubtractAction r2 = new SubtractAction(m);
1979          final SubtractAction r3 = new SubtractAction(m);
1980  
1981 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1982 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1981 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
1982 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
1983          final Callable<Boolean> complete1 = failFirst ?
1984              () -> fst.cancel(mayInterruptIfRunning) :
1985              () -> fst.complete(v1);
# Line 2011 | Line 2011 | public class CompletableFutureTest exten
2011      public void testThenAcceptBoth_actionFailed() {
2012          for (ExecutionMode m : ExecutionMode.values())
2013          for (boolean fFirst : new boolean[] { true, false })
2014 <        for (Integer v1 : new Integer[] { 1, null })
2015 <        for (Integer v2 : new Integer[] { 2, null })
2014 >        for (Item v1 : new Item[] { one, null })
2015 >        for (Item v2 : new Item[] { two, null })
2016      {
2017 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2018 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2017 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2018 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2019          final FailingBiConsumer r1 = new FailingBiConsumer(m);
2020          final FailingBiConsumer r2 = new FailingBiConsumer(m);
2021          final FailingBiConsumer r3 = new FailingBiConsumer(m);
2022  
2023 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2024 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2025 <        final Integer w1 =  fFirst ? v1 : v2;
2026 <        final Integer w2 = !fFirst ? v1 : v2;
2023 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
2024 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
2025 >        final Item w1 =  fFirst ? v1 : v2;
2026 >        final Item w2 = !fFirst ? v1 : v2;
2027  
2028          final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
2029          assertTrue(fst.complete(w1));
# Line 2048 | Line 2048 | public class CompletableFutureTest exten
2048      public void testRunAfterBoth_normalCompletion() {
2049          for (ExecutionMode m : ExecutionMode.values())
2050          for (boolean fFirst : new boolean[] { true, false })
2051 <        for (Integer v1 : new Integer[] { 1, null })
2052 <        for (Integer v2 : new Integer[] { 2, null })
2051 >        for (Item v1 : new Item[] { one, null })
2052 >        for (Item v2 : new Item[] { two, null })
2053      {
2054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2055 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2054 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2055 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2056          final Noop r1 = new Noop(m);
2057          final Noop r2 = new Noop(m);
2058          final Noop r3 = new Noop(m);
2059  
2060 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2061 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2062 <        final Integer w1 =  fFirst ? v1 : v2;
2063 <        final Integer w2 = !fFirst ? v1 : v2;
2060 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
2061 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
2062 >        final Item w1 =  fFirst ? v1 : v2;
2063 >        final Item w2 = !fFirst ? v1 : v2;
2064  
2065          final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2066          assertTrue(fst.complete(w1));
# Line 2090 | Line 2090 | public class CompletableFutureTest exten
2090          for (ExecutionMode m : ExecutionMode.values())
2091          for (boolean fFirst : new boolean[] { true, false })
2092          for (boolean failFirst : new boolean[] { true, false })
2093 <        for (Integer v1 : new Integer[] { 1, null })
2093 >        for (Item v1 : new Item[] { one, null })
2094      {
2095 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2096 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2095 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2096 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2097          final CFException ex = new CFException();
2098          final Noop r1 = new Noop(m);
2099          final Noop r2 = new Noop(m);
2100          final Noop r3 = new Noop(m);
2101  
2102 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2103 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2102 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
2103 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
2104          final Callable<Boolean> complete1 = failFirst ?
2105              () -> fst.completeExceptionally(ex) :
2106              () -> fst.complete(v1);
# Line 2134 | Line 2134 | public class CompletableFutureTest exten
2134          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2135          for (boolean fFirst : new boolean[] { true, false })
2136          for (boolean failFirst : new boolean[] { true, false })
2137 <        for (Integer v1 : new Integer[] { 1, null })
2137 >        for (Item v1 : new Item[] { one, null })
2138      {
2139 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2140 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2139 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2140 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2141          final Noop r1 = new Noop(m);
2142          final Noop r2 = new Noop(m);
2143          final Noop r3 = new Noop(m);
2144  
2145 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2146 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2145 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
2146 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
2147          final Callable<Boolean> complete1 = failFirst ?
2148              () -> fst.cancel(mayInterruptIfRunning) :
2149              () -> fst.complete(v1);
# Line 2175 | Line 2175 | public class CompletableFutureTest exten
2175      public void testRunAfterBoth_actionFailed() {
2176          for (ExecutionMode m : ExecutionMode.values())
2177          for (boolean fFirst : new boolean[] { true, false })
2178 <        for (Integer v1 : new Integer[] { 1, null })
2179 <        for (Integer v2 : new Integer[] { 2, null })
2178 >        for (Item v1 : new Item[] { one, null })
2179 >        for (Item v2 : new Item[] { two, null })
2180      {
2181 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2182 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2181 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2182 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2183          final FailingRunnable r1 = new FailingRunnable(m);
2184          final FailingRunnable r2 = new FailingRunnable(m);
2185          final FailingRunnable r3 = new FailingRunnable(m);
2186  
2187 <        final CompletableFuture<Integer> fst =  fFirst ? f : g;
2188 <        final CompletableFuture<Integer> snd = !fFirst ? f : g;
2189 <        final Integer w1 =  fFirst ? v1 : v2;
2190 <        final Integer w2 = !fFirst ? v1 : v2;
2187 >        final CompletableFuture<Item> fst =  fFirst ? f : g;
2188 >        final CompletableFuture<Item> snd = !fFirst ? f : g;
2189 >        final Item w1 =  fFirst ? v1 : v2;
2190 >        final Item w2 = !fFirst ? v1 : v2;
2191  
2192          final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2193          assertTrue(fst.complete(w1));
# Line 2211 | Line 2211 | public class CompletableFutureTest exten
2211       */
2212      public void testApplyToEither_normalCompletion() {
2213          for (ExecutionMode m : ExecutionMode.values())
2214 <        for (Integer v1 : new Integer[] { 1, null })
2215 <        for (Integer v2 : new Integer[] { 2, null })
2214 >        for (Item v1 : new Item[] { one, null })
2215 >        for (Item v2 : new Item[] { two, null })
2216      {
2217 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2218 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2217 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2218 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2219          final IncFunction[] rs = new IncFunction[6];
2220          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2221  
2222 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2223 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2222 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2223 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2224          checkIncomplete(h0);
2225          checkIncomplete(h1);
2226          rs[0].assertNotInvoked();
# Line 2228 | Line 2228 | public class CompletableFutureTest exten
2228          f.complete(v1);
2229          checkCompletedNormally(h0, inc(v1));
2230          checkCompletedNormally(h1, inc(v1));
2231 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2232 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2231 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2232 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2233          checkCompletedNormally(h2, inc(v1));
2234          checkCompletedNormally(h3, inc(v1));
2235          g.complete(v2);
2236  
2237          // unspecified behavior - both source completions available
2238 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2239 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2238 >        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
2239 >        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
2240          rs[4].assertValue(h4.join());
2241          rs[5].assertValue(h5.join());
2242          assertTrue(Objects.equals(inc(v1), h4.join()) ||
# Line 2259 | Line 2259 | public class CompletableFutureTest exten
2259       */
2260      public void testApplyToEither_exceptionalCompletion() {
2261          for (ExecutionMode m : ExecutionMode.values())
2262 <        for (Integer v1 : new Integer[] { 1, null })
2262 >        for (Item v1 : new Item[] { one, null })
2263      {
2264 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2265 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2264 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2265 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2266          final CFException ex = new CFException();
2267          final IncFunction[] rs = new IncFunction[6];
2268          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2269  
2270 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2271 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2270 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2271 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2272          checkIncomplete(h0);
2273          checkIncomplete(h1);
2274          rs[0].assertNotInvoked();
# Line 2276 | Line 2276 | public class CompletableFutureTest exten
2276          f.completeExceptionally(ex);
2277          checkCompletedWithWrappedException(h0, ex);
2278          checkCompletedWithWrappedException(h1, ex);
2279 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2280 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2279 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2280 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2281          checkCompletedWithWrappedException(h2, ex);
2282          checkCompletedWithWrappedException(h3, ex);
2283          g.complete(v1);
2284  
2285          // unspecified behavior - both source completions available
2286 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2287 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2286 >        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
2287 >        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
2288          try {
2289 <            assertEquals(inc(v1), h4.join());
2289 >            mustEqual(inc(v1), h4.join());
2290              rs[4].assertValue(inc(v1));
2291          } catch (CompletionException ok) {
2292              checkCompletedWithWrappedException(h4, ex);
2293              rs[4].assertNotInvoked();
2294          }
2295          try {
2296 <            assertEquals(inc(v1), h5.join());
2296 >            mustEqual(inc(v1), h5.join());
2297              rs[5].assertValue(inc(v1));
2298          } catch (CompletionException ok) {
2299              checkCompletedWithWrappedException(h5, ex);
# Line 2313 | Line 2313 | public class CompletableFutureTest exten
2313      public void testApplyToEither_exceptionalCompletion2() {
2314          for (ExecutionMode m : ExecutionMode.values())
2315          for (boolean fFirst : new boolean[] { true, false })
2316 <        for (Integer v1 : new Integer[] { 1, null })
2316 >        for (Item v1 : new Item[] { one, null })
2317      {
2318 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2319 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2318 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2319 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2320          final CFException ex = new CFException();
2321          final IncFunction[] rs = new IncFunction[6];
2322          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2323  
2324 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2325 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2324 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2325 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2326          assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2327          assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
2328 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2329 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2328 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2329 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2330  
2331          // unspecified behavior - both source completions available
2332          try {
2333 <            assertEquals(inc(v1), h0.join());
2333 >            mustEqual(inc(v1), h0.join());
2334              rs[0].assertValue(inc(v1));
2335          } catch (CompletionException ok) {
2336              checkCompletedWithWrappedException(h0, ex);
2337              rs[0].assertNotInvoked();
2338          }
2339          try {
2340 <            assertEquals(inc(v1), h1.join());
2340 >            mustEqual(inc(v1), h1.join());
2341              rs[1].assertValue(inc(v1));
2342          } catch (CompletionException ok) {
2343              checkCompletedWithWrappedException(h1, ex);
2344              rs[1].assertNotInvoked();
2345          }
2346          try {
2347 <            assertEquals(inc(v1), h2.join());
2347 >            mustEqual(inc(v1), h2.join());
2348              rs[2].assertValue(inc(v1));
2349          } catch (CompletionException ok) {
2350              checkCompletedWithWrappedException(h2, ex);
2351              rs[2].assertNotInvoked();
2352          }
2353          try {
2354 <            assertEquals(inc(v1), h3.join());
2354 >            mustEqual(inc(v1), h3.join());
2355              rs[3].assertValue(inc(v1));
2356          } catch (CompletionException ok) {
2357              checkCompletedWithWrappedException(h3, ex);
# Line 2368 | Line 2368 | public class CompletableFutureTest exten
2368      public void testApplyToEither_sourceCancelled() {
2369          for (ExecutionMode m : ExecutionMode.values())
2370          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2371 <        for (Integer v1 : new Integer[] { 1, null })
2371 >        for (Item v1 : new Item[] { one, null })
2372      {
2373 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2374 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2373 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2374 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2375          final IncFunction[] rs = new IncFunction[6];
2376          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2377  
2378 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2379 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2378 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2379 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2380          checkIncomplete(h0);
2381          checkIncomplete(h1);
2382          rs[0].assertNotInvoked();
# Line 2384 | Line 2384 | public class CompletableFutureTest exten
2384          f.cancel(mayInterruptIfRunning);
2385          checkCompletedWithWrappedCancellationException(h0);
2386          checkCompletedWithWrappedCancellationException(h1);
2387 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2388 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2387 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2388 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2389          checkCompletedWithWrappedCancellationException(h2);
2390          checkCompletedWithWrappedCancellationException(h3);
2391          g.complete(v1);
2392  
2393          // unspecified behavior - both source completions available
2394 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2395 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2394 >        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
2395 >        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
2396          try {
2397 <            assertEquals(inc(v1), h4.join());
2397 >            mustEqual(inc(v1), h4.join());
2398              rs[4].assertValue(inc(v1));
2399          } catch (CompletionException ok) {
2400              checkCompletedWithWrappedCancellationException(h4);
2401              rs[4].assertNotInvoked();
2402          }
2403          try {
2404 <            assertEquals(inc(v1), h5.join());
2404 >            mustEqual(inc(v1), h5.join());
2405              rs[5].assertValue(inc(v1));
2406          } catch (CompletionException ok) {
2407              checkCompletedWithWrappedCancellationException(h5);
# Line 2421 | Line 2421 | public class CompletableFutureTest exten
2421          for (ExecutionMode m : ExecutionMode.values())
2422          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2423          for (boolean fFirst : new boolean[] { true, false })
2424 <        for (Integer v1 : new Integer[] { 1, null })
2424 >        for (Item v1 : new Item[] { one, null })
2425      {
2426 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2427 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2426 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2427 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2428          final IncFunction[] rs = new IncFunction[6];
2429          for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
2430  
2431 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2432 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2431 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2432 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2433          assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2434          assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
2435 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2436 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2435 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2436 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2437  
2438          // unspecified behavior - both source completions available
2439          try {
2440 <            assertEquals(inc(v1), h0.join());
2440 >            mustEqual(inc(v1), h0.join());
2441              rs[0].assertValue(inc(v1));
2442          } catch (CompletionException ok) {
2443              checkCompletedWithWrappedCancellationException(h0);
2444              rs[0].assertNotInvoked();
2445          }
2446          try {
2447 <            assertEquals(inc(v1), h1.join());
2447 >            mustEqual(inc(v1), h1.join());
2448              rs[1].assertValue(inc(v1));
2449          } catch (CompletionException ok) {
2450              checkCompletedWithWrappedCancellationException(h1);
2451              rs[1].assertNotInvoked();
2452          }
2453          try {
2454 <            assertEquals(inc(v1), h2.join());
2454 >            mustEqual(inc(v1), h2.join());
2455              rs[2].assertValue(inc(v1));
2456          } catch (CompletionException ok) {
2457              checkCompletedWithWrappedCancellationException(h2);
2458              rs[2].assertNotInvoked();
2459          }
2460          try {
2461 <            assertEquals(inc(v1), h3.join());
2461 >            mustEqual(inc(v1), h3.join());
2462              rs[3].assertValue(inc(v1));
2463          } catch (CompletionException ok) {
2464              checkCompletedWithWrappedCancellationException(h3);
# Line 2474 | Line 2474 | public class CompletableFutureTest exten
2474       */
2475      public void testApplyToEither_actionFailed() {
2476          for (ExecutionMode m : ExecutionMode.values())
2477 <        for (Integer v1 : new Integer[] { 1, null })
2478 <        for (Integer v2 : new Integer[] { 2, null })
2477 >        for (Item v1 : new Item[] { one, null })
2478 >        for (Item v2 : new Item[] { two, null })
2479      {
2480 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2481 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2480 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2481 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2482          final FailingFunction[] rs = new FailingFunction[6];
2483          for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
2484  
2485 <        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
2486 <        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
2485 >        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
2486 >        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
2487          f.complete(v1);
2488 <        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2489 <        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2488 >        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
2489 >        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
2490          checkCompletedWithWrappedException(h0, rs[0].ex);
2491          checkCompletedWithWrappedException(h1, rs[1].ex);
2492          checkCompletedWithWrappedException(h2, rs[2].ex);
# Line 2496 | Line 2496 | public class CompletableFutureTest exten
2496          g.complete(v2);
2497  
2498          // unspecified behavior - both source completions available
2499 <        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2500 <        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2499 >        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
2500 >        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
2501  
2502          checkCompletedWithWrappedException(h4, rs[4].ex);
2503          assertTrue(Objects.equals(v1, rs[4].value) ||
# Line 2516 | Line 2516 | public class CompletableFutureTest exten
2516       */
2517      public void testAcceptEither_normalCompletion() {
2518          for (ExecutionMode m : ExecutionMode.values())
2519 <        for (Integer v1 : new Integer[] { 1, null })
2520 <        for (Integer v2 : new Integer[] { 2, null })
2519 >        for (Item v1 : new Item[] { one, null })
2520 >        for (Item v2 : new Item[] { two, null })
2521      {
2522 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2523 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2522 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2523 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2524          final NoopConsumer[] rs = new NoopConsumer[6];
2525          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2526  
# Line 2568 | Line 2568 | public class CompletableFutureTest exten
2568       */
2569      public void testAcceptEither_exceptionalCompletion() {
2570          for (ExecutionMode m : ExecutionMode.values())
2571 <        for (Integer v1 : new Integer[] { 1, null })
2571 >        for (Item v1 : new Item[] { one, null })
2572      {
2573 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2574 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2573 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2574 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2575          final CFException ex = new CFException();
2576          final NoopConsumer[] rs = new NoopConsumer[6];
2577          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
# Line 2623 | Line 2623 | public class CompletableFutureTest exten
2623      public void testAcceptEither_exceptionalCompletion2() {
2624          for (ExecutionMode m : ExecutionMode.values())
2625          for (boolean fFirst : new boolean[] { true, false })
2626 <        for (Integer v1 : new Integer[] { 1, null })
2626 >        for (Item v1 : new Item[] { one, null })
2627      {
2628 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2629 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2628 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2629 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2630          final CFException ex = new CFException();
2631          final NoopConsumer[] rs = new NoopConsumer[6];
2632          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
# Line 2678 | Line 2678 | public class CompletableFutureTest exten
2678      public void testAcceptEither_sourceCancelled() {
2679          for (ExecutionMode m : ExecutionMode.values())
2680          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2681 <        for (Integer v1 : new Integer[] { 1, null })
2681 >        for (Item v1 : new Item[] { one, null })
2682      {
2683 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2684 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2683 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2684 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2685          final NoopConsumer[] rs = new NoopConsumer[6];
2686          for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
2687  
# Line 2733 | Line 2733 | public class CompletableFutureTest exten
2733       */
2734      public void testAcceptEither_actionFailed() {
2735          for (ExecutionMode m : ExecutionMode.values())
2736 <        for (Integer v1 : new Integer[] { 1, null })
2737 <        for (Integer v2 : new Integer[] { 2, null })
2736 >        for (Item v1 : new Item[] { one, null })
2737 >        for (Item v2 : new Item[] { two, null })
2738      {
2739 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2740 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2739 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2740 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2741          final FailingConsumer[] rs = new FailingConsumer[6];
2742          for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
2743  
# Line 2775 | Line 2775 | public class CompletableFutureTest exten
2775       */
2776      public void testRunAfterEither_normalCompletion() {
2777          for (ExecutionMode m : ExecutionMode.values())
2778 <        for (Integer v1 : new Integer[] { 1, null })
2779 <        for (Integer v2 : new Integer[] { 2, null })
2778 >        for (Item v1 : new Item[] { one, null })
2779 >        for (Item v2 : new Item[] { two, null })
2780          for (boolean pushNop : new boolean[] { true, false })
2781      {
2782 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2783 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2782 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2783 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2784          final Noop[] rs = new Noop[6];
2785          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2786  
# Line 2828 | Line 2828 | public class CompletableFutureTest exten
2828       */
2829      public void testRunAfterEither_exceptionalCompletion() {
2830          for (ExecutionMode m : ExecutionMode.values())
2831 <        for (Integer v1 : new Integer[] { 1, null })
2831 >        for (Item v1 : new Item[] { one, null })
2832      {
2833 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2834 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2833 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2834 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2835          final CFException ex = new CFException();
2836          final Noop[] rs = new Noop[6];
2837          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
# Line 2883 | Line 2883 | public class CompletableFutureTest exten
2883      public void testRunAfterEither_exceptionalCompletion2() {
2884          for (ExecutionMode m : ExecutionMode.values())
2885          for (boolean fFirst : new boolean[] { true, false })
2886 <        for (Integer v1 : new Integer[] { 1, null })
2886 >        for (Item v1 : new Item[] { one, null })
2887      {
2888 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2889 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2888 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2889 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2890          final CFException ex = new CFException();
2891          final Noop[] rs = new Noop[6];
2892          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
# Line 2938 | Line 2938 | public class CompletableFutureTest exten
2938      public void testRunAfterEither_sourceCancelled() {
2939          for (ExecutionMode m : ExecutionMode.values())
2940          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
2941 <        for (Integer v1 : new Integer[] { 1, null })
2941 >        for (Item v1 : new Item[] { one, null })
2942      {
2943 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
2944 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2943 >        final CompletableFuture<Item> f = new CompletableFuture<>();
2944 >        final CompletableFuture<Item> g = new CompletableFuture<>();
2945          final Noop[] rs = new Noop[6];
2946          for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
2947  
# Line 2993 | Line 2993 | public class CompletableFutureTest exten
2993       */
2994      public void testRunAfterEither_actionFailed() {
2995          for (ExecutionMode m : ExecutionMode.values())
2996 <        for (Integer v1 : new Integer[] { 1, null })
2997 <        for (Integer v2 : new Integer[] { 2, null })
2996 >        for (Item v1 : new Item[] { one, null })
2997 >        for (Item v2 : new Item[] { two, null })
2998      {
2999 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3000 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
2999 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3000 >        final CompletableFuture<Item> g = new CompletableFuture<>();
3001          final FailingRunnable[] rs = new FailingRunnable[6];
3002          for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
3003  
# Line 3028 | Line 3028 | public class CompletableFutureTest exten
3028      public void testThenCompose_normalCompletion() {
3029          for (ExecutionMode m : ExecutionMode.values())
3030          for (boolean createIncomplete : new boolean[] { true, false })
3031 <        for (Integer v1 : new Integer[] { 1, null })
3031 >        for (Item v1 : new Item[] { one, null })
3032      {
3033 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3033 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3034          final CompletableFutureInc r = new CompletableFutureInc(m);
3035          if (!createIncomplete) assertTrue(f.complete(v1));
3036 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3036 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3037          if (createIncomplete) assertTrue(f.complete(v1));
3038  
3039          checkCompletedNormally(g, inc(v1));
# Line 3051 | Line 3051 | public class CompletableFutureTest exten
3051      {
3052          final CFException ex = new CFException();
3053          final CompletableFutureInc r = new CompletableFutureInc(m);
3054 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3054 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3055          if (!createIncomplete) f.completeExceptionally(ex);
3056 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3056 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3057          if (createIncomplete) f.completeExceptionally(ex);
3058  
3059          checkCompletedWithWrappedException(g, ex);
# Line 3067 | Line 3067 | public class CompletableFutureTest exten
3067      public void testThenCompose_actionFailed() {
3068          for (ExecutionMode m : ExecutionMode.values())
3069          for (boolean createIncomplete : new boolean[] { true, false })
3070 <        for (Integer v1 : new Integer[] { 1, null })
3070 >        for (Item v1 : new Item[] { one, null })
3071      {
3072 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3072 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3073          final FailingCompletableFutureFunction r
3074              = new FailingCompletableFutureFunction(m);
3075          if (!createIncomplete) assertTrue(f.complete(v1));
3076 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3076 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3077          if (createIncomplete) assertTrue(f.complete(v1));
3078  
3079          checkCompletedWithWrappedException(g, r.ex);
# Line 3088 | Line 3088 | public class CompletableFutureTest exten
3088          for (boolean createIncomplete : new boolean[] { true, false })
3089          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3090      {
3091 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3091 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3092          final CompletableFutureInc r = new CompletableFutureInc(m);
3093          if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
3094 <        final CompletableFuture<Integer> g = m.thenCompose(f, r);
3094 >        final CompletableFuture<Item> g = m.thenCompose(f, r);
3095          if (createIncomplete) {
3096              checkIncomplete(g);
3097              assertTrue(f.cancel(mayInterruptIfRunning));
# Line 3107 | Line 3107 | public class CompletableFutureTest exten
3107      public void testThenCompose_actionReturnsFailingFuture() {
3108          for (ExecutionMode m : ExecutionMode.values())
3109          for (int order = 0; order < 6; order++)
3110 <        for (Integer v1 : new Integer[] { 1, null })
3110 >        for (Item v1 : new Item[] { one, null })
3111      {
3112          final CFException ex = new CFException();
3113 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3114 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3115 <        final CompletableFuture<Integer> h;
3113 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3114 >        final CompletableFuture<Item> g = new CompletableFuture<>();
3115 >        final CompletableFuture<Item> h;
3116          // Test all permutations of orders
3117          switch (order) {
3118          case 0:
# Line 3160 | Line 3160 | public class CompletableFutureTest exten
3160      public void testExceptionallyCompose_normalCompletion() {
3161          for (ExecutionMode m : ExecutionMode.values())
3162          for (boolean createIncomplete : new boolean[] { true, false })
3163 <        for (Integer v1 : new Integer[] { 1, null })
3163 >        for (Item v1 : new Item[] { one, null })
3164      {
3165 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3165 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3166          final ExceptionalCompletableFutureFunction r =
3167              new ExceptionalCompletableFutureFunction(m);
3168          if (!createIncomplete) assertTrue(f.complete(v1));
3169 <        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3169 >        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
3170          if (createIncomplete) assertTrue(f.complete(v1));
3171  
3172          checkCompletedNormally(f, v1);
# Line 3185 | Line 3185 | public class CompletableFutureTest exten
3185          final CFException ex = new CFException();
3186          final ExceptionalCompletableFutureFunction r =
3187              new ExceptionalCompletableFutureFunction(m);
3188 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3188 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3189          if (!createIncomplete) f.completeExceptionally(ex);
3190 <        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3190 >        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
3191          if (createIncomplete) f.completeExceptionally(ex);
3192  
3193          checkCompletedExceptionally(f, ex);
# Line 3203 | Line 3203 | public class CompletableFutureTest exten
3203          for (boolean createIncomplete : new boolean[] { true, false })
3204      {
3205          final CFException ex = new CFException();
3206 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3206 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3207          final FailingExceptionalCompletableFutureFunction r
3208              = new FailingExceptionalCompletableFutureFunction(m);
3209          if (!createIncomplete) f.completeExceptionally(ex);
3210 <        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
3210 >        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
3211          if (createIncomplete) f.completeExceptionally(ex);
3212  
3213          checkCompletedExceptionally(f, ex);
# Line 3225 | Line 3225 | public class CompletableFutureTest exten
3225      {
3226          final CFException ex0 = new CFException();
3227          final CFException ex = new CFException();
3228 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
3229 <        final CompletableFuture<Integer> g = new CompletableFuture<>();
3230 <        final CompletableFuture<Integer> h;
3228 >        final CompletableFuture<Item> f = new CompletableFuture<>();
3229 >        final CompletableFuture<Item> g = new CompletableFuture<>();
3230 >        final CompletableFuture<Item> h;
3231          // Test all permutations of orders
3232          switch (order) {
3233          case 0:
# Line 3285 | Line 3285 | public class CompletableFutureTest exten
3285       */
3286      public void testAllOf_normal() throws Exception {
3287          for (int k = 1; k < 10; k++) {
3288 <            CompletableFuture<Integer>[] fs
3289 <                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3288 >            @SuppressWarnings("unchecked")
3289 >            CompletableFuture<Item>[] fs
3290 >                = (CompletableFuture<Item>[]) new CompletableFuture[k];
3291              for (int i = 0; i < k; i++)
3292                  fs[i] = new CompletableFuture<>();
3293              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3302 | Line 3303 | public class CompletableFutureTest exten
3303  
3304      public void testAllOf_normal_backwards() throws Exception {
3305          for (int k = 1; k < 10; k++) {
3306 <            CompletableFuture<Integer>[] fs
3307 <                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3306 >            @SuppressWarnings("unchecked")
3307 >            CompletableFuture<Item>[] fs
3308 >                = (CompletableFuture<Item>[]) new CompletableFuture[k];
3309              for (int i = 0; i < k; i++)
3310                  fs[i] = new CompletableFuture<>();
3311              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
# Line 3319 | Line 3321 | public class CompletableFutureTest exten
3321  
3322      public void testAllOf_exceptional() throws Exception {
3323          for (int k = 1; k < 10; k++) {
3324 <            CompletableFuture<Integer>[] fs
3325 <                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
3324 >            @SuppressWarnings("unchecked")
3325 >            CompletableFuture<Item>[] fs
3326 >                = (CompletableFuture<Item>[]) new CompletableFuture[k];
3327              CFException ex = new CFException();
3328              for (int i = 0; i < k; i++)
3329                  fs[i] = new CompletableFuture<>();
3330              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
3331              for (int i = 0; i < k; i++) {
3332 +                Item I = itemFor(i);
3333                  checkIncomplete(f);
3334                  checkIncomplete(CompletableFuture.allOf(fs));
3335                  if (i != k / 2) {
3336 <                    fs[i].complete(i);
3337 <                    checkCompletedNormally(fs[i], i);
3336 >                    fs[i].complete(I);
3337 >                    checkCompletedNormally(fs[i], I);
3338                  } else {
3339                      fs[i].completeExceptionally(ex);
3340                      checkCompletedExceptionally(fs[i], ex);
# Line 3345 | Line 3349 | public class CompletableFutureTest exten
3349       * anyOf(no component futures) returns an incomplete future
3350       */
3351      public void testAnyOf_empty() throws Exception {
3352 <        for (Integer v1 : new Integer[] { 1, null })
3352 >        for (Item v1 : new Item[] { one, null })
3353      {
3354          CompletableFuture<Object> f = CompletableFuture.anyOf();
3355          checkIncomplete(f);
# Line 3360 | Line 3364 | public class CompletableFutureTest exten
3364       */
3365      public void testAnyOf_normal() throws Exception {
3366          for (int k = 0; k < 10; k++) {
3367 <            CompletableFuture[] fs = new CompletableFuture[k];
3367 >            @SuppressWarnings("unchecked")
3368 >            CompletableFuture<Item>[] fs =
3369 >                (CompletableFuture<Item>[])new CompletableFuture[k];
3370              for (int i = 0; i < k; i++)
3371                  fs[i] = new CompletableFuture<>();
3372              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3373              checkIncomplete(f);
3374              for (int i = 0; i < k; i++) {
3375 <                fs[i].complete(i);
3376 <                checkCompletedNormally(f, 0);
3377 <                int x = (int) CompletableFuture.anyOf(fs).join();
3378 <                assertTrue(0 <= x && x <= i);
3375 >                fs[i].complete(itemFor(i));
3376 >                checkCompletedNormally(f, zero);
3377 >                Item x = (Item)CompletableFuture.anyOf(fs).join();
3378 >                assertTrue(0 <= x.value && x.value <= i);
3379              }
3380          }
3381      }
3382      public void testAnyOf_normal_backwards() throws Exception {
3383          for (int k = 0; k < 10; k++) {
3384 <            CompletableFuture[] fs = new CompletableFuture[k];
3384 >            @SuppressWarnings("unchecked")
3385 >            CompletableFuture<Item>[] fs =
3386 >                (CompletableFuture<Item>[])new CompletableFuture[k];
3387              for (int i = 0; i < k; i++)
3388                  fs[i] = new CompletableFuture<>();
3389              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3390              checkIncomplete(f);
3391              for (int i = k - 1; i >= 0; i--) {
3392 <                fs[i].complete(i);
3393 <                checkCompletedNormally(f, k - 1);
3394 <                int x = (int) CompletableFuture.anyOf(fs).join();
3395 <                assertTrue(i <= x && x <= k - 1);
3392 >                fs[i].complete(itemFor(i));
3393 >                checkCompletedNormally(f, itemFor(k - 1));
3394 >                Item x = (Item)CompletableFuture.anyOf(fs).join();
3395 >                assertTrue(i <= x.value && x.value <= k - 1);
3396              }
3397          }
3398      }
# Line 3394 | Line 3402 | public class CompletableFutureTest exten
3402       */
3403      public void testAnyOf_exceptional() throws Exception {
3404          for (int k = 0; k < 10; k++) {
3405 <            CompletableFuture[] fs = new CompletableFuture[k];
3405 >            @SuppressWarnings("unchecked")
3406 >            CompletableFuture<Item>[] fs =
3407 >                (CompletableFuture<Item>[])new CompletableFuture[k];
3408              CFException[] exs = new CFException[k];
3409              for (int i = 0; i < k; i++) {
3410                  fs[i] = new CompletableFuture<>();
# Line 3412 | Line 3422 | public class CompletableFutureTest exten
3422  
3423      public void testAnyOf_exceptional_backwards() throws Exception {
3424          for (int k = 0; k < 10; k++) {
3425 <            CompletableFuture[] fs = new CompletableFuture[k];
3425 >            @SuppressWarnings("unchecked")
3426 >            CompletableFuture<Object>[] fs =
3427 >                (CompletableFuture<Object>[])new CompletableFuture[k];
3428              CFException[] exs = new CFException[k];
3429              for (int i = 0; i < k; i++) {
3430                  fs[i] = new CompletableFuture<>();
# Line 3433 | Line 3445 | public class CompletableFutureTest exten
3445       */
3446      @SuppressWarnings("FutureReturnValueIgnored")
3447      public void testNPE() {
3448 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3449 <        CompletableFuture<Integer> g = new CompletableFuture<>();
3450 <        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
3448 >        CompletableFuture<Item> f = new CompletableFuture<>();
3449 >        CompletableFuture<Item> g = new CompletableFuture<>();
3450 >        CompletableFuture<Item> nullFuture = (CompletableFuture<Item>)null;
3451          ThreadExecutor exec = new ThreadExecutor();
3452  
3453          assertThrows(
# Line 3443 | Line 3455 | public class CompletableFutureTest exten
3455  
3456              () -> CompletableFuture.supplyAsync(null),
3457              () -> CompletableFuture.supplyAsync(null, exec),
3458 <            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
3458 >            () -> CompletableFuture.supplyAsync(new ItemSupplier(ExecutionMode.SYNC, fortytwo), null),
3459  
3460              () -> CompletableFuture.runAsync(null),
3461              () -> CompletableFuture.runAsync(null, exec),
# Line 3540 | Line 3552 | public class CompletableFutureTest exten
3552              () -> CompletableFuture.delayedExecutor(1L, null),
3553  
3554              () -> f.orTimeout(1L, null),
3555 <            () -> f.completeOnTimeout(42, 1L, null),
3555 >            () -> f.completeOnTimeout(fortytwo, 1L, null),
3556  
3557              () -> CompletableFuture.failedFuture(null),
3558              () -> CompletableFuture.failedStage(null));
3559  
3560 <        assertEquals(0, exec.count.get());
3560 >        mustEqual(0, exec.count.get());
3561      }
3562  
3563      /**
3564       * Test submissions to an executor that rejects all tasks.
3565       */
3566      public void testRejectingExecutor() {
3567 <        for (Integer v : new Integer[] { 1, null })
3567 >        for (Item v : new Item[] { one, null })
3568      {
3569          final CountingRejectingExecutor e = new CountingRejectingExecutor();
3570  
3571 <        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3572 <        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3571 >        final CompletableFuture<Item> complete = CompletableFuture.completedFuture(v);
3572 >        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
3573  
3574          List<CompletableFuture<?>> futures = new ArrayList<>();
3575  
3576 <        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3576 >        List<CompletableFuture<Item>> srcs = new ArrayList<>();
3577          srcs.add(complete);
3578          srcs.add(incomplete);
3579  
3580 <        for (CompletableFuture<Integer> src : srcs) {
3580 >        for (CompletableFuture<Item> src : srcs) {
3581              List<CompletableFuture<?>> fs = new ArrayList<>();
3582              fs.add(src.thenRunAsync(() -> {}, e));
3583              fs.add(src.thenAcceptAsync(z -> {}, e));
# Line 3631 | Line 3643 | public class CompletableFutureTest exten
3643          for (CompletableFuture<?> future : futures)
3644              checkCompletedWithWrappedException(future, e.ex);
3645  
3646 <        assertEquals(futures.size(), e.count.get());
3646 >        mustEqual(futures.size(), e.count.get());
3647      }}
3648  
3649      /**
# Line 3640 | Line 3652 | public class CompletableFutureTest exten
3652       * explicitly completed.
3653       */
3654      public void testRejectingExecutorNeverInvoked() {
3655 <        for (Integer v : new Integer[] { 1, null })
3655 >        for (Item v : new Item[] { one, null })
3656      {
3657          final CountingRejectingExecutor e = new CountingRejectingExecutor();
3658  
3659 <        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3660 <        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3659 >        final CompletableFuture<Item> complete = CompletableFuture.completedFuture(v);
3660 >        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
3661  
3662          List<CompletableFuture<?>> fs = new ArrayList<>();
3663          fs.add(incomplete.thenRunAsync(() -> {}, e));
# Line 3684 | Line 3696 | public class CompletableFutureTest exten
3696          for (CompletableFuture<?> future : fs)
3697              checkCompletedNormally(future, null);
3698  
3699 <        assertEquals(0, e.count.get());
3699 >        mustEqual(0, e.count.get());
3700      }}
3701  
3702      /**
3703       * toCompletableFuture returns this CompletableFuture.
3704       */
3705      public void testToCompletableFuture() {
3706 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3706 >        CompletableFuture<Item> f = new CompletableFuture<>();
3707          assertSame(f, f.toCompletableFuture());
3708      }
3709  
# Line 3701 | Line 3713 | public class CompletableFutureTest exten
3713       * newIncompleteFuture returns an incomplete CompletableFuture
3714       */
3715      public void testNewIncompleteFuture() {
3716 <        for (Integer v1 : new Integer[] { 1, null })
3716 >        for (Item v1 : new Item[] { one, null })
3717      {
3718 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3719 <        CompletableFuture<Integer> g = f.newIncompleteFuture();
3718 >        CompletableFuture<Item> f = new CompletableFuture<>();
3719 >        CompletableFuture<Item> g = f.newIncompleteFuture();
3720          checkIncomplete(f);
3721          checkIncomplete(g);
3722          f.complete(v1);
# Line 3721 | Line 3733 | public class CompletableFutureTest exten
3733      public void testCompletedStage() {
3734          AtomicInteger x = new AtomicInteger(0);
3735          AtomicReference<Throwable> r = new AtomicReference<>();
3736 <        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
3737 <        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3738 <        assertEquals(x.get(), 1);
3736 >        CompletionStage<Item> f = CompletableFuture.completedStage(one);
3737 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
3738 >        mustEqual(x.get(), 1);
3739          assertNull(r.get());
3740      }
3741  
# Line 3732 | Line 3744 | public class CompletableFutureTest exten
3744       * it supports more than one thread.
3745       */
3746      public void testDefaultExecutor() {
3747 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3747 >        CompletableFuture<Item> f = new CompletableFuture<>();
3748          Executor e = f.defaultExecutor();
3749          Executor c = ForkJoinPool.commonPool();
3750          if (ForkJoinPool.getCommonPoolParallelism() > 1)
# Line 3747 | Line 3759 | public class CompletableFutureTest exten
3759       */
3760      public void testFailedFuture() {
3761          CFException ex = new CFException();
3762 <        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
3762 >        CompletableFuture<Item> f = CompletableFuture.failedFuture(ex);
3763          checkCompletedExceptionally(f, ex);
3764      }
3765  
# Line 3757 | Line 3769 | public class CompletableFutureTest exten
3769       */
3770      public void testCopy_normalCompletion() {
3771          for (boolean createIncomplete : new boolean[] { true, false })
3772 <        for (Integer v1 : new Integer[] { 1, null })
3772 >        for (Item v1 : new Item[] { one, null })
3773      {
3774 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3774 >        CompletableFuture<Item> f = new CompletableFuture<>();
3775          if (!createIncomplete) assertTrue(f.complete(v1));
3776 <        CompletableFuture<Integer> g = f.copy();
3776 >        CompletableFuture<Item> g = f.copy();
3777          if (createIncomplete) {
3778              checkIncomplete(f);
3779              checkIncomplete(g);
# Line 3779 | Line 3791 | public class CompletableFutureTest exten
3791          for (boolean createIncomplete : new boolean[] { true, false })
3792      {
3793          CFException ex = new CFException();
3794 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3794 >        CompletableFuture<Item> f = new CompletableFuture<>();
3795          if (!createIncomplete) f.completeExceptionally(ex);
3796 <        CompletableFuture<Integer> g = f.copy();
3796 >        CompletableFuture<Item> g = f.copy();
3797          if (createIncomplete) {
3798              checkIncomplete(f);
3799              checkIncomplete(g);
# Line 3795 | Line 3807 | public class CompletableFutureTest exten
3807       * Completion of a copy does not complete its source.
3808       */
3809      public void testCopy_oneWayPropagation() {
3810 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3811 <        assertTrue(f.copy().complete(1));
3810 >        CompletableFuture<Item> f = new CompletableFuture<>();
3811 >        assertTrue(f.copy().complete(one));
3812          assertTrue(f.copy().complete(null));
3813          assertTrue(f.copy().cancel(true));
3814          assertTrue(f.copy().cancel(false));
# Line 3809 | Line 3821 | public class CompletableFutureTest exten
3821       * completed normally, with the same value, when source is.
3822       */
3823      public void testMinimalCompletionStage() {
3824 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3825 <        CompletionStage<Integer> g = f.minimalCompletionStage();
3824 >        CompletableFuture<Item> f = new CompletableFuture<>();
3825 >        CompletionStage<Item> g = f.minimalCompletionStage();
3826          AtomicInteger x = new AtomicInteger(0);
3827          AtomicReference<Throwable> r = new AtomicReference<>();
3828          checkIncomplete(f);
3829 <        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3830 <        f.complete(1);
3831 <        checkCompletedNormally(f, 1);
3832 <        assertEquals(x.get(), 1);
3829 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
3830 >        f.complete(one);
3831 >        checkCompletedNormally(f, one);
3832 >        mustEqual(x.get(), 1);
3833          assertNull(r.get());
3834      }
3835  
# Line 3826 | Line 3838 | public class CompletableFutureTest exten
3838       * completed exceptionally when source is.
3839       */
3840      public void testMinimalCompletionStage2() {
3841 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3842 <        CompletionStage<Integer> g = f.minimalCompletionStage();
3841 >        CompletableFuture<Item> f = new CompletableFuture<>();
3842 >        CompletionStage<Item> g = f.minimalCompletionStage();
3843          AtomicInteger x = new AtomicInteger(0);
3844          AtomicReference<Throwable> r = new AtomicReference<>();
3845 <        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3845 >        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
3846          checkIncomplete(f);
3847          CFException ex = new CFException();
3848          f.completeExceptionally(ex);
3849          checkCompletedExceptionally(f, ex);
3850 <        assertEquals(x.get(), 0);
3851 <        assertEquals(r.get().getCause(), ex);
3850 >        mustEqual(x.get(), 0);
3851 >        mustEqual(r.get().getCause(), ex);
3852      }
3853  
3854      /**
# Line 3845 | Line 3857 | public class CompletableFutureTest exten
3857       */
3858      public void testFailedStage() {
3859          CFException ex = new CFException();
3860 <        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
3860 >        CompletionStage<Item> f = CompletableFuture.failedStage(ex);
3861          AtomicInteger x = new AtomicInteger(0);
3862          AtomicReference<Throwable> r = new AtomicReference<>();
3863 <        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
3864 <        assertEquals(x.get(), 0);
3865 <        assertEquals(r.get(), ex);
3863 >        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
3864 >        mustEqual(x.get(), 0);
3865 >        mustEqual(r.get(), ex);
3866      }
3867  
3868      /**
3869       * completeAsync completes with value of given supplier
3870       */
3871      public void testCompleteAsync() {
3872 <        for (Integer v1 : new Integer[] { 1, null })
3872 >        for (Item v1 : new Item[] { one, null })
3873      {
3874 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3874 >        CompletableFuture<Item> f = new CompletableFuture<>();
3875          f.completeAsync(() -> v1);
3876          f.join();
3877          checkCompletedNormally(f, v1);
# Line 3869 | Line 3881 | public class CompletableFutureTest exten
3881       * completeAsync completes exceptionally if given supplier throws
3882       */
3883      public void testCompleteAsync2() {
3884 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3884 >        CompletableFuture<Item> f = new CompletableFuture<>();
3885          CFException ex = new CFException();
3886          f.completeAsync(() -> { throw ex; });
3887          try {
# Line 3883 | Line 3895 | public class CompletableFutureTest exten
3895       * completeAsync with given executor completes with value of given supplier
3896       */
3897      public void testCompleteAsync3() {
3898 <        for (Integer v1 : new Integer[] { 1, null })
3898 >        for (Item v1 : new Item[] { one, null })
3899      {
3900 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3900 >        CompletableFuture<Item> f = new CompletableFuture<>();
3901          ThreadExecutor executor = new ThreadExecutor();
3902          f.completeAsync(() -> v1, executor);
3903          assertSame(v1, f.join());
3904          checkCompletedNormally(f, v1);
3905 <        assertEquals(1, executor.count.get());
3905 >        mustEqual(1, executor.count.get());
3906      }}
3907  
3908      /**
# Line 3898 | Line 3910 | public class CompletableFutureTest exten
3910       * given supplier throws
3911       */
3912      public void testCompleteAsync4() {
3913 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3913 >        CompletableFuture<Item> f = new CompletableFuture<>();
3914          CFException ex = new CFException();
3915          ThreadExecutor executor = new ThreadExecutor();
3916          f.completeAsync(() -> { throw ex; }, executor);
# Line 3907 | Line 3919 | public class CompletableFutureTest exten
3919              shouldThrow();
3920          } catch (CompletionException success) {}
3921          checkCompletedWithWrappedException(f, ex);
3922 <        assertEquals(1, executor.count.get());
3922 >        mustEqual(1, executor.count.get());
3923      }
3924  
3925      /**
# Line 3915 | Line 3927 | public class CompletableFutureTest exten
3927       */
3928      public void testOrTimeout_timesOut() {
3929          long timeoutMillis = timeoutMillis();
3930 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3930 >        CompletableFuture<Item> f = new CompletableFuture<>();
3931          long startTime = System.nanoTime();
3932          assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3933          checkCompletedWithTimeoutException(f);
# Line 3926 | Line 3938 | public class CompletableFutureTest exten
3938       * orTimeout completes normally if completed before timeout
3939       */
3940      public void testOrTimeout_completed() {
3941 <        for (Integer v1 : new Integer[] { 1, null })
3941 >        for (Item v1 : new Item[] { one, null })
3942      {
3943 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3944 <        CompletableFuture<Integer> g = new CompletableFuture<>();
3943 >        CompletableFuture<Item> f = new CompletableFuture<>();
3944 >        CompletableFuture<Item> g = new CompletableFuture<>();
3945          long startTime = System.nanoTime();
3946          f.complete(v1);
3947          assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
# Line 3944 | Line 3956 | public class CompletableFutureTest exten
3956       * completeOnTimeout completes with given value if not complete
3957       */
3958      public void testCompleteOnTimeout_timesOut() {
3959 <        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
3959 >        testInParallel(() -> testCompleteOnTimeout_timesOut(fortytwo),
3960                         () -> testCompleteOnTimeout_timesOut(null));
3961      }
3962  
3963      /**
3964       * completeOnTimeout completes with given value if not complete
3965       */
3966 <    public void testCompleteOnTimeout_timesOut(Integer v) {
3966 >    public void testCompleteOnTimeout_timesOut(Item v) {
3967          long timeoutMillis = timeoutMillis();
3968 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3968 >        CompletableFuture<Item> f = new CompletableFuture<>();
3969          long startTime = System.nanoTime();
3970          assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3971          assertSame(v, f.join());
3972          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3973 <        f.complete(99);         // should have no effect
3973 >        f.complete(ninetynine);         // should have no effect
3974          checkCompletedNormally(f, v);
3975      }
3976  
# Line 3966 | Line 3978 | public class CompletableFutureTest exten
3978       * completeOnTimeout has no effect if completed within timeout
3979       */
3980      public void testCompleteOnTimeout_completed() {
3981 <        for (Integer v1 : new Integer[] { 1, null })
3981 >        for (Item v1 : new Item[] { one, null })
3982      {
3983 <        CompletableFuture<Integer> f = new CompletableFuture<>();
3984 <        CompletableFuture<Integer> g = new CompletableFuture<>();
3983 >        CompletableFuture<Item> f = new CompletableFuture<>();
3984 >        CompletableFuture<Item> g = new CompletableFuture<>();
3985          long startTime = System.nanoTime();
3986          f.complete(v1);
3987 <        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3988 <        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3987 >        mustEqual(f, f.completeOnTimeout(minusOne, LONG_DELAY_MS, MILLISECONDS));
3988 >        mustEqual(g, g.completeOnTimeout(minusOne, LONG_DELAY_MS, MILLISECONDS));
3989          g.complete(v1);
3990          checkCompletedNormally(f, v1);
3991          checkCompletedNormally(g, v1);
# Line 3985 | Line 3997 | public class CompletableFutureTest exten
3997       */
3998      public void testDelayedExecutor() {
3999          testInParallel(() -> testDelayedExecutor(null, null),
4000 <                       () -> testDelayedExecutor(null, 1),
4001 <                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
4002 <                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
4000 >                       () -> testDelayedExecutor(null, one),
4001 >                       () -> testDelayedExecutor(new ThreadExecutor(), one),
4002 >                       () -> testDelayedExecutor(new ThreadExecutor(), one));
4003      }
4004  
4005 <    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
4005 >    public void testDelayedExecutor(Executor executor, Item v) throws Exception {
4006          long timeoutMillis = timeoutMillis();
4007          // Use an "unreasonably long" long timeout to catch lingering threads
4008          long longTimeoutMillis = 1000 * 60 * 60 * 24;
# Line 4003 | Line 4015 | public class CompletableFutureTest exten
4015              longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
4016          }
4017          long startTime = System.nanoTime();
4018 <        CompletableFuture<Integer> f =
4018 >        CompletableFuture<Item> f =
4019              CompletableFuture.supplyAsync(() -> v, delayer);
4020 <        CompletableFuture<Integer> g =
4020 >        CompletableFuture<Item> g =
4021              CompletableFuture.supplyAsync(() -> v, longDelayer);
4022  
4023          assertNull(g.getNow(null));
# Line 4050 | Line 4062 | public class CompletableFutureTest exten
4062          for (ExecutionMode m : ExecutionMode.values())
4063      {
4064          final CFException ex = new CFException();
4065 <        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
4066 <        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4065 >        final CompletableFuture<Item> v42 = CompletableFuture.completedFuture(fortytwo);
4066 >        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
4067  
4068          final Runnable noopRunnable = new Noop(m);
4069 <        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
4070 <        final Function<Integer, Integer> incFunction = new IncFunction(m);
4069 >        final Consumer<Item> noopConsumer = new NoopConsumer(m);
4070 >        final Function<Item, Item> incFunction = new IncFunction(m);
4071  
4072 <        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
4072 >        List<Function<CompletableFuture<Item>, CompletableFuture<?>>> funs
4073              = new ArrayList<>();
4074  
4075          funs.add(y -> m.thenRun(y, noopRunnable));
# Line 4075 | Line 4087 | public class CompletableFutureTest exten
4087          funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
4088          funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
4089  
4090 <        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
4090 >        funs.add(y -> m.whenComplete(y, (Item r, Throwable t) -> {}));
4091  
4092          funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
4093  
# Line 4086 | Line 4098 | public class CompletableFutureTest exten
4098          funs.add(y -> CompletableFuture.anyOf(y, incomplete));
4099          funs.add(y -> CompletableFuture.anyOf(incomplete, y));
4100  
4101 <        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4101 >        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
4102                   fun : funs) {
4103 <            CompletableFuture<Integer> f = new CompletableFuture<>();
4103 >            CompletableFuture<Item> f = new CompletableFuture<>();
4104              f.completeExceptionally(ex);
4105 <            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4105 >            CompletableFuture<Item> src = m.thenApply(f, incFunction);
4106              checkCompletedWithWrappedException(src, ex);
4107              CompletableFuture<?> dep = fun.apply(src);
4108              checkCompletedWithWrappedException(dep, ex);
4109              assertSame(resultOf(src), resultOf(dep));
4110          }
4111  
4112 <        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4112 >        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
4113                   fun : funs) {
4114 <            CompletableFuture<Integer> f = new CompletableFuture<>();
4115 <            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4114 >            CompletableFuture<Item> f = new CompletableFuture<>();
4115 >            CompletableFuture<Item> src = m.thenApply(f, incFunction);
4116              CompletableFuture<?> dep = fun.apply(src);
4117              f.completeExceptionally(ex);
4118              checkCompletedWithWrappedException(src, ex);
# Line 4109 | Line 4121 | public class CompletableFutureTest exten
4121          }
4122  
4123          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4124 <        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4124 >        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
4125                   fun : funs) {
4126 <            CompletableFuture<Integer> f = new CompletableFuture<>();
4126 >            CompletableFuture<Item> f = new CompletableFuture<>();
4127              f.cancel(mayInterruptIfRunning);
4128              checkCancelled(f);
4129 <            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4129 >            CompletableFuture<Item> src = m.thenApply(f, incFunction);
4130              checkCompletedWithWrappedCancellationException(src);
4131              CompletableFuture<?> dep = fun.apply(src);
4132              checkCompletedWithWrappedCancellationException(dep);
# Line 4122 | Line 4134 | public class CompletableFutureTest exten
4134          }
4135  
4136          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
4137 <        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
4137 >        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
4138                   fun : funs) {
4139 <            CompletableFuture<Integer> f = new CompletableFuture<>();
4140 <            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
4139 >            CompletableFuture<Item> f = new CompletableFuture<>();
4140 >            CompletableFuture<Item> src = m.thenApply(f, incFunction);
4141              CompletableFuture<?> dep = fun.apply(src);
4142              f.cancel(mayInterruptIfRunning);
4143              checkCancelled(f);
# Line 4165 | Line 4177 | public class CompletableFutureTest exten
4177              .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
4178              .collect(Collectors.toList());
4179  
4180 <        List<CompletionStage<Integer>> stages = new ArrayList<>();
4181 <        CompletionStage<Integer> min =
4182 <            new CompletableFuture<Integer>().minimalCompletionStage();
4180 >        List<CompletionStage<Item>> stages = new ArrayList<>();
4181 >        CompletionStage<Item> min =
4182 >            new CompletableFuture<Item>().minimalCompletionStage();
4183          stages.add(min);
4184          stages.add(min.thenApply(x -> x));
4185 <        stages.add(CompletableFuture.completedStage(1));
4185 >        stages.add(CompletableFuture.completedStage(one));
4186          stages.add(CompletableFuture.failedStage(new CFException()));
4187  
4188          List<Method> bugs = new ArrayList<>();
# Line 4184 | Line 4196 | public class CompletableFutureTest exten
4196                  else if (type == int.class)     args[i] = 0;
4197                  else if (type == long.class)    args[i] = 0L;
4198              }
4199 <            for (CompletionStage<Integer> stage : stages) {
4199 >            for (CompletionStage<Item> stage : stages) {
4200                  try {
4201                      method.invoke(stage, args);
4202                      bugs.add(method);
# Line 4208 | Line 4220 | public class CompletableFutureTest exten
4220       */
4221      public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
4222          for (boolean createIncomplete : new boolean[] { true, false })
4223 <        for (Integer v1 : new Integer[] { 1, null })
4223 >        for (Item v1 : new Item[] { one, null })
4224      {
4225 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4226 <        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4225 >        CompletableFuture<Item> f = new CompletableFuture<>();
4226 >        CompletionStage<Item> minimal = f.minimalCompletionStage();
4227          if (!createIncomplete) assertTrue(f.complete(v1));
4228 <        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4228 >        CompletableFuture<Item> g = minimal.toCompletableFuture();
4229          if (createIncomplete) {
4230              checkIncomplete(f);
4231              checkIncomplete(g);
# Line 4231 | Line 4243 | public class CompletableFutureTest exten
4243          for (boolean createIncomplete : new boolean[] { true, false })
4244      {
4245          CFException ex = new CFException();
4246 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4247 <        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4246 >        CompletableFuture<Item> f = new CompletableFuture<>();
4247 >        CompletionStage<Item> minimal = f.minimalCompletionStage();
4248          if (!createIncomplete) f.completeExceptionally(ex);
4249 <        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4249 >        CompletableFuture<Item> g = minimal.toCompletableFuture();
4250          if (createIncomplete) {
4251              checkIncomplete(f);
4252              checkIncomplete(g);
# Line 4248 | Line 4260 | public class CompletableFutureTest exten
4260       * minimalStage.toCompletableFuture() gives mutable CompletableFuture
4261       */
4262      public void testMinimalCompletionStage_toCompletableFuture_mutable() {
4263 <        for (Integer v1 : new Integer[] { 1, null })
4263 >        for (Item v1 : new Item[] { one, null })
4264      {
4265 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4266 <        CompletionStage minimal = f.minimalCompletionStage();
4267 <        CompletableFuture<Integer> g = minimal.toCompletableFuture();
4265 >        CompletableFuture<Item> f = new CompletableFuture<>();
4266 >        CompletionStage<Item> minimal = f.minimalCompletionStage();
4267 >        CompletableFuture<Item> g = minimal.toCompletableFuture();
4268          assertTrue(g.complete(v1));
4269          checkCompletedNormally(g, v1);
4270          checkIncomplete(f);
# Line 4264 | Line 4276 | public class CompletableFutureTest exten
4276       */
4277      public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
4278          for (boolean createIncomplete : new boolean[] { true, false })
4279 <        for (Integer v1 : new Integer[] { 1, null })
4279 >        for (Item v1 : new Item[] { one, null })
4280      {
4281 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4281 >        CompletableFuture<Item> f = new CompletableFuture<>();
4282          if (!createIncomplete) assertTrue(f.complete(v1));
4283 <        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4283 >        CompletionStage<Item> minimal = f.minimalCompletionStage();
4284          if (createIncomplete) assertTrue(f.complete(v1));
4285 <        assertEquals(v1, minimal.toCompletableFuture().join());
4286 <        assertEquals(v1, minimal.toCompletableFuture().get());
4285 >        mustEqual(v1, minimal.toCompletableFuture().join());
4286 >        mustEqual(v1, minimal.toCompletableFuture().get());
4287          checkCompletedNormally(minimal.toCompletableFuture(), v1);
4288      }}
4289  
# Line 4280 | Line 4292 | public class CompletableFutureTest exten
4292       * does not complete its source.
4293       */
4294      public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
4295 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4296 <        CompletionStage<Integer> g = f.minimalCompletionStage();
4297 <        assertTrue(g.toCompletableFuture().complete(1));
4295 >        CompletableFuture<Item> f = new CompletableFuture<>();
4296 >        CompletionStage<Item> g = f.minimalCompletionStage();
4297 >        assertTrue(g.toCompletableFuture().complete(one));
4298          assertTrue(g.toCompletableFuture().complete(null));
4299          assertTrue(g.toCompletableFuture().cancel(true));
4300          assertTrue(g.toCompletableFuture().cancel(false));
4301          assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
4302          checkIncomplete(g.toCompletableFuture());
4303 <        f.complete(1);
4304 <        checkCompletedNormally(g.toCompletableFuture(), 1);
4303 >        f.complete(one);
4304 >        checkCompletedNormally(g.toCompletableFuture(), one);
4305      }
4306  
4307      /** Demo utility method for external reliable toCompletableFuture */
# Line 4313 | Line 4325 | public class CompletableFutureTest exten
4325       */
4326      public void testMinimalCompletionStage_join_by_hand() {
4327          for (boolean createIncomplete : new boolean[] { true, false })
4328 <        for (Integer v1 : new Integer[] { 1, null })
4328 >        for (Item v1 : new Item[] { one, null })
4329      {
4330 <        CompletableFuture<Integer> f = new CompletableFuture<>();
4331 <        CompletionStage<Integer> minimal = f.minimalCompletionStage();
4332 <        CompletableFuture<Integer> g = new CompletableFuture<>();
4330 >        CompletableFuture<Item> f = new CompletableFuture<>();
4331 >        CompletionStage<Item> minimal = f.minimalCompletionStage();
4332 >        CompletableFuture<Item> g = new CompletableFuture<>();
4333          if (!createIncomplete) assertTrue(f.complete(v1));
4334          minimal.thenAccept(x -> g.complete(x));
4335          if (createIncomplete) assertTrue(f.complete(v1));
4336          g.join();
4337          checkCompletedNormally(g, v1);
4338          checkCompletedNormally(f, v1);
4339 <        assertEquals(v1, join(minimal));
4339 >        mustEqual(v1, join(minimal));
4340      }}
4341  
4342      static class Monad {
# Line 4371 | Line 4383 | public class CompletableFutureTest exten
4383              if (fex != null || gex != null)
4384                  assertSame(fex.getClass(), gex.getClass());
4385              else
4386 <                assertEquals(fval, gval);
4386 >                mustEqual(fval, gval);
4387          }
4388  
4389          static class PlusFuture<T> extends CompletableFuture<T> {
# Line 4481 | Line 4493 | public class CompletableFutureTest exten
4493      {
4494          final int val = 42;
4495          final int n = expensiveTests ? 1_000 : 2;
4496 <        CompletableFuture<Integer> head = new CompletableFuture<>();
4497 <        CompletableFuture<Integer> tail = head;
4496 >        CompletableFuture<Item> head = new CompletableFuture<>();
4497 >        CompletableFuture<Item> tail = head;
4498          for (int i = 0; i < n; i++) {
4499 <            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
4500 <            tail = m.thenApply(tail, v -> v + 1);
4501 <            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
4502 <            tail = m.applyToEither(tail, tail, v -> v + 1);
4503 <            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
4504 <            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
4499 >            if (addDeadEnds) m.thenApply(tail, v -> new Item(v.value + 1));
4500 >            tail = m.thenApply(tail, v -> new Item(v.value + 1));
4501 >            if (addDeadEnds) m.applyToEither(tail, tail, v -> new Item(v.value + 1));
4502 >            tail = m.applyToEither(tail, tail, v -> new Item(v.value + 1));
4503 >            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> new Item(v.value + 1));
4504 >            tail = m.thenCombine(tail, tail, (v, w) -> new Item(v.value + 1));
4505          }
4506 <        head.complete(val);
4507 <        assertEquals(val + 3 * n, (int) tail.join());
4506 >        head.complete(itemFor(val));
4507 >        mustEqual(val + 3 * n, tail.join());
4508      }}
4509  
4510      /**
# Line 4525 | Line 4537 | public class CompletableFutureTest exten
4537              new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
4538          }
4539          head.complete(null);
4540 <        assertEquals(5 * 3 * n, count.get());
4540 >        mustEqual(5 * 3 * n, count.get());
4541      }
4542  
4543      /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
4544      @SuppressWarnings("FutureReturnValueIgnored")
4545      public void testCoCompletionGarbageRetention() throws Throwable {
4546          final int n = expensiveTests ? 1_000_000 : 10;
4547 <        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
4548 <        CompletableFuture<Integer> f;
4547 >        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
4548 >        CompletableFuture<Item> f;
4549          for (int i = 0; i < n; i++) {
4550              f = new CompletableFuture<>();
4551              f.runAfterEither(incomplete, () -> {});
# Line 4577 | Line 4589 | public class CompletableFutureTest exten
4589       * cvs update -D '2016-05-01' ./src/main/java/util/concurrent/CompletableFuture.java && ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest -Djsr166.methodFilter=testAnyOfGarbageRetention tck; cvs update -A
4590       */
4591      public void testAnyOfGarbageRetention() throws Throwable {
4592 <        for (Integer v : new Integer[] { 1, null })
4592 >        for (Item v : new Item[] { one, null })
4593      {
4594          final int n = expensiveTests ? 100_000 : 10;
4595 <        CompletableFuture<Integer>[] fs
4596 <            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4595 >        @SuppressWarnings("unchecked")
4596 >        CompletableFuture<Item>[] fs =
4597 >            (CompletableFuture<Item>[])new CompletableFuture[100];
4598          for (int i = 0; i < fs.length; i++)
4599              fs[i] = new CompletableFuture<>();
4600          fs[fs.length - 1].complete(v);
# Line 4597 | Line 4610 | public class CompletableFutureTest exten
4610       */
4611      public void testCancelledAllOfGarbageRetention() throws Throwable {
4612          final int n = expensiveTests ? 100_000 : 10;
4613 <        CompletableFuture<Integer>[] fs
4614 <            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
4613 >        @SuppressWarnings("unchecked")
4614 >        CompletableFuture<Item>[] fs
4615 >            = (CompletableFuture<Item>[]) new CompletableFuture<?>[100];
4616          for (int i = 0; i < fs.length; i++)
4617              fs[i] = new CompletableFuture<>();
4618          for (int i = 0; i < n; i++)
# Line 4615 | Line 4629 | public class CompletableFutureTest exten
4629       */
4630      public void testCancelledGarbageRetention() throws Throwable {
4631          final int n = expensiveTests ? 100_000 : 10;
4632 <        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4632 >        CompletableFuture<Item> neverCompleted = new CompletableFuture<>();
4633          for (int i = 0; i < n; i++)
4634              assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
4635      }
# Line 4630 | Line 4644 | public class CompletableFutureTest exten
4644       */
4645      public void testToCompletableFutureGarbageRetention() throws Throwable {
4646          final int n = expensiveTests ? 900_000 : 10;
4647 <        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
4648 <        CompletionStage minimal = neverCompleted.minimalCompletionStage();
4647 >        CompletableFuture<Item> neverCompleted = new CompletableFuture<>();
4648 >        CompletionStage<Item> minimal = neverCompleted.minimalCompletionStage();
4649          for (int i = 0; i < n; i++)
4650              assertTrue(minimal.toCompletableFuture().cancel(true));
4651      }
# Line 4816 | Line 4830 | public class CompletableFutureTest exten
4830       */
4831      public void testDefaultExceptionallyAsync_normalCompletion() {
4832          for (boolean createIncomplete : new boolean[] { true, false })
4833 <        for (Integer v1 : new Integer[] { 1, null })
4833 >        for (Item v1 : new Item[] { one, null })
4834      {
4835          final AtomicInteger ran = new AtomicInteger(0);
4836 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4837 <        final DelegatedCompletionStage<Integer> d =
4838 <            new DelegatedCompletionStage<Integer>(f);
4836 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4837 >        final DelegatedCompletionStage<Item> d =
4838 >            new DelegatedCompletionStage<Item>(f);
4839          if (!createIncomplete) assertTrue(f.complete(v1));
4840 <        final CompletionStage<Integer> g = d.exceptionallyAsync
4840 >        final CompletionStage<Item> g = d.exceptionallyAsync
4841              ((Throwable t) -> {
4842                  ran.getAndIncrement();
4843                  throw new AssertionError("should not be called");
# Line 4832 | Line 4846 | public class CompletableFutureTest exten
4846  
4847          checkCompletedNormally(g.toCompletableFuture(), v1);
4848          checkCompletedNormally(f, v1);
4849 <        assertEquals(0, ran.get());
4849 >        mustEqual(0, ran.get());
4850      }}
4851  
4852      /**
# Line 4841 | Line 4855 | public class CompletableFutureTest exten
4855       */
4856      public void testDefaultExceptionallyAsync_exceptionalCompletion() {
4857          for (boolean createIncomplete : new boolean[] { true, false })
4858 <        for (Integer v1 : new Integer[] { 1, null })
4858 >        for (Item v1 : new Item[] { one, null })
4859      {
4860          final AtomicInteger ran = new AtomicInteger(0);
4861          final CFException ex = new CFException();
4862 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4863 <        final DelegatedCompletionStage<Integer> d =
4864 <            new DelegatedCompletionStage<Integer>(f);
4862 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4863 >        final DelegatedCompletionStage<Item> d =
4864 >            new DelegatedCompletionStage<Item>(f);
4865          if (!createIncomplete) f.completeExceptionally(ex);
4866 <        final CompletionStage<Integer> g = d.exceptionallyAsync
4866 >        final CompletionStage<Item> g = d.exceptionallyAsync
4867              ((Throwable t) -> {
4868                  assertSame(t, ex);
4869                  ran.getAndIncrement();
# Line 4859 | Line 4873 | public class CompletableFutureTest exten
4873  
4874          checkCompletedNormally(g.toCompletableFuture(), v1);
4875          checkCompletedExceptionally(f, ex);
4876 <        assertEquals(1, ran.get());
4876 >        mustEqual(1, ran.get());
4877      }}
4878  
4879      /**
# Line 4873 | Line 4887 | public class CompletableFutureTest exten
4887          final AtomicInteger ran = new AtomicInteger(0);
4888          final CFException ex1 = new CFException();
4889          final CFException ex2 = new CFException();
4890 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4891 <        final DelegatedCompletionStage<Integer> d =
4892 <            new DelegatedCompletionStage<Integer>(f);
4890 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4891 >        final DelegatedCompletionStage<Item> d =
4892 >            new DelegatedCompletionStage<Item>(f);
4893          if (!createIncomplete) f.completeExceptionally(ex1);
4894 <        final CompletionStage<Integer> g = d.exceptionallyAsync
4894 >        final CompletionStage<Item> g = d.exceptionallyAsync
4895              ((Throwable t) -> {
4896                  assertSame(t, ex1);
4897                  ran.getAndIncrement();
# Line 4888 | Line 4902 | public class CompletableFutureTest exten
4902          checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
4903          checkCompletedExceptionally(f, ex1);
4904          checkCompletedExceptionally(d.toCompletableFuture(), ex1);
4905 <        assertEquals(1, ran.get());
4905 >        mustEqual(1, ran.get());
4906      }}
4907  
4908      /**
# Line 4897 | Line 4911 | public class CompletableFutureTest exten
4911       */
4912      public void testDefaultExceptionallyCompose_normalCompletion() {
4913          for (boolean createIncomplete : new boolean[] { true, false })
4914 <        for (Integer v1 : new Integer[] { 1, null })
4914 >        for (Item v1 : new Item[] { one, null })
4915      {
4916 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4916 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4917          final ExceptionalCompletableFutureFunction r =
4918              new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4919 <        final DelegatedCompletionStage<Integer> d =
4920 <            new DelegatedCompletionStage<Integer>(f);
4919 >        final DelegatedCompletionStage<Item> d =
4920 >            new DelegatedCompletionStage<Item>(f);
4921          if (!createIncomplete) assertTrue(f.complete(v1));
4922 <        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4922 >        final CompletionStage<Item> g = d.exceptionallyCompose(r);
4923          if (createIncomplete) assertTrue(f.complete(v1));
4924  
4925          checkCompletedNormally(f, v1);
# Line 4923 | Line 4937 | public class CompletableFutureTest exten
4937          final CFException ex = new CFException();
4938          final ExceptionalCompletableFutureFunction r =
4939              new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4940 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4941 <        final DelegatedCompletionStage<Integer> d =
4942 <            new DelegatedCompletionStage<Integer>(f);
4940 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4941 >        final DelegatedCompletionStage<Item> d =
4942 >            new DelegatedCompletionStage<Item>(f);
4943          if (!createIncomplete) f.completeExceptionally(ex);
4944 <        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4944 >        final CompletionStage<Item> g = d.exceptionallyCompose(r);
4945          if (createIncomplete) f.completeExceptionally(ex);
4946  
4947          checkCompletedExceptionally(f, ex);
# Line 4943 | Line 4957 | public class CompletableFutureTest exten
4957          for (boolean createIncomplete : new boolean[] { true, false })
4958      {
4959          final CFException ex = new CFException();
4960 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4960 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4961          final FailingExceptionalCompletableFutureFunction r
4962              = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
4963 <        final DelegatedCompletionStage<Integer> d =
4964 <            new DelegatedCompletionStage<Integer>(f);
4963 >        final DelegatedCompletionStage<Item> d =
4964 >            new DelegatedCompletionStage<Item>(f);
4965          if (!createIncomplete) f.completeExceptionally(ex);
4966 <        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
4966 >        final CompletionStage<Item> g = d.exceptionallyCompose(r);
4967          if (createIncomplete) f.completeExceptionally(ex);
4968  
4969          checkCompletedExceptionally(f, ex);
# Line 4963 | Line 4977 | public class CompletableFutureTest exten
4977       */
4978      public void testDefaultExceptionallyComposeAsync_normalCompletion() {
4979          for (boolean createIncomplete : new boolean[] { true, false })
4980 <        for (Integer v1 : new Integer[] { 1, null })
4980 >        for (Item v1 : new Item[] { one, null })
4981      {
4982 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
4982 >        final CompletableFuture<Item> f = new CompletableFuture<>();
4983          final ExceptionalCompletableFutureFunction r =
4984              new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
4985 <        final DelegatedCompletionStage<Integer> d =
4986 <            new DelegatedCompletionStage<Integer>(f);
4985 >        final DelegatedCompletionStage<Item> d =
4986 >            new DelegatedCompletionStage<Item>(f);
4987          if (!createIncomplete) assertTrue(f.complete(v1));
4988 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
4988 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
4989          if (createIncomplete) assertTrue(f.complete(v1));
4990  
4991          checkCompletedNormally(f, v1);
# Line 4989 | Line 5003 | public class CompletableFutureTest exten
5003          final CFException ex = new CFException();
5004          final ExceptionalCompletableFutureFunction r =
5005              new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5006 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
5007 <        final DelegatedCompletionStage<Integer> d =
5008 <            new DelegatedCompletionStage<Integer>(f);
5006 >        final CompletableFuture<Item> f = new CompletableFuture<>();
5007 >        final DelegatedCompletionStage<Item> d =
5008 >            new DelegatedCompletionStage<Item>(f);
5009          if (!createIncomplete) f.completeExceptionally(ex);
5010 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5010 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
5011          if (createIncomplete) f.completeExceptionally(ex);
5012  
5013          checkCompletedExceptionally(f, ex);
# Line 5009 | Line 5023 | public class CompletableFutureTest exten
5023          for (boolean createIncomplete : new boolean[] { true, false })
5024      {
5025          final CFException ex = new CFException();
5026 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
5026 >        final CompletableFuture<Item> f = new CompletableFuture<>();
5027          final FailingExceptionalCompletableFutureFunction r
5028              = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
5029 <        final DelegatedCompletionStage<Integer> d =
5030 <            new DelegatedCompletionStage<Integer>(f);
5029 >        final DelegatedCompletionStage<Item> d =
5030 >            new DelegatedCompletionStage<Item>(f);
5031          if (!createIncomplete) f.completeExceptionally(ex);
5032 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
5032 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
5033          if (createIncomplete) f.completeExceptionally(ex);
5034  
5035          checkCompletedExceptionally(f, ex);
# Line 5029 | Line 5043 | public class CompletableFutureTest exten
5043       */
5044      public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
5045          for (boolean createIncomplete : new boolean[] { true, false })
5046 <        for (Integer v1 : new Integer[] { 1, null })
5046 >        for (Item v1 : new Item[] { one, null })
5047      {
5048 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
5048 >        final CompletableFuture<Item> f = new CompletableFuture<>();
5049          final ExceptionalCompletableFutureFunction r =
5050              new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5051 <        final DelegatedCompletionStage<Integer> d =
5052 <            new DelegatedCompletionStage<Integer>(f);
5051 >        final DelegatedCompletionStage<Item> d =
5052 >            new DelegatedCompletionStage<Item>(f);
5053          if (!createIncomplete) assertTrue(f.complete(v1));
5054 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5054 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5055          if (createIncomplete) assertTrue(f.complete(v1));
5056  
5057          checkCompletedNormally(f, v1);
# Line 5055 | Line 5069 | public class CompletableFutureTest exten
5069          final CFException ex = new CFException();
5070          final ExceptionalCompletableFutureFunction r =
5071              new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5072 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
5073 <        final DelegatedCompletionStage<Integer> d =
5074 <            new DelegatedCompletionStage<Integer>(f);
5072 >        final CompletableFuture<Item> f = new CompletableFuture<>();
5073 >        final DelegatedCompletionStage<Item> d =
5074 >            new DelegatedCompletionStage<Item>(f);
5075          if (!createIncomplete) f.completeExceptionally(ex);
5076 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5076 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5077          if (createIncomplete) f.completeExceptionally(ex);
5078  
5079          checkCompletedExceptionally(f, ex);
# Line 5075 | Line 5089 | public class CompletableFutureTest exten
5089          for (boolean createIncomplete : new boolean[] { true, false })
5090      {
5091          final CFException ex = new CFException();
5092 <        final CompletableFuture<Integer> f = new CompletableFuture<>();
5092 >        final CompletableFuture<Item> f = new CompletableFuture<>();
5093          final FailingExceptionalCompletableFutureFunction r
5094              = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
5095 <        final DelegatedCompletionStage<Integer> d =
5096 <            new DelegatedCompletionStage<Integer>(f);
5095 >        final DelegatedCompletionStage<Item> d =
5096 >            new DelegatedCompletionStage<Item>(f);
5097          if (!createIncomplete) f.completeExceptionally(ex);
5098 <        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5098 >        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
5099          if (createIncomplete) f.completeExceptionally(ex);
5100  
5101          checkCompletedExceptionally(f, ex);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines