--- jsr166/src/test/tck/CompletableFutureTest.java	2019/12/16 22:36:39	1.223
+++ jsr166/src/test/tck/CompletableFutureTest.java	2021/01/26 13:33:05	1.224
@@ -77,14 +77,14 @@ public class CompletableFutureTest exten
     <T> void checkCompletedNormally(CompletableFuture<T> f, T expectedValue) {
         checkTimedGet(f, expectedValue);
 
-        assertEquals(expectedValue, f.join());
-        assertEquals(expectedValue, f.getNow(null));
+        mustEqual(expectedValue, f.join());
+        mustEqual(expectedValue, f.getNow(null));
 
         T result = null;
         try {
             result = f.get();
         } catch (Throwable fail) { threadUnexpectedException(fail); }
-        assertEquals(expectedValue, result);
+        mustEqual(expectedValue, result);
 
         assertTrue(f.isDone());
         assertFalse(f.isCancelled());
@@ -208,7 +208,7 @@ public class CompletableFutureTest exten
      * by methods isDone, isCancelled, and getNow
      */
     public void testConstructor() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         checkIncomplete(f);
     }
 
@@ -217,9 +217,9 @@ public class CompletableFutureTest exten
      * isCancelled, join, get, and getNow
      */
     public void testComplete() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         checkIncomplete(f);
         assertTrue(f.complete(v1));
         assertFalse(f.complete(v1));
@@ -231,7 +231,7 @@ public class CompletableFutureTest exten
      * methods isDone, isCancelled, join, get, and getNow
      */
     public void testCompleteExceptionally() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         CFException ex = new CFException();
         checkIncomplete(f);
         f.completeExceptionally(ex);
@@ -245,7 +245,7 @@ public class CompletableFutureTest exten
     public void testCancel() {
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         checkIncomplete(f);
         assertTrue(f.cancel(mayInterruptIfRunning));
         assertTrue(f.cancel(mayInterruptIfRunning));
@@ -257,7 +257,7 @@ public class CompletableFutureTest exten
      * obtrudeValue forces completion with given value
      */
     public void testObtrudeValue() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         checkIncomplete(f);
         assertTrue(f.complete(one));
         checkCompletedNormally(f, one);
@@ -280,10 +280,10 @@ public class CompletableFutureTest exten
      * obtrudeException forces completion with given exception
      */
     public void testObtrudeException() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         CFException ex;
-        CompletableFuture<Integer> f;
+        CompletableFuture<Item> f;
 
         f = new CompletableFuture<>();
         assertTrue(f.complete(v1));
@@ -315,22 +315,22 @@ public class CompletableFutureTest exten
      */
     public void testGetNumberOfDependents() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        assertEquals(0, f.getNumberOfDependents());
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        mustEqual(0, f.getNumberOfDependents());
         final CompletableFuture<Void> g = m.thenRun(f, new Noop(m));
-        assertEquals(1, f.getNumberOfDependents());
-        assertEquals(0, g.getNumberOfDependents());
+        mustEqual(1, f.getNumberOfDependents());
+        mustEqual(0, g.getNumberOfDependents());
         final CompletableFuture<Void> h = m.thenRun(f, new Noop(m));
-        assertEquals(2, f.getNumberOfDependents());
-        assertEquals(0, h.getNumberOfDependents());
+        mustEqual(2, f.getNumberOfDependents());
+        mustEqual(0, h.getNumberOfDependents());
         assertTrue(f.complete(v1));
         checkCompletedNormally(g, null);
         checkCompletedNormally(h, null);
-        assertEquals(0, f.getNumberOfDependents());
-        assertEquals(0, g.getNumberOfDependents());
-        assertEquals(0, h.getNumberOfDependents());
+        mustEqual(0, f.getNumberOfDependents());
+        mustEqual(0, g.getNumberOfDependents());
+        mustEqual(0, h.getNumberOfDependents());
     }}
 
     /**
@@ -340,7 +340,7 @@ public class CompletableFutureTest exten
         CompletableFuture<String> f = new CompletableFuture<>();
         assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]"));
         if (testImplementationDetails)
-            assertEquals(identityString(f) + "[Not completed]",
+            mustEqual(identityString(f) + "[Not completed]",
                          f.toString());
     }
 
@@ -349,7 +349,7 @@ public class CompletableFutureTest exten
         assertTrue(f.complete("foo"));
         assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]"));
         if (testImplementationDetails)
-            assertEquals(identityString(f) + "[Completed normally]",
+            mustEqual(identityString(f) + "[Completed normally]",
                          f.toString());
     }
 
@@ -387,55 +387,55 @@ public class CompletableFutureTest exten
         CheckedAction(ExecutionMode m) { this.m = m; }
         void invoked() {
             m.checkExecutionMode();
-            assertEquals(0, invocationCount++);
+            mustEqual(0, invocationCount++);
         }
-        void assertNotInvoked() { assertEquals(0, invocationCount); }
-        void assertInvoked() { assertEquals(1, invocationCount); }
+        void assertNotInvoked() { mustEqual(0, invocationCount); }
+        void assertInvoked() { mustEqual(1, invocationCount); }
     }
 
-    abstract static class CheckedIntegerAction extends CheckedAction {
-        Integer value;
-        CheckedIntegerAction(ExecutionMode m) { super(m); }
-        void assertValue(Integer expected) {
+    abstract static class CheckedItemAction extends CheckedAction {
+        Item value;
+        CheckedItemAction(ExecutionMode m) { super(m); }
+        void assertValue(Item expected) {
             assertInvoked();
-            assertEquals(expected, value);
+            mustEqual(expected, value);
         }
     }
 
-    static class IntegerSupplier extends CheckedAction
-        implements Supplier<Integer>
+    static class ItemSupplier extends CheckedAction
+        implements Supplier<Item>
     {
-        final Integer value;
-        IntegerSupplier(ExecutionMode m, Integer value) {
+        final Item value;
+        ItemSupplier(ExecutionMode m, Item value) {
             super(m);
             this.value = value;
         }
-        public Integer get() {
+        public Item get() {
             invoked();
             return value;
         }
     }
 
     // A function that handles and produces null values as well.
-    static Integer inc(Integer x) {
-        return (x == null) ? null : x + 1;
+    static Item inc(Item x) {
+        return (x == null) ? null : new Item(x.value + 1);
     }
 
-    static class NoopConsumer extends CheckedIntegerAction
-        implements Consumer<Integer>
+    static class NoopConsumer extends CheckedItemAction
+        implements Consumer<Item>
     {
         NoopConsumer(ExecutionMode m) { super(m); }
-        public void accept(Integer x) {
+        public void accept(Item x) {
             invoked();
             value = x;
         }
     }
 
-    static class IncFunction extends CheckedIntegerAction
-        implements Function<Integer,Integer>
+    static class IncFunction extends CheckedItemAction
+        implements Function<Item,Item>
     {
         IncFunction(ExecutionMode m) { super(m); }
-        public Integer apply(Integer x) {
+        public Item apply(Item x) {
             invoked();
             return value = inc(x);
         }
@@ -443,27 +443,27 @@ public class CompletableFutureTest exten
 
     // Choose non-commutative actions for better coverage
     // A non-commutative function that handles and produces null values as well.
-    static Integer subtract(Integer x, Integer y) {
+    static Item subtract(Item x, Item y) {
         return (x == null && y == null) ? null :
-            ((x == null) ? 42 : x.intValue())
-            - ((y == null) ? 99 : y.intValue());
+            new Item(((x == null) ? 42 : x.value)
+                    - ((y == null) ? 99 : y.value));
     }
 
-    static class SubtractAction extends CheckedIntegerAction
-        implements BiConsumer<Integer, Integer>
+    static class SubtractAction extends CheckedItemAction
+        implements BiConsumer<Item, Item>
     {
         SubtractAction(ExecutionMode m) { super(m); }
-        public void accept(Integer x, Integer y) {
+        public void accept(Item x, Item y) {
             invoked();
             value = subtract(x, y);
         }
     }
 
-    static class SubtractFunction extends CheckedIntegerAction
-        implements BiFunction<Integer, Integer, Integer>
+    static class SubtractFunction extends CheckedItemAction
+        implements BiFunction<Item, Item, Item>
     {
         SubtractFunction(ExecutionMode m) { super(m); }
-        public Integer apply(Integer x, Integer y) {
+        public Item apply(Item x, Item y) {
             invoked();
             return value = subtract(x, y);
         }
@@ -477,58 +477,58 @@ public class CompletableFutureTest exten
     }
 
     static class FailingSupplier extends CheckedAction
-        implements Supplier<Integer>
+        implements Supplier<Item>
     {
         final CFException ex;
         FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
-        public Integer get() {
+        public Item get() {
             invoked();
             throw ex;
         }
     }
 
-    static class FailingConsumer extends CheckedIntegerAction
-        implements Consumer<Integer>
+    static class FailingConsumer extends CheckedItemAction
+        implements Consumer<Item>
     {
         final CFException ex;
         FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
-        public void accept(Integer x) {
+        public void accept(Item x) {
             invoked();
             value = x;
             throw ex;
         }
     }
 
-    static class FailingBiConsumer extends CheckedIntegerAction
-        implements BiConsumer<Integer, Integer>
+    static class FailingBiConsumer extends CheckedItemAction
+        implements BiConsumer<Item, Item>
     {
         final CFException ex;
         FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
-        public void accept(Integer x, Integer y) {
+        public void accept(Item x, Item y) {
             invoked();
             value = subtract(x, y);
             throw ex;
         }
     }
 
-    static class FailingFunction extends CheckedIntegerAction
-        implements Function<Integer, Integer>
+    static class FailingFunction extends CheckedItemAction
+        implements Function<Item, Item>
     {
         final CFException ex;
         FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
-        public Integer apply(Integer x) {
+        public Item apply(Item x) {
             invoked();
             value = x;
             throw ex;
         }
     }
 
-    static class FailingBiFunction extends CheckedIntegerAction
-        implements BiFunction<Integer, Integer, Integer>
+    static class FailingBiFunction extends CheckedItemAction
+        implements BiFunction<Item, Item, Item>
     {
         final CFException ex;
         FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
-        public Integer apply(Integer x, Integer y) {
+        public Item apply(Item x, Item y) {
             invoked();
             value = subtract(x, y);
             throw ex;
@@ -544,11 +544,11 @@ public class CompletableFutureTest exten
         }
     }
 
-    static class CompletableFutureInc extends CheckedIntegerAction
-        implements Function<Integer, CompletableFuture<Integer>>
+    static class CompletableFutureInc extends CheckedItemAction
+        implements Function<Item, CompletableFuture<Item>>
     {
         CompletableFutureInc(ExecutionMode m) { super(m); }
-        public CompletableFuture<Integer> apply(Integer x) {
+        public CompletableFuture<Item> apply(Item x) {
             invoked();
             value = x;
             return CompletableFuture.completedFuture(inc(x));
@@ -556,32 +556,32 @@ public class CompletableFutureTest exten
     }
 
     static class FailingExceptionalCompletableFutureFunction extends CheckedAction
-        implements Function<Throwable, CompletableFuture<Integer>>
+        implements Function<Throwable, CompletableFuture<Item>>
     {
         final CFException ex;
         FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
-        public CompletableFuture<Integer> apply(Throwable x) {
+        public CompletableFuture<Item> apply(Throwable x) {
             invoked();
             throw ex;
         }
     }
 
     static class ExceptionalCompletableFutureFunction extends CheckedAction
-        implements Function<Throwable, CompletionStage<Integer>> {
-        final Integer value = 3;
+        implements Function<Throwable, CompletionStage<Item>> {
+        final Item value = three;
         ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); }
-        public CompletionStage<Integer> apply(Throwable x) {
+        public CompletionStage<Item> apply(Throwable x) {
             invoked();
             return CompletableFuture.completedFuture(value);
         }
     }
 
-    static class FailingCompletableFutureFunction extends CheckedIntegerAction
-        implements Function<Integer, CompletableFuture<Integer>>
+    static class FailingCompletableFutureFunction extends CheckedItemAction
+        implements Function<Item, CompletableFuture<Item>>
     {
         final CFException ex;
         FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
-        public CompletableFuture<Integer> apply(Integer x) {
+        public CompletableFuture<Item> apply(Item x) {
             invoked();
             value = x;
             throw ex;
@@ -703,7 +703,7 @@ public class CompletableFutureTest exten
         },
         ASYNC {
             public void checkExecutionMode() {
-                assertEquals(defaultExecutorIsCommonPool,
+                mustEqual(defaultExecutorIsCommonPool,
                              (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
             }
             public CompletableFuture<Void> runAsync(Runnable a) {
@@ -924,12 +924,12 @@ public class CompletableFutureTest exten
     public void testExceptionally_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.exceptionally
+        final CompletableFuture<Item> g = m.exceptionally
             (f, (Throwable t) -> {
                 ran.getAndIncrement();
                 throw new AssertionError("should not be called");
@@ -938,7 +938,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, v1);
         checkCompletedNormally(f, v1);
-        assertEquals(0, ran.get());
+        mustEqual(0, ran.get());
     }}
 
     /**
@@ -948,13 +948,13 @@ public class CompletableFutureTest exten
     public void testExceptionally_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.exceptionally
+        final CompletableFuture<Item> g = m.exceptionally
             (f, (Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(t, ex);
@@ -964,7 +964,7 @@ public class CompletableFutureTest exten
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedNormally(g, v1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -978,9 +978,9 @@ public class CompletableFutureTest exten
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex1 = new CFException();
         final CFException ex2 = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex1);
-        final CompletableFuture<Integer> g = m.exceptionally
+        final CompletableFuture<Item> g = m.exceptionally
             (f, (Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(t, ex1);
@@ -991,7 +991,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedException(g, ex2);
         checkCompletedExceptionally(f, ex1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1001,14 +1001,14 @@ public class CompletableFutureTest exten
     public void testWhenComplete_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.whenComplete
+        final CompletableFuture<Item> g = m.whenComplete
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(result, v1);
                 assertNull(t);
@@ -1018,7 +1018,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, v1);
         checkCompletedNormally(f, v1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1031,11 +1031,11 @@ public class CompletableFutureTest exten
     {
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.whenComplete
+        final CompletableFuture<Item> g = m.whenComplete
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertNull(result);
                 assertSame(t, ex);
@@ -1045,7 +1045,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedException(g, ex);
         checkCompletedExceptionally(f, ex);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1058,11 +1058,11 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         final AtomicInteger ran = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> g = m.whenComplete
+        final CompletableFuture<Item> g = m.whenComplete
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertNull(result);
                 assertTrue(t instanceof CancellationException);
@@ -1072,7 +1072,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedCancellationException(g);
         checkCancelled(f);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1082,15 +1082,15 @@ public class CompletableFutureTest exten
     public void testWhenComplete_sourceCompletedNormallyActionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.whenComplete
+        final CompletableFuture<Item> g = m.whenComplete
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(result, v1);
                 assertNull(t);
@@ -1101,7 +1101,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedException(g, ex);
         checkCompletedNormally(f, v1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1116,12 +1116,12 @@ public class CompletableFutureTest exten
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex1 = new CFException();
         final CFException ex2 = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
 
         if (!createIncomplete) f.completeExceptionally(ex1);
-        final CompletableFuture<Integer> g = m.whenComplete
+        final CompletableFuture<Item> g = m.whenComplete
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(t, ex1);
                 assertNull(result);
@@ -1133,10 +1133,10 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedException(g, ex1);
         checkCompletedExceptionally(f, ex1);
         if (testImplementationDetails) {
-            assertEquals(1, ex1.getSuppressed().length);
+            mustEqual(1, ex1.getSuppressed().length);
             assertSame(ex2, ex1.getSuppressed()[0]);
         }
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1146,14 +1146,14 @@ public class CompletableFutureTest exten
     public void testHandle_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final AtomicInteger ran = new AtomicInteger(0);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.handle
+        final CompletableFuture<Item> g = m.handle
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(result, v1);
                 assertNull(t);
@@ -1164,7 +1164,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1174,15 +1174,15 @@ public class CompletableFutureTest exten
     public void testHandle_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.handle
+        final CompletableFuture<Item> g = m.handle
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertNull(result);
                 assertSame(t, ex);
@@ -1193,7 +1193,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, v1);
         checkCompletedExceptionally(f, ex);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1204,14 +1204,14 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final AtomicInteger ran = new AtomicInteger(0);
         if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> g = m.handle
+        final CompletableFuture<Item> g = m.handle
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertNull(result);
                 assertTrue(t instanceof CancellationException);
@@ -1222,7 +1222,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, v1);
         checkCancelled(f);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1232,15 +1232,15 @@ public class CompletableFutureTest exten
     public void testHandle_sourceCompletedNormallyActionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.handle
+        final CompletableFuture<Item> g = m.handle
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertSame(result, v1);
                 assertNull(t);
@@ -1251,7 +1251,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedException(g, ex);
         checkCompletedNormally(f, v1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1266,12 +1266,12 @@ public class CompletableFutureTest exten
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex1 = new CFException();
         final CFException ex2 = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
 
         if (!createIncomplete) f.completeExceptionally(ex1);
-        final CompletableFuture<Integer> g = m.handle
+        final CompletableFuture<Item> g = m.handle
             (f,
-             (Integer result, Throwable t) -> {
+             (Item result, Throwable t) -> {
                 m.checkExecutionMode();
                 assertNull(result);
                 assertSame(ex1, t);
@@ -1282,7 +1282,7 @@ public class CompletableFutureTest exten
 
         checkCompletedWithWrappedException(g, ex2);
         checkCompletedExceptionally(f, ex1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -1328,7 +1328,7 @@ public class CompletableFutureTest exten
             assertSame(e.ex, t);
         }
 
-        assertEquals(1, e.count.get());
+        mustEqual(1, e.count.get());
     }
 
     /**
@@ -1340,10 +1340,10 @@ public class CompletableFutureTest exten
             ExecutionMode.EXECUTOR,
         };
         for (ExecutionMode m : executionModes)
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final IntegerSupplier r = new IntegerSupplier(m, v1);
-        final CompletableFuture<Integer> f = m.supplyAsync(r);
+        final ItemSupplier r = new ItemSupplier(m, v1);
+        final CompletableFuture<Item> f = m.supplyAsync(r);
         assertSame(v1, f.join());
         checkCompletedNormally(f, v1);
         r.assertInvoked();
@@ -1360,7 +1360,7 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : executionModes)
     {
         FailingSupplier r = new FailingSupplier(m);
-        CompletableFuture<Integer> f = m.supplyAsync(r);
+        CompletableFuture<Item> f = m.supplyAsync(r);
         checkCompletedWithWrappedException(f, r.ex);
         r.assertInvoked();
     }}
@@ -1375,7 +1375,7 @@ public class CompletableFutureTest exten
             assertSame(e.ex, t);
         }
 
-        assertEquals(1, e.count.get());
+        mustEqual(1, e.count.get());
     }
 
     // seq completion methods
@@ -1385,9 +1385,9 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
@@ -1420,7 +1420,7 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
@@ -1452,7 +1452,7 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
@@ -1482,9 +1482,9 @@ public class CompletableFutureTest exten
      */
     public void testThenRun_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingRunnable[] rs = new FailingRunnable[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
 
@@ -1510,19 +1510,19 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
         checkIncomplete(h0);
         checkIncomplete(h1);
         assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
 
         checkCompletedNormally(h0, inc(v1));
         checkCompletedNormally(h1, inc(v1));
@@ -1540,15 +1540,15 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
         assertTrue(f.completeExceptionally(ex));
-        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
 
         checkCompletedWithWrappedException(h0, ex);
         checkCompletedWithWrappedException(h1, ex);
@@ -1565,15 +1565,15 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
         assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
 
         checkCompletedWithWrappedCancellationException(h0);
         checkCompletedWithWrappedCancellationException(h1);
@@ -1588,17 +1588,17 @@ public class CompletableFutureTest exten
      */
     public void testThenApply_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingFunction[] rs = new FailingFunction[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.thenApply(f, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(f, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.thenApply(f, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(f, f, rs[1]);
         assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.thenApply(f, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(f, f, rs[3]);
 
         checkCompletedWithWrappedException(h0, rs[0].ex);
         checkCompletedWithWrappedException(h1, rs[1].ex);
@@ -1612,9 +1612,9 @@ public class CompletableFutureTest exten
      */
     public void testThenAccept_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final NoopConsumer[] rs = new NoopConsumer[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
 
@@ -1642,7 +1642,7 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final NoopConsumer[] rs = new NoopConsumer[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
 
@@ -1667,7 +1667,7 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final NoopConsumer[] rs = new NoopConsumer[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
 
@@ -1690,9 +1690,9 @@ public class CompletableFutureTest exten
      */
     public void testThenAccept_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingConsumer[] rs = new FailingConsumer[4];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
 
@@ -1716,24 +1716,24 @@ public class CompletableFutureTest exten
     public void testThenCombine_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final SubtractFunction[] rs = new SubtractFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
-        final CompletableFuture<Integer> h0 = m.thenCombine(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.thenCombine(fst, fst, rs[1]);
+        final CompletableFuture<Item> h0 = m.thenCombine(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.thenCombine(fst, fst, rs[1]);
         assertTrue(fst.complete(w1));
-        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.thenCombine(fst, fst, rs[3]);
+        final CompletableFuture<Item> h2 = m.thenCombine(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.thenCombine(fst, fst, rs[3]);
         checkIncomplete(h0); rs[0].assertNotInvoked();
         checkIncomplete(h2); rs[2].assertNotInvoked();
         checkCompletedNormally(h1, subtract(w1, w1));
@@ -1741,7 +1741,7 @@ public class CompletableFutureTest exten
         rs[1].assertValue(subtract(w1, w1));
         rs[3].assertValue(subtract(w1, w1));
         assertTrue(snd.complete(w2));
-        final CompletableFuture<Integer> h4 = m.thenCombine(f, g, rs[4]);
+        final CompletableFuture<Item> h4 = m.thenCombine(f, g, rs[4]);
 
         checkCompletedNormally(h0, subtract(v1, v2));
         checkCompletedNormally(h2, subtract(v1, v2));
@@ -1762,17 +1762,17 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final SubtractFunction r1 = new SubtractFunction(m);
         final SubtractFunction r2 = new SubtractFunction(m);
         final SubtractFunction r3 = new SubtractFunction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.completeExceptionally(ex) :
             () -> fst.complete(v1);
@@ -1780,13 +1780,13 @@ public class CompletableFutureTest exten
             () -> snd.complete(v1) :
             () -> snd.completeExceptionally(ex);
 
-        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
         assertTrue(complete1.call());
-        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
         checkIncomplete(h1);
         checkIncomplete(h2);
         assertTrue(complete2.call());
-        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
+        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
 
         checkCompletedWithWrappedException(h1, ex);
         checkCompletedWithWrappedException(h2, ex);
@@ -1806,16 +1806,16 @@ public class CompletableFutureTest exten
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final SubtractFunction r1 = new SubtractFunction(m);
         final SubtractFunction r2 = new SubtractFunction(m);
         final SubtractFunction r3 = new SubtractFunction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.cancel(mayInterruptIfRunning) :
             () -> fst.complete(v1);
@@ -1823,13 +1823,13 @@ public class CompletableFutureTest exten
             () -> snd.complete(v1) :
             () -> snd.cancel(mayInterruptIfRunning);
 
-        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
         assertTrue(complete1.call());
-        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
         checkIncomplete(h1);
         checkIncomplete(h2);
         assertTrue(complete2.call());
-        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
+        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
 
         checkCompletedWithWrappedCancellationException(h1);
         checkCompletedWithWrappedCancellationException(h2);
@@ -1847,25 +1847,25 @@ public class CompletableFutureTest exten
     public void testThenCombine_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingBiFunction r1 = new FailingBiFunction(m);
         final FailingBiFunction r2 = new FailingBiFunction(m);
         final FailingBiFunction r3 = new FailingBiFunction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
-        final CompletableFuture<Integer> h1 = m.thenCombine(f, g, r1);
+        final CompletableFuture<Item> h1 = m.thenCombine(f, g, r1);
         assertTrue(fst.complete(w1));
-        final CompletableFuture<Integer> h2 = m.thenCombine(f, g, r2);
+        final CompletableFuture<Item> h2 = m.thenCombine(f, g, r2);
         assertTrue(snd.complete(w2));
-        final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
+        final CompletableFuture<Item> h3 = m.thenCombine(f, g, r3);
 
         checkCompletedWithWrappedException(h1, r1.ex);
         checkCompletedWithWrappedException(h2, r2.ex);
@@ -1884,19 +1884,19 @@ public class CompletableFutureTest exten
     public void testThenAcceptBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final SubtractAction r1 = new SubtractAction(m);
         final SubtractAction r2 = new SubtractAction(m);
         final SubtractAction r3 = new SubtractAction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
         final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
         assertTrue(fst.complete(w1));
@@ -1926,17 +1926,17 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final SubtractAction r1 = new SubtractAction(m);
         final SubtractAction r2 = new SubtractAction(m);
         final SubtractAction r3 = new SubtractAction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.completeExceptionally(ex) :
             () -> fst.complete(v1);
@@ -1970,16 +1970,16 @@ public class CompletableFutureTest exten
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final SubtractAction r1 = new SubtractAction(m);
         final SubtractAction r2 = new SubtractAction(m);
         final SubtractAction r3 = new SubtractAction(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.cancel(mayInterruptIfRunning) :
             () -> fst.complete(v1);
@@ -2011,19 +2011,19 @@ public class CompletableFutureTest exten
     public void testThenAcceptBoth_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingBiConsumer r1 = new FailingBiConsumer(m);
         final FailingBiConsumer r2 = new FailingBiConsumer(m);
         final FailingBiConsumer r3 = new FailingBiConsumer(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
         final CompletableFuture<Void> h1 = m.thenAcceptBoth(f, g, r1);
         assertTrue(fst.complete(w1));
@@ -2048,19 +2048,19 @@ public class CompletableFutureTest exten
     public void testRunAfterBoth_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final Noop r1 = new Noop(m);
         final Noop r2 = new Noop(m);
         final Noop r3 = new Noop(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
         final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
         assertTrue(fst.complete(w1));
@@ -2090,17 +2090,17 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final Noop r1 = new Noop(m);
         final Noop r2 = new Noop(m);
         final Noop r3 = new Noop(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.completeExceptionally(ex) :
             () -> fst.complete(v1);
@@ -2134,16 +2134,16 @@ public class CompletableFutureTest exten
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
         for (boolean failFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final Noop r1 = new Noop(m);
         final Noop r2 = new Noop(m);
         final Noop r3 = new Noop(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
         final Callable<Boolean> complete1 = failFirst ?
             () -> fst.cancel(mayInterruptIfRunning) :
             () -> fst.complete(v1);
@@ -2175,19 +2175,19 @@ public class CompletableFutureTest exten
     public void testRunAfterBoth_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingRunnable r1 = new FailingRunnable(m);
         final FailingRunnable r2 = new FailingRunnable(m);
         final FailingRunnable r3 = new FailingRunnable(m);
 
-        final CompletableFuture<Integer> fst =  fFirst ? f : g;
-        final CompletableFuture<Integer> snd = !fFirst ? f : g;
-        final Integer w1 =  fFirst ? v1 : v2;
-        final Integer w2 = !fFirst ? v1 : v2;
+        final CompletableFuture<Item> fst =  fFirst ? f : g;
+        final CompletableFuture<Item> snd = !fFirst ? f : g;
+        final Item w1 =  fFirst ? v1 : v2;
+        final Item w2 = !fFirst ? v1 : v2;
 
         final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
         assertTrue(fst.complete(w1));
@@ -2211,16 +2211,16 @@ public class CompletableFutureTest exten
      */
     public void testApplyToEither_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         checkIncomplete(h0);
         checkIncomplete(h1);
         rs[0].assertNotInvoked();
@@ -2228,15 +2228,15 @@ public class CompletableFutureTest exten
         f.complete(v1);
         checkCompletedNormally(h0, inc(v1));
         checkCompletedNormally(h1, inc(v1));
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
         checkCompletedNormally(h2, inc(v1));
         checkCompletedNormally(h3, inc(v1));
         g.complete(v2);
 
         // unspecified behavior - both source completions available
-        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
-        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
+        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
+        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
         rs[4].assertValue(h4.join());
         rs[5].assertValue(h5.join());
         assertTrue(Objects.equals(inc(v1), h4.join()) ||
@@ -2259,16 +2259,16 @@ public class CompletableFutureTest exten
      */
     public void testApplyToEither_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final IncFunction[] rs = new IncFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         checkIncomplete(h0);
         checkIncomplete(h1);
         rs[0].assertNotInvoked();
@@ -2276,24 +2276,24 @@ public class CompletableFutureTest exten
         f.completeExceptionally(ex);
         checkCompletedWithWrappedException(h0, ex);
         checkCompletedWithWrappedException(h1, ex);
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
         checkCompletedWithWrappedException(h2, ex);
         checkCompletedWithWrappedException(h3, ex);
         g.complete(v1);
 
         // unspecified behavior - both source completions available
-        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
-        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
+        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
+        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
         try {
-            assertEquals(inc(v1), h4.join());
+            mustEqual(inc(v1), h4.join());
             rs[4].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h4, ex);
             rs[4].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h5.join());
+            mustEqual(inc(v1), h5.join());
             rs[5].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h5, ex);
@@ -2313,45 +2313,45 @@ public class CompletableFutureTest exten
     public void testApplyToEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final IncFunction[] rs = new IncFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex));
         assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex));
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
 
         // unspecified behavior - both source completions available
         try {
-            assertEquals(inc(v1), h0.join());
+            mustEqual(inc(v1), h0.join());
             rs[0].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h0, ex);
             rs[0].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h1.join());
+            mustEqual(inc(v1), h1.join());
             rs[1].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h1, ex);
             rs[1].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h2.join());
+            mustEqual(inc(v1), h2.join());
             rs[2].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h2, ex);
             rs[2].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h3.join());
+            mustEqual(inc(v1), h3.join());
             rs[3].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedException(h3, ex);
@@ -2368,15 +2368,15 @@ public class CompletableFutureTest exten
     public void testApplyToEither_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         checkIncomplete(h0);
         checkIncomplete(h1);
         rs[0].assertNotInvoked();
@@ -2384,24 +2384,24 @@ public class CompletableFutureTest exten
         f.cancel(mayInterruptIfRunning);
         checkCompletedWithWrappedCancellationException(h0);
         checkCompletedWithWrappedCancellationException(h1);
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
         checkCompletedWithWrappedCancellationException(h2);
         checkCompletedWithWrappedCancellationException(h3);
         g.complete(v1);
 
         // unspecified behavior - both source completions available
-        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
-        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
+        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
+        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
         try {
-            assertEquals(inc(v1), h4.join());
+            mustEqual(inc(v1), h4.join());
             rs[4].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h4);
             rs[4].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h5.join());
+            mustEqual(inc(v1), h5.join());
             rs[5].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h5);
@@ -2421,44 +2421,44 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final IncFunction[] rs = new IncFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         assertTrue(fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
         assertTrue(!fFirst ? f.complete(v1) : g.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
 
         // unspecified behavior - both source completions available
         try {
-            assertEquals(inc(v1), h0.join());
+            mustEqual(inc(v1), h0.join());
             rs[0].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h0);
             rs[0].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h1.join());
+            mustEqual(inc(v1), h1.join());
             rs[1].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h1);
             rs[1].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h2.join());
+            mustEqual(inc(v1), h2.join());
             rs[2].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h2);
             rs[2].assertNotInvoked();
         }
         try {
-            assertEquals(inc(v1), h3.join());
+            mustEqual(inc(v1), h3.join());
             rs[3].assertValue(inc(v1));
         } catch (CompletionException ok) {
             checkCompletedWithWrappedCancellationException(h3);
@@ -2474,19 +2474,19 @@ public class CompletableFutureTest exten
      */
     public void testApplyToEither_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingFunction[] rs = new FailingFunction[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m);
 
-        final CompletableFuture<Integer> h0 = m.applyToEither(f, g, rs[0]);
-        final CompletableFuture<Integer> h1 = m.applyToEither(g, f, rs[1]);
+        final CompletableFuture<Item> h0 = m.applyToEither(f, g, rs[0]);
+        final CompletableFuture<Item> h1 = m.applyToEither(g, f, rs[1]);
         f.complete(v1);
-        final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
-        final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
+        final CompletableFuture<Item> h2 = m.applyToEither(f, g, rs[2]);
+        final CompletableFuture<Item> h3 = m.applyToEither(g, f, rs[3]);
         checkCompletedWithWrappedException(h0, rs[0].ex);
         checkCompletedWithWrappedException(h1, rs[1].ex);
         checkCompletedWithWrappedException(h2, rs[2].ex);
@@ -2496,8 +2496,8 @@ public class CompletableFutureTest exten
         g.complete(v2);
 
         // unspecified behavior - both source completions available
-        final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
-        final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
+        final CompletableFuture<Item> h4 = m.applyToEither(f, g, rs[4]);
+        final CompletableFuture<Item> h5 = m.applyToEither(g, f, rs[5]);
 
         checkCompletedWithWrappedException(h4, rs[4].ex);
         assertTrue(Objects.equals(v1, rs[4].value) ||
@@ -2516,11 +2516,11 @@ public class CompletableFutureTest exten
      */
     public void testAcceptEither_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final NoopConsumer[] rs = new NoopConsumer[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
 
@@ -2568,10 +2568,10 @@ public class CompletableFutureTest exten
      */
     public void testAcceptEither_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final NoopConsumer[] rs = new NoopConsumer[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
@@ -2623,10 +2623,10 @@ public class CompletableFutureTest exten
     public void testAcceptEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final NoopConsumer[] rs = new NoopConsumer[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
@@ -2678,10 +2678,10 @@ public class CompletableFutureTest exten
     public void testAcceptEither_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final NoopConsumer[] rs = new NoopConsumer[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m);
 
@@ -2733,11 +2733,11 @@ public class CompletableFutureTest exten
      */
     public void testAcceptEither_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingConsumer[] rs = new FailingConsumer[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m);
 
@@ -2775,12 +2775,12 @@ public class CompletableFutureTest exten
      */
     public void testRunAfterEither_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
         for (boolean pushNop : new boolean[] { true, false })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
@@ -2828,10 +2828,10 @@ public class CompletableFutureTest exten
      */
     public void testRunAfterEither_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
@@ -2883,10 +2883,10 @@ public class CompletableFutureTest exten
     public void testRunAfterEither_exceptionalCompletion2() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean fFirst : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final CFException ex = new CFException();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
@@ -2938,10 +2938,10 @@ public class CompletableFutureTest exten
     public void testRunAfterEither_sourceCancelled() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final Noop[] rs = new Noop[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
 
@@ -2993,11 +2993,11 @@ public class CompletableFutureTest exten
      */
     public void testRunAfterEither_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
-        for (Integer v2 : new Integer[] { 2, null })
+        for (Item v1 : new Item[] { one, null })
+        for (Item v2 : new Item[] { two, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
         final FailingRunnable[] rs = new FailingRunnable[6];
         for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m);
 
@@ -3028,12 +3028,12 @@ public class CompletableFutureTest exten
     public void testThenCompose_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final CompletableFutureInc r = new CompletableFutureInc(m);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        final CompletableFuture<Item> g = m.thenCompose(f, r);
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(g, inc(v1));
@@ -3051,9 +3051,9 @@ public class CompletableFutureTest exten
     {
         final CFException ex = new CFException();
         final CompletableFutureInc r = new CompletableFutureInc(m);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        final CompletableFuture<Item> g = m.thenCompose(f, r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedWithWrappedException(g, ex);
@@ -3067,13 +3067,13 @@ public class CompletableFutureTest exten
     public void testThenCompose_actionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingCompletableFutureFunction r
             = new FailingCompletableFutureFunction(m);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        final CompletableFuture<Item> g = m.thenCompose(f, r);
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedWithWrappedException(g, r.ex);
@@ -3088,10 +3088,10 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final CompletableFutureInc r = new CompletableFutureInc(m);
         if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
-        final CompletableFuture<Integer> g = m.thenCompose(f, r);
+        final CompletableFuture<Item> g = m.thenCompose(f, r);
         if (createIncomplete) {
             checkIncomplete(g);
             assertTrue(f.cancel(mayInterruptIfRunning));
@@ -3107,12 +3107,12 @@ public class CompletableFutureTest exten
     public void testThenCompose_actionReturnsFailingFuture() {
         for (ExecutionMode m : ExecutionMode.values())
         for (int order = 0; order < 6; order++)
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final CompletableFuture<Integer> h;
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
+        final CompletableFuture<Item> h;
         // Test all permutations of orders
         switch (order) {
         case 0:
@@ -3160,13 +3160,13 @@ public class CompletableFutureTest exten
     public void testExceptionallyCompose_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(m);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(f, v1);
@@ -3185,9 +3185,9 @@ public class CompletableFutureTest exten
         final CFException ex = new CFException();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(m);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -3203,11 +3203,11 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingExceptionalCompletableFutureFunction r
             = new FailingExceptionalCompletableFutureFunction(m);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletableFuture<Integer> g = m.exceptionallyCompose(f, r);
+        final CompletableFuture<Item> g = m.exceptionallyCompose(f, r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -3225,9 +3225,9 @@ public class CompletableFutureTest exten
     {
         final CFException ex0 = new CFException();
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final CompletableFuture<Integer> g = new CompletableFuture<>();
-        final CompletableFuture<Integer> h;
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final CompletableFuture<Item> g = new CompletableFuture<>();
+        final CompletableFuture<Item> h;
         // Test all permutations of orders
         switch (order) {
         case 0:
@@ -3285,8 +3285,9 @@ public class CompletableFutureTest exten
      */
     public void testAllOf_normal() throws Exception {
         for (int k = 1; k < 10; k++) {
-            CompletableFuture<Integer>[] fs
-                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs
+                = (CompletableFuture<Item>[]) new CompletableFuture[k];
             for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
@@ -3302,8 +3303,9 @@ public class CompletableFutureTest exten
 
     public void testAllOf_normal_backwards() throws Exception {
         for (int k = 1; k < 10; k++) {
-            CompletableFuture<Integer>[] fs
-                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs
+                = (CompletableFuture<Item>[]) new CompletableFuture[k];
             for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
@@ -3319,18 +3321,20 @@ public class CompletableFutureTest exten
 
     public void testAllOf_exceptional() throws Exception {
         for (int k = 1; k < 10; k++) {
-            CompletableFuture<Integer>[] fs
-                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs
+                = (CompletableFuture<Item>[]) new CompletableFuture[k];
             CFException ex = new CFException();
             for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Void> f = CompletableFuture.allOf(fs);
             for (int i = 0; i < k; i++) {
+                Item I = itemFor(i);
                 checkIncomplete(f);
                 checkIncomplete(CompletableFuture.allOf(fs));
                 if (i != k / 2) {
-                    fs[i].complete(i);
-                    checkCompletedNormally(fs[i], i);
+                    fs[i].complete(I);
+                    checkCompletedNormally(fs[i], I);
                 } else {
                     fs[i].completeExceptionally(ex);
                     checkCompletedExceptionally(fs[i], ex);
@@ -3345,7 +3349,7 @@ public class CompletableFutureTest exten
      * anyOf(no component futures) returns an incomplete future
      */
     public void testAnyOf_empty() throws Exception {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         CompletableFuture<Object> f = CompletableFuture.anyOf();
         checkIncomplete(f);
@@ -3360,31 +3364,35 @@ public class CompletableFutureTest exten
      */
     public void testAnyOf_normal() throws Exception {
         for (int k = 0; k < 10; k++) {
-            CompletableFuture[] fs = new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs =
+                (CompletableFuture<Item>[])new CompletableFuture[k];
             for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
             checkIncomplete(f);
             for (int i = 0; i < k; i++) {
-                fs[i].complete(i);
-                checkCompletedNormally(f, 0);
-                int x = (int) CompletableFuture.anyOf(fs).join();
-                assertTrue(0 <= x && x <= i);
+                fs[i].complete(itemFor(i));
+                checkCompletedNormally(f, zero);
+                Item x = (Item)CompletableFuture.anyOf(fs).join();
+                assertTrue(0 <= x.value && x.value <= i);
             }
         }
     }
     public void testAnyOf_normal_backwards() throws Exception {
         for (int k = 0; k < 10; k++) {
-            CompletableFuture[] fs = new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs =
+                (CompletableFuture<Item>[])new CompletableFuture[k];
             for (int i = 0; i < k; i++)
                 fs[i] = new CompletableFuture<>();
             CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
             checkIncomplete(f);
             for (int i = k - 1; i >= 0; i--) {
-                fs[i].complete(i);
-                checkCompletedNormally(f, k - 1);
-                int x = (int) CompletableFuture.anyOf(fs).join();
-                assertTrue(i <= x && x <= k - 1);
+                fs[i].complete(itemFor(i));
+                checkCompletedNormally(f, itemFor(k - 1));
+                Item x = (Item)CompletableFuture.anyOf(fs).join();
+                assertTrue(i <= x.value && x.value <= k - 1);
             }
         }
     }
@@ -3394,7 +3402,9 @@ public class CompletableFutureTest exten
      */
     public void testAnyOf_exceptional() throws Exception {
         for (int k = 0; k < 10; k++) {
-            CompletableFuture[] fs = new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Item>[] fs =
+                (CompletableFuture<Item>[])new CompletableFuture[k];
             CFException[] exs = new CFException[k];
             for (int i = 0; i < k; i++) {
                 fs[i] = new CompletableFuture<>();
@@ -3412,7 +3422,9 @@ public class CompletableFutureTest exten
 
     public void testAnyOf_exceptional_backwards() throws Exception {
         for (int k = 0; k < 10; k++) {
-            CompletableFuture[] fs = new CompletableFuture[k];
+            @SuppressWarnings("unchecked")
+            CompletableFuture<Object>[] fs =
+                (CompletableFuture<Object>[])new CompletableFuture[k];
             CFException[] exs = new CFException[k];
             for (int i = 0; i < k; i++) {
                 fs[i] = new CompletableFuture<>();
@@ -3433,9 +3445,9 @@ public class CompletableFutureTest exten
      */
     @SuppressWarnings("FutureReturnValueIgnored")
     public void testNPE() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = new CompletableFuture<>();
-        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletableFuture<Item> g = new CompletableFuture<>();
+        CompletableFuture<Item> nullFuture = (CompletableFuture<Item>)null;
         ThreadExecutor exec = new ThreadExecutor();
 
         assertThrows(
@@ -3443,7 +3455,7 @@ public class CompletableFutureTest exten
 
             () -> CompletableFuture.supplyAsync(null),
             () -> CompletableFuture.supplyAsync(null, exec),
-            () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null),
+            () -> CompletableFuture.supplyAsync(new ItemSupplier(ExecutionMode.SYNC, fortytwo), null),
 
             () -> CompletableFuture.runAsync(null),
             () -> CompletableFuture.runAsync(null, exec),
@@ -3540,32 +3552,32 @@ public class CompletableFutureTest exten
             () -> CompletableFuture.delayedExecutor(1L, null),
 
             () -> f.orTimeout(1L, null),
-            () -> f.completeOnTimeout(42, 1L, null),
+            () -> f.completeOnTimeout(fortytwo, 1L, null),
 
             () -> CompletableFuture.failedFuture(null),
             () -> CompletableFuture.failedStage(null));
 
-        assertEquals(0, exec.count.get());
+        mustEqual(0, exec.count.get());
     }
 
     /**
      * Test submissions to an executor that rejects all tasks.
      */
     public void testRejectingExecutor() {
-        for (Integer v : new Integer[] { 1, null })
+        for (Item v : new Item[] { one, null })
     {
         final CountingRejectingExecutor e = new CountingRejectingExecutor();
 
-        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
-        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+        final CompletableFuture<Item> complete = CompletableFuture.completedFuture(v);
+        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
 
         List<CompletableFuture<?>> futures = new ArrayList<>();
 
-        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
+        List<CompletableFuture<Item>> srcs = new ArrayList<>();
         srcs.add(complete);
         srcs.add(incomplete);
 
-        for (CompletableFuture<Integer> src : srcs) {
+        for (CompletableFuture<Item> src : srcs) {
             List<CompletableFuture<?>> fs = new ArrayList<>();
             fs.add(src.thenRunAsync(() -> {}, e));
             fs.add(src.thenAcceptAsync(z -> {}, e));
@@ -3631,7 +3643,7 @@ public class CompletableFutureTest exten
         for (CompletableFuture<?> future : futures)
             checkCompletedWithWrappedException(future, e.ex);
 
-        assertEquals(futures.size(), e.count.get());
+        mustEqual(futures.size(), e.count.get());
     }}
 
     /**
@@ -3640,12 +3652,12 @@ public class CompletableFutureTest exten
      * explicitly completed.
      */
     public void testRejectingExecutorNeverInvoked() {
-        for (Integer v : new Integer[] { 1, null })
+        for (Item v : new Item[] { one, null })
     {
         final CountingRejectingExecutor e = new CountingRejectingExecutor();
 
-        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
-        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+        final CompletableFuture<Item> complete = CompletableFuture.completedFuture(v);
+        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
 
         List<CompletableFuture<?>> fs = new ArrayList<>();
         fs.add(incomplete.thenRunAsync(() -> {}, e));
@@ -3684,14 +3696,14 @@ public class CompletableFutureTest exten
         for (CompletableFuture<?> future : fs)
             checkCompletedNormally(future, null);
 
-        assertEquals(0, e.count.get());
+        mustEqual(0, e.count.get());
     }}
 
     /**
      * toCompletableFuture returns this CompletableFuture.
      */
     public void testToCompletableFuture() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         assertSame(f, f.toCompletableFuture());
     }
 
@@ -3701,10 +3713,10 @@ public class CompletableFutureTest exten
      * newIncompleteFuture returns an incomplete CompletableFuture
      */
     public void testNewIncompleteFuture() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = f.newIncompleteFuture();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletableFuture<Item> g = f.newIncompleteFuture();
         checkIncomplete(f);
         checkIncomplete(g);
         f.complete(v1);
@@ -3721,9 +3733,9 @@ public class CompletableFutureTest exten
     public void testCompletedStage() {
         AtomicInteger x = new AtomicInteger(0);
         AtomicReference<Throwable> r = new AtomicReference<>();
-        CompletionStage<Integer> f = CompletableFuture.completedStage(1);
-        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
-        assertEquals(x.get(), 1);
+        CompletionStage<Item> f = CompletableFuture.completedStage(one);
+        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
+        mustEqual(x.get(), 1);
         assertNull(r.get());
     }
 
@@ -3732,7 +3744,7 @@ public class CompletableFutureTest exten
      * it supports more than one thread.
      */
     public void testDefaultExecutor() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         Executor e = f.defaultExecutor();
         Executor c = ForkJoinPool.commonPool();
         if (ForkJoinPool.getCommonPoolParallelism() > 1)
@@ -3747,7 +3759,7 @@ public class CompletableFutureTest exten
      */
     public void testFailedFuture() {
         CFException ex = new CFException();
-        CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
+        CompletableFuture<Item> f = CompletableFuture.failedFuture(ex);
         checkCompletedExceptionally(f, ex);
     }
 
@@ -3757,11 +3769,11 @@ public class CompletableFutureTest exten
      */
     public void testCopy_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        CompletableFuture<Integer> g = f.copy();
+        CompletableFuture<Item> g = f.copy();
         if (createIncomplete) {
             checkIncomplete(f);
             checkIncomplete(g);
@@ -3779,9 +3791,9 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         CFException ex = new CFException();
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) f.completeExceptionally(ex);
-        CompletableFuture<Integer> g = f.copy();
+        CompletableFuture<Item> g = f.copy();
         if (createIncomplete) {
             checkIncomplete(f);
             checkIncomplete(g);
@@ -3795,8 +3807,8 @@ public class CompletableFutureTest exten
      * Completion of a copy does not complete its source.
      */
     public void testCopy_oneWayPropagation() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        assertTrue(f.copy().complete(1));
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        assertTrue(f.copy().complete(one));
         assertTrue(f.copy().complete(null));
         assertTrue(f.copy().cancel(true));
         assertTrue(f.copy().cancel(false));
@@ -3809,15 +3821,15 @@ public class CompletableFutureTest exten
      * completed normally, with the same value, when source is.
      */
     public void testMinimalCompletionStage() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> g = f.minimalCompletionStage();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> g = f.minimalCompletionStage();
         AtomicInteger x = new AtomicInteger(0);
         AtomicReference<Throwable> r = new AtomicReference<>();
         checkIncomplete(f);
-        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
-        f.complete(1);
-        checkCompletedNormally(f, 1);
-        assertEquals(x.get(), 1);
+        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
+        f.complete(one);
+        checkCompletedNormally(f, one);
+        mustEqual(x.get(), 1);
         assertNull(r.get());
     }
 
@@ -3826,17 +3838,17 @@ public class CompletableFutureTest exten
      * completed exceptionally when source is.
      */
     public void testMinimalCompletionStage2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> g = f.minimalCompletionStage();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> g = f.minimalCompletionStage();
         AtomicInteger x = new AtomicInteger(0);
         AtomicReference<Throwable> r = new AtomicReference<>();
-        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
+        g.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
         checkIncomplete(f);
         CFException ex = new CFException();
         f.completeExceptionally(ex);
         checkCompletedExceptionally(f, ex);
-        assertEquals(x.get(), 0);
-        assertEquals(r.get().getCause(), ex);
+        mustEqual(x.get(), 0);
+        mustEqual(r.get().getCause(), ex);
     }
 
     /**
@@ -3845,21 +3857,21 @@ public class CompletableFutureTest exten
      */
     public void testFailedStage() {
         CFException ex = new CFException();
-        CompletionStage<Integer> f = CompletableFuture.failedStage(ex);
+        CompletionStage<Item> f = CompletableFuture.failedStage(ex);
         AtomicInteger x = new AtomicInteger(0);
         AtomicReference<Throwable> r = new AtomicReference<>();
-        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
-        assertEquals(x.get(), 0);
-        assertEquals(r.get(), ex);
+        f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v.value);});
+        mustEqual(x.get(), 0);
+        mustEqual(r.get(), ex);
     }
 
     /**
      * completeAsync completes with value of given supplier
      */
     public void testCompleteAsync() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         f.completeAsync(() -> v1);
         f.join();
         checkCompletedNormally(f, v1);
@@ -3869,7 +3881,7 @@ public class CompletableFutureTest exten
      * completeAsync completes exceptionally if given supplier throws
      */
     public void testCompleteAsync2() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         CFException ex = new CFException();
         f.completeAsync(() -> { throw ex; });
         try {
@@ -3883,14 +3895,14 @@ public class CompletableFutureTest exten
      * completeAsync with given executor completes with value of given supplier
      */
     public void testCompleteAsync3() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         ThreadExecutor executor = new ThreadExecutor();
         f.completeAsync(() -> v1, executor);
         assertSame(v1, f.join());
         checkCompletedNormally(f, v1);
-        assertEquals(1, executor.count.get());
+        mustEqual(1, executor.count.get());
     }}
 
     /**
@@ -3898,7 +3910,7 @@ public class CompletableFutureTest exten
      * given supplier throws
      */
     public void testCompleteAsync4() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         CFException ex = new CFException();
         ThreadExecutor executor = new ThreadExecutor();
         f.completeAsync(() -> { throw ex; }, executor);
@@ -3907,7 +3919,7 @@ public class CompletableFutureTest exten
             shouldThrow();
         } catch (CompletionException success) {}
         checkCompletedWithWrappedException(f, ex);
-        assertEquals(1, executor.count.get());
+        mustEqual(1, executor.count.get());
     }
 
     /**
@@ -3915,7 +3927,7 @@ public class CompletableFutureTest exten
      */
     public void testOrTimeout_timesOut() {
         long timeoutMillis = timeoutMillis();
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         long startTime = System.nanoTime();
         assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
         checkCompletedWithTimeoutException(f);
@@ -3926,10 +3938,10 @@ public class CompletableFutureTest exten
      * orTimeout completes normally if completed before timeout
      */
     public void testOrTimeout_completed() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletableFuture<Item> g = new CompletableFuture<>();
         long startTime = System.nanoTime();
         f.complete(v1);
         assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
@@ -3944,21 +3956,21 @@ public class CompletableFutureTest exten
      * completeOnTimeout completes with given value if not complete
      */
     public void testCompleteOnTimeout_timesOut() {
-        testInParallel(() -> testCompleteOnTimeout_timesOut(42),
+        testInParallel(() -> testCompleteOnTimeout_timesOut(fortytwo),
                        () -> testCompleteOnTimeout_timesOut(null));
     }
 
     /**
      * completeOnTimeout completes with given value if not complete
      */
-    public void testCompleteOnTimeout_timesOut(Integer v) {
+    public void testCompleteOnTimeout_timesOut(Item v) {
         long timeoutMillis = timeoutMillis();
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         long startTime = System.nanoTime();
         assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
         assertSame(v, f.join());
         assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
-        f.complete(99);         // should have no effect
+        f.complete(ninetynine);         // should have no effect
         checkCompletedNormally(f, v);
     }
 
@@ -3966,14 +3978,14 @@ public class CompletableFutureTest exten
      * completeOnTimeout has no effect if completed within timeout
      */
     public void testCompleteOnTimeout_completed() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletableFuture<Integer> g = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletableFuture<Item> g = new CompletableFuture<>();
         long startTime = System.nanoTime();
         f.complete(v1);
-        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
-        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
+        mustEqual(f, f.completeOnTimeout(minusOne, LONG_DELAY_MS, MILLISECONDS));
+        mustEqual(g, g.completeOnTimeout(minusOne, LONG_DELAY_MS, MILLISECONDS));
         g.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v1);
@@ -3985,12 +3997,12 @@ public class CompletableFutureTest exten
      */
     public void testDelayedExecutor() {
         testInParallel(() -> testDelayedExecutor(null, null),
-                       () -> testDelayedExecutor(null, 1),
-                       () -> testDelayedExecutor(new ThreadExecutor(), 1),
-                       () -> testDelayedExecutor(new ThreadExecutor(), 1));
+                       () -> testDelayedExecutor(null, one),
+                       () -> testDelayedExecutor(new ThreadExecutor(), one),
+                       () -> testDelayedExecutor(new ThreadExecutor(), one));
     }
 
-    public void testDelayedExecutor(Executor executor, Integer v) throws Exception {
+    public void testDelayedExecutor(Executor executor, Item v) throws Exception {
         long timeoutMillis = timeoutMillis();
         // Use an "unreasonably long" long timeout to catch lingering threads
         long longTimeoutMillis = 1000 * 60 * 60 * 24;
@@ -4003,9 +4015,9 @@ public class CompletableFutureTest exten
             longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor);
         }
         long startTime = System.nanoTime();
-        CompletableFuture<Integer> f =
+        CompletableFuture<Item> f =
             CompletableFuture.supplyAsync(() -> v, delayer);
-        CompletableFuture<Integer> g =
+        CompletableFuture<Item> g =
             CompletableFuture.supplyAsync(() -> v, longDelayer);
 
         assertNull(g.getNow(null));
@@ -4050,14 +4062,14 @@ public class CompletableFutureTest exten
         for (ExecutionMode m : ExecutionMode.values())
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
-        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
+        final CompletableFuture<Item> v42 = CompletableFuture.completedFuture(fortytwo);
+        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
 
         final Runnable noopRunnable = new Noop(m);
-        final Consumer<Integer> noopConsumer = new NoopConsumer(m);
-        final Function<Integer, Integer> incFunction = new IncFunction(m);
+        final Consumer<Item> noopConsumer = new NoopConsumer(m);
+        final Function<Item, Item> incFunction = new IncFunction(m);
 
-        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
+        List<Function<CompletableFuture<Item>, CompletableFuture<?>>> funs
             = new ArrayList<>();
 
         funs.add(y -> m.thenRun(y, noopRunnable));
@@ -4075,7 +4087,7 @@ public class CompletableFutureTest exten
         funs.add(y -> m.thenCombine(y, v42, new SubtractFunction(m)));
         funs.add(y -> m.thenCombine(v42, y, new SubtractFunction(m)));
 
-        funs.add(y -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
+        funs.add(y -> m.whenComplete(y, (Item r, Throwable t) -> {}));
 
         funs.add(y -> m.thenCompose(y, new CompletableFutureInc(m)));
 
@@ -4086,21 +4098,21 @@ public class CompletableFutureTest exten
         funs.add(y -> CompletableFuture.anyOf(y, incomplete));
         funs.add(y -> CompletableFuture.anyOf(incomplete, y));
 
-        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
                  fun : funs) {
-            CompletableFuture<Integer> f = new CompletableFuture<>();
+            CompletableFuture<Item> f = new CompletableFuture<>();
             f.completeExceptionally(ex);
-            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
+            CompletableFuture<Item> src = m.thenApply(f, incFunction);
             checkCompletedWithWrappedException(src, ex);
             CompletableFuture<?> dep = fun.apply(src);
             checkCompletedWithWrappedException(dep, ex);
             assertSame(resultOf(src), resultOf(dep));
         }
 
-        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
                  fun : funs) {
-            CompletableFuture<Integer> f = new CompletableFuture<>();
-            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
+            CompletableFuture<Item> f = new CompletableFuture<>();
+            CompletableFuture<Item> src = m.thenApply(f, incFunction);
             CompletableFuture<?> dep = fun.apply(src);
             f.completeExceptionally(ex);
             checkCompletedWithWrappedException(src, ex);
@@ -4109,12 +4121,12 @@ public class CompletableFutureTest exten
         }
 
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
                  fun : funs) {
-            CompletableFuture<Integer> f = new CompletableFuture<>();
+            CompletableFuture<Item> f = new CompletableFuture<>();
             f.cancel(mayInterruptIfRunning);
             checkCancelled(f);
-            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
+            CompletableFuture<Item> src = m.thenApply(f, incFunction);
             checkCompletedWithWrappedCancellationException(src);
             CompletableFuture<?> dep = fun.apply(src);
             checkCompletedWithWrappedCancellationException(dep);
@@ -4122,10 +4134,10 @@ public class CompletableFutureTest exten
         }
 
         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
-        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
+        for (Function<CompletableFuture<Item>, CompletableFuture<?>>
                  fun : funs) {
-            CompletableFuture<Integer> f = new CompletableFuture<>();
-            CompletableFuture<Integer> src = m.thenApply(f, incFunction);
+            CompletableFuture<Item> f = new CompletableFuture<>();
+            CompletableFuture<Item> src = m.thenApply(f, incFunction);
             CompletableFuture<?> dep = fun.apply(src);
             f.cancel(mayInterruptIfRunning);
             checkCancelled(f);
@@ -4165,12 +4177,12 @@ public class CompletableFutureTest exten
             .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method)))
             .collect(Collectors.toList());
 
-        List<CompletionStage<Integer>> stages = new ArrayList<>();
-        CompletionStage<Integer> min =
-            new CompletableFuture<Integer>().minimalCompletionStage();
+        List<CompletionStage<Item>> stages = new ArrayList<>();
+        CompletionStage<Item> min =
+            new CompletableFuture<Item>().minimalCompletionStage();
         stages.add(min);
         stages.add(min.thenApply(x -> x));
-        stages.add(CompletableFuture.completedStage(1));
+        stages.add(CompletableFuture.completedStage(one));
         stages.add(CompletableFuture.failedStage(new CFException()));
 
         List<Method> bugs = new ArrayList<>();
@@ -4184,7 +4196,7 @@ public class CompletableFutureTest exten
                 else if (type == int.class)     args[i] = 0;
                 else if (type == long.class)    args[i] = 0L;
             }
-            for (CompletionStage<Integer> stage : stages) {
+            for (CompletionStage<Item> stage : stages) {
                 try {
                     method.invoke(stage, args);
                     bugs.add(method);
@@ -4208,12 +4220,12 @@ public class CompletableFutureTest exten
      */
     public void testMinimalCompletionStage_toCompletableFuture_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> minimal = f.minimalCompletionStage();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> minimal = f.minimalCompletionStage();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        CompletableFuture<Integer> g = minimal.toCompletableFuture();
+        CompletableFuture<Item> g = minimal.toCompletableFuture();
         if (createIncomplete) {
             checkIncomplete(f);
             checkIncomplete(g);
@@ -4231,10 +4243,10 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         CFException ex = new CFException();
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> minimal = f.minimalCompletionStage();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> minimal = f.minimalCompletionStage();
         if (!createIncomplete) f.completeExceptionally(ex);
-        CompletableFuture<Integer> g = minimal.toCompletableFuture();
+        CompletableFuture<Item> g = minimal.toCompletableFuture();
         if (createIncomplete) {
             checkIncomplete(f);
             checkIncomplete(g);
@@ -4248,11 +4260,11 @@ public class CompletableFutureTest exten
      * minimalStage.toCompletableFuture() gives mutable CompletableFuture
      */
     public void testMinimalCompletionStage_toCompletableFuture_mutable() {
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage minimal = f.minimalCompletionStage();
-        CompletableFuture<Integer> g = minimal.toCompletableFuture();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> minimal = f.minimalCompletionStage();
+        CompletableFuture<Item> g = minimal.toCompletableFuture();
         assertTrue(g.complete(v1));
         checkCompletedNormally(g, v1);
         checkIncomplete(f);
@@ -4264,14 +4276,14 @@ public class CompletableFutureTest exten
      */
     public void testMinimalCompletionStage_toCompletableFuture_join() throws Exception {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
-        CompletionStage<Integer> minimal = f.minimalCompletionStage();
+        CompletionStage<Item> minimal = f.minimalCompletionStage();
         if (createIncomplete) assertTrue(f.complete(v1));
-        assertEquals(v1, minimal.toCompletableFuture().join());
-        assertEquals(v1, minimal.toCompletableFuture().get());
+        mustEqual(v1, minimal.toCompletableFuture().join());
+        mustEqual(v1, minimal.toCompletableFuture().get());
         checkCompletedNormally(minimal.toCompletableFuture(), v1);
     }}
 
@@ -4280,16 +4292,16 @@ public class CompletableFutureTest exten
      * does not complete its source.
      */
     public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> g = f.minimalCompletionStage();
-        assertTrue(g.toCompletableFuture().complete(1));
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> g = f.minimalCompletionStage();
+        assertTrue(g.toCompletableFuture().complete(one));
         assertTrue(g.toCompletableFuture().complete(null));
         assertTrue(g.toCompletableFuture().cancel(true));
         assertTrue(g.toCompletableFuture().cancel(false));
         assertTrue(g.toCompletableFuture().completeExceptionally(new CFException()));
         checkIncomplete(g.toCompletableFuture());
-        f.complete(1);
-        checkCompletedNormally(g.toCompletableFuture(), 1);
+        f.complete(one);
+        checkCompletedNormally(g.toCompletableFuture(), one);
     }
 
     /** Demo utility method for external reliable toCompletableFuture */
@@ -4313,18 +4325,18 @@ public class CompletableFutureTest exten
      */
     public void testMinimalCompletionStage_join_by_hand() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        CompletableFuture<Integer> f = new CompletableFuture<>();
-        CompletionStage<Integer> minimal = f.minimalCompletionStage();
-        CompletableFuture<Integer> g = new CompletableFuture<>();
+        CompletableFuture<Item> f = new CompletableFuture<>();
+        CompletionStage<Item> minimal = f.minimalCompletionStage();
+        CompletableFuture<Item> g = new CompletableFuture<>();
         if (!createIncomplete) assertTrue(f.complete(v1));
         minimal.thenAccept(x -> g.complete(x));
         if (createIncomplete) assertTrue(f.complete(v1));
         g.join();
         checkCompletedNormally(g, v1);
         checkCompletedNormally(f, v1);
-        assertEquals(v1, join(minimal));
+        mustEqual(v1, join(minimal));
     }}
 
     static class Monad {
@@ -4371,7 +4383,7 @@ public class CompletableFutureTest exten
             if (fex != null || gex != null)
                 assertSame(fex.getClass(), gex.getClass());
             else
-                assertEquals(fval, gval);
+                mustEqual(fval, gval);
         }
 
         static class PlusFuture<T> extends CompletableFuture<T> {
@@ -4481,18 +4493,18 @@ public class CompletableFutureTest exten
     {
         final int val = 42;
         final int n = expensiveTests ? 1_000 : 2;
-        CompletableFuture<Integer> head = new CompletableFuture<>();
-        CompletableFuture<Integer> tail = head;
+        CompletableFuture<Item> head = new CompletableFuture<>();
+        CompletableFuture<Item> tail = head;
         for (int i = 0; i < n; i++) {
-            if (addDeadEnds) m.thenApply(tail, v -> v + 1);
-            tail = m.thenApply(tail, v -> v + 1);
-            if (addDeadEnds) m.applyToEither(tail, tail, v -> v + 1);
-            tail = m.applyToEither(tail, tail, v -> v + 1);
-            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> v + 1);
-            tail = m.thenCombine(tail, tail, (v, w) -> v + 1);
+            if (addDeadEnds) m.thenApply(tail, v -> new Item(v.value + 1));
+            tail = m.thenApply(tail, v -> new Item(v.value + 1));
+            if (addDeadEnds) m.applyToEither(tail, tail, v -> new Item(v.value + 1));
+            tail = m.applyToEither(tail, tail, v -> new Item(v.value + 1));
+            if (addDeadEnds) m.thenCombine(tail, tail, (v, w) -> new Item(v.value + 1));
+            tail = m.thenCombine(tail, tail, (v, w) -> new Item(v.value + 1));
         }
-        head.complete(val);
-        assertEquals(val + 3 * n, (int) tail.join());
+        head.complete(itemFor(val));
+        mustEqual(val + 3 * n, tail.join());
     }}
 
     /**
@@ -4525,15 +4537,15 @@ public class CompletableFutureTest exten
             new CompletableFuture<Void>().applyToEither(head, x -> count.getAndIncrement());
         }
         head.complete(null);
-        assertEquals(5 * 3 * n, count.get());
+        mustEqual(5 * 3 * n, count.get());
     }
 
     /** ant -Dvmoptions=-Xmx8m -Djsr166.expensiveTests=true -Djsr166.tckTestClass=CompletableFutureTest tck */
     @SuppressWarnings("FutureReturnValueIgnored")
     public void testCoCompletionGarbageRetention() throws Throwable {
         final int n = expensiveTests ? 1_000_000 : 10;
-        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
-        CompletableFuture<Integer> f;
+        final CompletableFuture<Item> incomplete = new CompletableFuture<>();
+        CompletableFuture<Item> f;
         for (int i = 0; i < n; i++) {
             f = new CompletableFuture<>();
             f.runAfterEither(incomplete, () -> {});
@@ -4577,11 +4589,12 @@ public class CompletableFutureTest exten
      * 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
      */
     public void testAnyOfGarbageRetention() throws Throwable {
-        for (Integer v : new Integer[] { 1, null })
+        for (Item v : new Item[] { one, null })
     {
         final int n = expensiveTests ? 100_000 : 10;
-        CompletableFuture<Integer>[] fs
-            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
+        @SuppressWarnings("unchecked")
+        CompletableFuture<Item>[] fs =
+            (CompletableFuture<Item>[])new CompletableFuture[100];
         for (int i = 0; i < fs.length; i++)
             fs[i] = new CompletableFuture<>();
         fs[fs.length - 1].complete(v);
@@ -4597,8 +4610,9 @@ public class CompletableFutureTest exten
      */
     public void testCancelledAllOfGarbageRetention() throws Throwable {
         final int n = expensiveTests ? 100_000 : 10;
-        CompletableFuture<Integer>[] fs
-            = (CompletableFuture<Integer>[]) new CompletableFuture<?>[100];
+        @SuppressWarnings("unchecked")
+        CompletableFuture<Item>[] fs
+            = (CompletableFuture<Item>[]) new CompletableFuture<?>[100];
         for (int i = 0; i < fs.length; i++)
             fs[i] = new CompletableFuture<>();
         for (int i = 0; i < n; i++)
@@ -4615,7 +4629,7 @@ public class CompletableFutureTest exten
      */
     public void testCancelledGarbageRetention() throws Throwable {
         final int n = expensiveTests ? 100_000 : 10;
-        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
+        CompletableFuture<Item> neverCompleted = new CompletableFuture<>();
         for (int i = 0; i < n; i++)
             assertTrue(neverCompleted.thenRun(() -> {}).cancel(true));
     }
@@ -4630,8 +4644,8 @@ public class CompletableFutureTest exten
      */
     public void testToCompletableFutureGarbageRetention() throws Throwable {
         final int n = expensiveTests ? 900_000 : 10;
-        CompletableFuture<Integer> neverCompleted = new CompletableFuture<>();
-        CompletionStage minimal = neverCompleted.minimalCompletionStage();
+        CompletableFuture<Item> neverCompleted = new CompletableFuture<>();
+        CompletionStage<Item> minimal = neverCompleted.minimalCompletionStage();
         for (int i = 0; i < n; i++)
             assertTrue(minimal.toCompletableFuture().cancel(true));
     }
@@ -4816,14 +4830,14 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyAsync_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletionStage<Integer> g = d.exceptionallyAsync
+        final CompletionStage<Item> g = d.exceptionallyAsync
             ((Throwable t) -> {
                 ran.getAndIncrement();
                 throw new AssertionError("should not be called");
@@ -4832,7 +4846,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g.toCompletableFuture(), v1);
         checkCompletedNormally(f, v1);
-        assertEquals(0, ran.get());
+        mustEqual(0, ran.get());
     }}
 
     /**
@@ -4841,15 +4855,15 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyAsync_exceptionalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyAsync
+        final CompletionStage<Item> g = d.exceptionallyAsync
             ((Throwable t) -> {
                 assertSame(t, ex);
                 ran.getAndIncrement();
@@ -4859,7 +4873,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g.toCompletableFuture(), v1);
         checkCompletedExceptionally(f, ex);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -4873,11 +4887,11 @@ public class CompletableFutureTest exten
         final AtomicInteger ran = new AtomicInteger(0);
         final CFException ex1 = new CFException();
         final CFException ex2 = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex1);
-        final CompletionStage<Integer> g = d.exceptionallyAsync
+        final CompletionStage<Item> g = d.exceptionallyAsync
             ((Throwable t) -> {
                 assertSame(t, ex1);
                 ran.getAndIncrement();
@@ -4888,7 +4902,7 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedException(g.toCompletableFuture(), ex2);
         checkCompletedExceptionally(f, ex1);
         checkCompletedExceptionally(d.toCompletableFuture(), ex1);
-        assertEquals(1, ran.get());
+        mustEqual(1, ran.get());
     }}
 
     /**
@@ -4897,15 +4911,15 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyCompose_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+        final CompletionStage<Item> g = d.exceptionallyCompose(r);
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(f, v1);
@@ -4923,11 +4937,11 @@ public class CompletableFutureTest exten
         final CFException ex = new CFException();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+        final CompletionStage<Item> g = d.exceptionallyCompose(r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -4943,13 +4957,13 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingExceptionalCompletableFutureFunction r
             = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyCompose(r);
+        final CompletionStage<Item> g = d.exceptionallyCompose(r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -4963,15 +4977,15 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyComposeAsync_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(f, v1);
@@ -4989,11 +5003,11 @@ public class CompletableFutureTest exten
         final CFException ex = new CFException();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -5009,13 +5023,13 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingExceptionalCompletableFutureFunction r
             = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r);
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r);
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -5029,15 +5043,15 @@ public class CompletableFutureTest exten
      */
     public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (Item v1 : new Item[] { one, null })
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) assertTrue(f.complete(v1));
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
         if (createIncomplete) assertTrue(f.complete(v1));
 
         checkCompletedNormally(f, v1);
@@ -5055,11 +5069,11 @@ public class CompletableFutureTest exten
         final CFException ex = new CFException();
         final ExceptionalCompletableFutureFunction r =
             new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final CompletableFuture<Item> f = new CompletableFuture<>();
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);
@@ -5075,13 +5089,13 @@ public class CompletableFutureTest exten
         for (boolean createIncomplete : new boolean[] { true, false })
     {
         final CFException ex = new CFException();
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
+        final CompletableFuture<Item> f = new CompletableFuture<>();
         final FailingExceptionalCompletableFutureFunction r
             = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR);
-        final DelegatedCompletionStage<Integer> d =
-            new DelegatedCompletionStage<Integer>(f);
+        final DelegatedCompletionStage<Item> d =
+            new DelegatedCompletionStage<Item>(f);
         if (!createIncomplete) f.completeExceptionally(ex);
-        final CompletionStage<Integer> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
+        final CompletionStage<Item> g = d.exceptionallyComposeAsync(r, new ThreadExecutor());
         if (createIncomplete) f.completeExceptionally(ex);
 
         checkCompletedExceptionally(f, ex);