--- jsr166/src/test/tck/CompletableFutureTest.java 2017/07/03 20:55:45 1.186 +++ jsr166/src/test/tck/CompletableFutureTest.java 2022/03/22 21:29:23 1.226 @@ -41,7 +41,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import junit.framework.AssertionFailedError; import junit.framework.Test; import junit.framework.TestSuite; @@ -59,10 +58,14 @@ public class CompletableFutureTest exten void checkIncomplete(CompletableFuture f) { assertFalse(f.isDone()); assertFalse(f.isCancelled()); - assertTrue(f.toString().contains("Not completed")); + assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]")); + + Object result = null; try { - assertNull(f.getNow(null)); + result = f.getNow(null); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertNull(result); + try { f.get(randomExpiredTimeout(), randomTimeUnit()); shouldThrow(); @@ -71,18 +74,22 @@ public class CompletableFutureTest exten catch (Throwable fail) { threadUnexpectedException(fail); } } - void checkCompletedNormally(CompletableFuture f, T value) { - checkTimedGet(f, value); + void checkCompletedNormally(CompletableFuture f, T expectedValue) { + checkTimedGet(f, expectedValue); + + mustEqual(expectedValue, f.join()); + mustEqual(expectedValue, f.getNow(null)); + T result = null; try { - assertEquals(value, f.join()); - assertEquals(value, f.getNow(null)); - assertEquals(value, f.get()); + result = f.get(); } catch (Throwable fail) { threadUnexpectedException(fail); } + mustEqual(expectedValue, result); + assertTrue(f.isDone()); assertFalse(f.isCancelled()); assertFalse(f.isCompletedExceptionally()); - assertTrue(f.toString().contains("[Completed normally]")); + assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]")); } /** @@ -138,7 +145,7 @@ public class CompletableFutureTest exten assertFalse(f.isCancelled()); assertTrue(f.isDone()); assertTrue(f.isCompletedExceptionally()); - assertTrue(f.toString().contains("[Completed exceptionally]")); + assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]")); } void checkCompletedWithWrappedCFException(CompletableFuture f) { @@ -193,7 +200,7 @@ public class CompletableFutureTest exten assertTrue(f.isDone()); assertTrue(f.isCompletedExceptionally()); assertTrue(f.isCancelled()); - assertTrue(f.toString().contains("[Completed exceptionally]")); + assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]")); } /** @@ -201,7 +208,7 @@ public class CompletableFutureTest exten * by methods isDone, isCancelled, and getNow */ public void testConstructor() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); } @@ -210,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 f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); assertTrue(f.complete(v1)); assertFalse(f.complete(v1)); @@ -224,7 +231,7 @@ public class CompletableFutureTest exten * methods isDone, isCancelled, join, get, and getNow */ public void testCompleteExceptionally() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); CFException ex = new CFException(); checkIncomplete(f); f.completeExceptionally(ex); @@ -238,7 +245,7 @@ public class CompletableFutureTest exten public void testCancel() { for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); assertTrue(f.cancel(mayInterruptIfRunning)); assertTrue(f.cancel(mayInterruptIfRunning)); @@ -250,7 +257,7 @@ public class CompletableFutureTest exten * obtrudeValue forces completion with given value */ public void testObtrudeValue() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); assertTrue(f.complete(one)); checkCompletedNormally(f, one); @@ -273,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 f; + CompletableFuture f; f = new CompletableFuture<>(); assertTrue(f.complete(v1)); @@ -292,7 +299,7 @@ public class CompletableFutureTest exten } f = new CompletableFuture<>(); - f.completeExceptionally(ex = new CFException()); + f.completeExceptionally(new CFException()); f.obtrudeValue(v1); checkCompletedNormally(f, v1); f.obtrudeException(ex = new CFException()); @@ -308,44 +315,61 @@ 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 f = new CompletableFuture<>(); - assertEquals(0, f.getNumberOfDependents()); + CompletableFuture f = new CompletableFuture<>(); + mustEqual(0, f.getNumberOfDependents()); final CompletableFuture 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 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()); }} /** * toString indicates current completion state */ - public void testToString() { - CompletableFuture f; - - f = new CompletableFuture(); - assertTrue(f.toString().contains("[Not completed]")); + public void testToString_incomplete() { + CompletableFuture f = new CompletableFuture<>(); + assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]")); + if (testImplementationDetails) + mustEqual(identityString(f) + "[Not completed]", + f.toString()); + } + public void testToString_normal() { + CompletableFuture f = new CompletableFuture<>(); assertTrue(f.complete("foo")); - assertTrue(f.toString().contains("[Completed normally]")); + assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]")); + if (testImplementationDetails) + mustEqual(identityString(f) + "[Completed normally]", + f.toString()); + } - f = new CompletableFuture(); + public void testToString_exception() { + CompletableFuture f = new CompletableFuture<>(); assertTrue(f.completeExceptionally(new IndexOutOfBoundsException())); - assertTrue(f.toString().contains("[Completed exceptionally]")); + assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]")); + if (testImplementationDetails) + assertTrue(f.toString().startsWith( + identityString(f) + "[Completed exceptionally: ")); + } + public void testToString_cancelled() { for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - f = new CompletableFuture(); + CompletableFuture f = new CompletableFuture<>(); assertTrue(f.cancel(mayInterruptIfRunning)); - assertTrue(f.toString().contains("[Completed exceptionally]")); + assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]")); + if (testImplementationDetails) + assertTrue(f.toString().startsWith( + identityString(f) + "[Completed exceptionally: ")); } } @@ -363,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 + static class ItemSupplier extends CheckedAction + implements Supplier { - 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 + static class NoopConsumer extends CheckedItemAction + implements Consumer { 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 + static class IncFunction extends CheckedItemAction + implements Function { IncFunction(ExecutionMode m) { super(m); } - public Integer apply(Integer x) { + public Item apply(Item x) { invoked(); return value = inc(x); } @@ -419,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 + static class SubtractAction extends CheckedItemAction + implements BiConsumer { 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 + static class SubtractFunction extends CheckedItemAction + implements BiFunction { 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); } @@ -453,58 +477,58 @@ public class CompletableFutureTest exten } static class FailingSupplier extends CheckedAction - implements Supplier + implements Supplier { 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 + static class FailingConsumer extends CheckedItemAction + implements Consumer { 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 + static class FailingBiConsumer extends CheckedItemAction + implements BiConsumer { 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 + static class FailingFunction extends CheckedItemAction + implements Function { 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 + static class FailingBiFunction extends CheckedItemAction + implements BiFunction { 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; @@ -520,25 +544,44 @@ public class CompletableFutureTest exten } } - static class CompletableFutureInc extends CheckedIntegerAction - implements Function> + static class CompletableFutureInc extends CheckedItemAction + implements Function> { CompletableFutureInc(ExecutionMode m) { super(m); } - public CompletableFuture apply(Integer x) { + public CompletableFuture apply(Item x) { invoked(); value = x; - CompletableFuture f = new CompletableFuture<>(); - assertTrue(f.complete(inc(x))); - return f; + return CompletableFuture.completedFuture(inc(x)); + } + } + + static class FailingExceptionalCompletableFutureFunction extends CheckedAction + implements Function> + { + final CFException ex; + FailingExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); } + public CompletableFuture apply(Throwable x) { + invoked(); + throw ex; + } + } + + static class ExceptionalCompletableFutureFunction extends CheckedAction + implements Function> { + final Item value = three; + ExceptionalCompletableFutureFunction(ExecutionMode m) { super(m); } + public CompletionStage apply(Throwable x) { + invoked(); + return CompletableFuture.completedFuture(value); } } - static class FailingCompletableFutureFunction extends CheckedIntegerAction - implements Function> + static class FailingCompletableFutureFunction extends CheckedItemAction + implements Function> { final CFException ex; FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); } - public CompletableFuture apply(Integer x) { + public CompletableFuture apply(Item x) { invoked(); value = x; throw ex; @@ -648,11 +691,19 @@ public class CompletableFutureTest exten Function a) { return f.applyToEither(g, a); } + public CompletableFuture exceptionally + (CompletableFuture f, + Function fn) { + return f.exceptionally(fn); + } + public CompletableFuture exceptionallyCompose + (CompletableFuture f, Function> fn) { + return f.exceptionallyCompose(fn); + } }, - ASYNC { public void checkExecutionMode() { - assertEquals(defaultExecutorIsCommonPool, + mustEqual(defaultExecutorIsCommonPool, (ForkJoinPool.commonPool() == ForkJoinTask.getPool())); } public CompletableFuture runAsync(Runnable a) { @@ -722,6 +773,17 @@ public class CompletableFutureTest exten Function a) { return f.applyToEitherAsync(g, a); } + public CompletableFuture exceptionally + (CompletableFuture f, + Function fn) { + return f.exceptionallyAsync(fn); + } + + public CompletableFuture exceptionallyCompose + (CompletableFuture f, Function> fn) { + return f.exceptionallyComposeAsync(fn); + } + }, EXECUTOR { @@ -795,6 +857,16 @@ public class CompletableFutureTest exten Function a) { return f.applyToEitherAsync(g, a, new ThreadExecutor()); } + public CompletableFuture exceptionally + (CompletableFuture f, + Function fn) { + return f.exceptionallyAsync(fn, new ThreadExecutor()); + } + public CompletableFuture exceptionallyCompose + (CompletableFuture f, Function> fn) { + return f.exceptionallyComposeAsync(fn, new ThreadExecutor()); + } + }; public abstract void checkExecutionMode(); @@ -837,6 +909,12 @@ public class CompletableFutureTest exten (CompletableFuture f, CompletionStage g, Function a); + public abstract CompletableFuture exceptionally + (CompletableFuture f, + Function fn); + public abstract CompletableFuture exceptionallyCompose + (CompletableFuture f, + Function> fn); } /** @@ -844,23 +922,23 @@ public class CompletableFutureTest exten * normally, and source result is propagated */ 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 a = new AtomicInteger(0); - final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = f.exceptionally - ((Throwable t) -> { - a.getAndIncrement(); - threadFail("should not be called"); - return null; // unreached + final CompletableFuture g = m.exceptionally + (f, (Throwable t) -> { + ran.getAndIncrement(); + throw new AssertionError("should not be called"); }); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, v1); checkCompletedNormally(f, v1); - assertEquals(0, a.get()); + mustEqual(0, ran.get()); }} /** @@ -868,24 +946,25 @@ public class CompletableFutureTest exten * exception */ 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 a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = f.exceptionally - ((Throwable t) -> { - ExecutionMode.SYNC.checkExecutionMode(); - threadAssertSame(t, ex); - a.getAndIncrement(); + final CompletableFuture g = m.exceptionally + (f, (Throwable t) -> { + m.checkExecutionMode(); + assertSame(t, ex); + ran.getAndIncrement(); return v1; }); if (createIncomplete) f.completeExceptionally(ex); checkCompletedNormally(g, v1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -893,25 +972,26 @@ public class CompletableFutureTest exten * exceptionally with that exception */ public void testExceptionally_exceptionalCompletionActionFailed() { + for (ExecutionMode m : ExecutionMode.values()) for (boolean createIncomplete : new boolean[] { true, false }) { - final AtomicInteger a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex1 = new CFException(); final CFException ex2 = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex1); - final CompletableFuture g = f.exceptionally - ((Throwable t) -> { - ExecutionMode.SYNC.checkExecutionMode(); - threadAssertSame(t, ex1); - a.getAndIncrement(); + final CompletableFuture g = m.exceptionally + (f, (Throwable t) -> { + m.checkExecutionMode(); + assertSame(t, ex1); + ran.getAndIncrement(); throw ex2; }); if (createIncomplete) f.completeExceptionally(ex1); checkCompletedWithWrappedException(g, ex2); checkCompletedExceptionally(f, ex1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -921,24 +1001,24 @@ 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 a = new AtomicInteger(0); - final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.whenComplete + final CompletableFuture g = m.whenComplete (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertSame(result, v1); - threadAssertNull(t); - a.getAndIncrement(); + assertSame(result, v1); + assertNull(t); + ran.getAndIncrement(); }); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, v1); checkCompletedNormally(f, v1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -949,23 +1029,23 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) for (boolean createIncomplete : new boolean[] { true, false }) { - final AtomicInteger a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.whenComplete + final CompletableFuture g = m.whenComplete (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertNull(result); - threadAssertSame(t, ex); - a.getAndIncrement(); + assertNull(result); + assertSame(t, ex); + ran.getAndIncrement(); }); if (createIncomplete) f.completeExceptionally(ex); checkCompletedWithWrappedException(g, ex); checkCompletedExceptionally(f, ex); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -977,22 +1057,22 @@ public class CompletableFutureTest exten for (boolean mayInterruptIfRunning : new boolean[] { true, false }) for (boolean createIncomplete : new boolean[] { true, false }) { - final AtomicInteger a = new AtomicInteger(0); - final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.whenComplete + final CompletableFuture g = m.whenComplete (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertNull(result); - threadAssertTrue(t instanceof CancellationException); - a.getAndIncrement(); + assertNull(result); + assertTrue(t instanceof CancellationException); + ran.getAndIncrement(); }); if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); checkCompletedWithWrappedCancellationException(g); checkCancelled(f); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1002,26 +1082,26 @@ 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 a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.whenComplete + final CompletableFuture g = m.whenComplete (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertSame(result, v1); - threadAssertNull(t); - a.getAndIncrement(); + assertSame(result, v1); + assertNull(t); + ran.getAndIncrement(); throw ex; }); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedWithWrappedException(g, ex); checkCompletedNormally(f, v1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1033,19 +1113,19 @@ public class CompletableFutureTest exten for (boolean createIncomplete : new boolean[] { true, false }) for (ExecutionMode m : ExecutionMode.values()) { - final AtomicInteger a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex1 = new CFException(); final CFException ex2 = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex1); - final CompletableFuture g = m.whenComplete + final CompletableFuture g = m.whenComplete (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertSame(t, ex1); - threadAssertNull(result); - a.getAndIncrement(); + assertSame(t, ex1); + assertNull(result); + ran.getAndIncrement(); throw ex2; }); if (createIncomplete) f.completeExceptionally(ex1); @@ -1053,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, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1066,25 +1146,25 @@ 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 f = new CompletableFuture<>(); - final AtomicInteger a = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.handle + final CompletableFuture g = m.handle (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertSame(result, v1); - threadAssertNull(t); - a.getAndIncrement(); + assertSame(result, v1); + assertNull(t); + ran.getAndIncrement(); return inc(v1); }); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1094,26 +1174,26 @@ 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 f = new CompletableFuture<>(); - final AtomicInteger a = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex = new CFException(); if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.handle + final CompletableFuture g = m.handle (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertNull(result); - threadAssertSame(t, ex); - a.getAndIncrement(); + assertNull(result); + assertSame(t, ex); + ran.getAndIncrement(); return v1; }); if (createIncomplete) f.completeExceptionally(ex); checkCompletedNormally(g, v1); checkCompletedExceptionally(f, ex); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1124,25 +1204,25 @@ 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 f = new CompletableFuture<>(); - final AtomicInteger a = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.handle + final CompletableFuture g = m.handle (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertNull(result); - threadAssertTrue(t instanceof CancellationException); - a.getAndIncrement(); + assertNull(result); + assertTrue(t instanceof CancellationException); + ran.getAndIncrement(); return v1; }); if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); checkCompletedNormally(g, v1); checkCancelled(f); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1152,26 +1232,26 @@ 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 f = new CompletableFuture<>(); - final AtomicInteger a = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex = new CFException(); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.handle + final CompletableFuture g = m.handle (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertSame(result, v1); - threadAssertNull(t); - a.getAndIncrement(); + assertSame(result, v1); + assertNull(t); + ran.getAndIncrement(); throw ex; }); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedWithWrappedException(g, ex); checkCompletedNormally(f, v1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1183,26 +1263,26 @@ public class CompletableFutureTest exten for (boolean createIncomplete : new boolean[] { true, false }) for (ExecutionMode m : ExecutionMode.values()) { - final AtomicInteger a = new AtomicInteger(0); + final AtomicInteger ran = new AtomicInteger(0); final CFException ex1 = new CFException(); final CFException ex2 = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex1); - final CompletableFuture g = m.handle + final CompletableFuture g = m.handle (f, - (Integer result, Throwable t) -> { + (Item result, Throwable t) -> { m.checkExecutionMode(); - threadAssertNull(result); - threadAssertSame(ex1, t); - a.getAndIncrement(); + assertNull(result); + assertSame(ex1, t); + ran.getAndIncrement(); throw ex2; }); if (createIncomplete) f.completeExceptionally(ex1); checkCompletedWithWrappedException(g, ex2); checkCompletedExceptionally(f, ex1); - assertEquals(1, a.get()); + mustEqual(1, ran.get()); }} /** @@ -1238,6 +1318,7 @@ public class CompletableFutureTest exten r.assertInvoked(); }} + @SuppressWarnings("FutureReturnValueIgnored") public void testRunAsync_rejectingExecutor() { CountingRejectingExecutor e = new CountingRejectingExecutor(); try { @@ -1247,7 +1328,7 @@ public class CompletableFutureTest exten assertSame(e.ex, t); } - assertEquals(1, e.count.get()); + mustEqual(1, e.count.get()); } /** @@ -1259,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 f = m.supplyAsync(r); + final ItemSupplier r = new ItemSupplier(m, v1); + final CompletableFuture f = m.supplyAsync(r); assertSame(v1, f.join()); checkCompletedNormally(f, v1); r.assertInvoked(); @@ -1279,11 +1360,12 @@ public class CompletableFutureTest exten for (ExecutionMode m : executionModes) { FailingSupplier r = new FailingSupplier(m); - CompletableFuture f = m.supplyAsync(r); + CompletableFuture f = m.supplyAsync(r); checkCompletedWithWrappedException(f, r.ex); r.assertInvoked(); }} + @SuppressWarnings("FutureReturnValueIgnored") public void testSupplyAsync_rejectingExecutor() { CountingRejectingExecutor e = new CountingRejectingExecutor(); try { @@ -1293,7 +1375,7 @@ public class CompletableFutureTest exten assertSame(e.ex, t); } - assertEquals(1, e.count.get()); + mustEqual(1, e.count.get()); } // seq completion methods @@ -1303,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final Noop[] rs = new Noop[6]; for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); @@ -1338,7 +1420,7 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) { final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final Noop[] rs = new Noop[6]; for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); @@ -1370,7 +1452,7 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final Noop[] rs = new Noop[6]; for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); @@ -1400,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final FailingRunnable[] rs = new FailingRunnable[6]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m); @@ -1428,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[4]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.thenApply(f, rs[0]); - final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); + final CompletableFuture h0 = m.thenApply(f, rs[0]); + final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); checkIncomplete(h0); checkIncomplete(h1); assertTrue(f.complete(v1)); - final CompletableFuture h2 = m.thenApply(f, rs[2]); - final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); + final CompletableFuture h2 = m.thenApply(f, rs[2]); + final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); checkCompletedNormally(h0, inc(v1)); checkCompletedNormally(h1, inc(v1)); @@ -1458,15 +1540,15 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) { final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[4]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.thenApply(f, rs[0]); - final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); + final CompletableFuture h0 = m.thenApply(f, rs[0]); + final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); assertTrue(f.completeExceptionally(ex)); - final CompletableFuture h2 = m.thenApply(f, rs[2]); - final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); + final CompletableFuture h2 = m.thenApply(f, rs[2]); + final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); checkCompletedWithWrappedException(h0, ex); checkCompletedWithWrappedException(h1, ex); @@ -1483,15 +1565,15 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[4]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.thenApply(f, rs[0]); - final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); + final CompletableFuture h0 = m.thenApply(f, rs[0]); + final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture h2 = m.thenApply(f, rs[2]); - final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); + final CompletableFuture h2 = m.thenApply(f, rs[2]); + final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); checkCompletedWithWrappedCancellationException(h0); checkCompletedWithWrappedCancellationException(h1); @@ -1506,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final FailingFunction[] rs = new FailingFunction[4]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m); - final CompletableFuture h0 = m.thenApply(f, rs[0]); - final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); + final CompletableFuture h0 = m.thenApply(f, rs[0]); + final CompletableFuture h1 = m.applyToEither(f, f, rs[1]); assertTrue(f.complete(v1)); - final CompletableFuture h2 = m.thenApply(f, rs[2]); - final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); + final CompletableFuture h2 = m.thenApply(f, rs[2]); + final CompletableFuture h3 = m.applyToEither(f, f, rs[3]); checkCompletedWithWrappedException(h0, rs[0].ex); checkCompletedWithWrappedException(h1, rs[1].ex); @@ -1530,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final NoopConsumer[] rs = new NoopConsumer[4]; for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); @@ -1560,7 +1642,7 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) { final CFException ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final NoopConsumer[] rs = new NoopConsumer[4]; for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); @@ -1585,7 +1667,7 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final NoopConsumer[] rs = new NoopConsumer[4]; for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); @@ -1608,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final FailingConsumer[] rs = new FailingConsumer[4]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m); @@ -1634,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final SubtractFunction[] rs = new SubtractFunction[6]; for (int i = 0; i < rs.length; i++) rs[i] = new SubtractFunction(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; - final CompletableFuture h0 = m.thenCombine(f, g, rs[0]); - final CompletableFuture h1 = m.thenCombine(fst, fst, rs[1]); + final CompletableFuture h0 = m.thenCombine(f, g, rs[0]); + final CompletableFuture h1 = m.thenCombine(fst, fst, rs[1]); assertTrue(fst.complete(w1)); - final CompletableFuture h2 = m.thenCombine(f, g, rs[2]); - final CompletableFuture h3 = m.thenCombine(fst, fst, rs[3]); + final CompletableFuture h2 = m.thenCombine(f, g, rs[2]); + final CompletableFuture h3 = m.thenCombine(fst, fst, rs[3]); checkIncomplete(h0); rs[0].assertNotInvoked(); checkIncomplete(h2); rs[2].assertNotInvoked(); checkCompletedNormally(h1, subtract(w1, w1)); @@ -1659,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 h4 = m.thenCombine(f, g, rs[4]); + final CompletableFuture h4 = m.thenCombine(f, g, rs[4]); checkCompletedNormally(h0, subtract(v1, v2)); checkCompletedNormally(h2, subtract(v1, v2)); @@ -1680,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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 fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.completeExceptionally(ex) : () -> fst.complete(v1); @@ -1698,13 +1780,13 @@ public class CompletableFutureTest exten () -> snd.complete(v1) : () -> snd.completeExceptionally(ex); - final CompletableFuture h1 = m.thenCombine(f, g, r1); + final CompletableFuture h1 = m.thenCombine(f, g, r1); assertTrue(complete1.call()); - final CompletableFuture h2 = m.thenCombine(f, g, r2); + final CompletableFuture h2 = m.thenCombine(f, g, r2); checkIncomplete(h1); checkIncomplete(h2); assertTrue(complete2.call()); - final CompletableFuture h3 = m.thenCombine(f, g, r3); + final CompletableFuture h3 = m.thenCombine(f, g, r3); checkCompletedWithWrappedException(h1, ex); checkCompletedWithWrappedException(h2, ex); @@ -1724,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final SubtractFunction r1 = new SubtractFunction(m); final SubtractFunction r2 = new SubtractFunction(m); final SubtractFunction r3 = new SubtractFunction(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.cancel(mayInterruptIfRunning) : () -> fst.complete(v1); @@ -1741,13 +1823,13 @@ public class CompletableFutureTest exten () -> snd.complete(v1) : () -> snd.cancel(mayInterruptIfRunning); - final CompletableFuture h1 = m.thenCombine(f, g, r1); + final CompletableFuture h1 = m.thenCombine(f, g, r1); assertTrue(complete1.call()); - final CompletableFuture h2 = m.thenCombine(f, g, r2); + final CompletableFuture h2 = m.thenCombine(f, g, r2); checkIncomplete(h1); checkIncomplete(h2); assertTrue(complete2.call()); - final CompletableFuture h3 = m.thenCombine(f, g, r3); + final CompletableFuture h3 = m.thenCombine(f, g, r3); checkCompletedWithWrappedCancellationException(h1); checkCompletedWithWrappedCancellationException(h2); @@ -1765,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingBiFunction r1 = new FailingBiFunction(m); final FailingBiFunction r2 = new FailingBiFunction(m); final FailingBiFunction r3 = new FailingBiFunction(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; - final CompletableFuture h1 = m.thenCombine(f, g, r1); + final CompletableFuture h1 = m.thenCombine(f, g, r1); assertTrue(fst.complete(w1)); - final CompletableFuture h2 = m.thenCombine(f, g, r2); + final CompletableFuture h2 = m.thenCombine(f, g, r2); assertTrue(snd.complete(w2)); - final CompletableFuture h3 = m.thenCombine(f, g, r3); + final CompletableFuture h3 = m.thenCombine(f, g, r3); checkCompletedWithWrappedException(h1, r1.ex); checkCompletedWithWrappedException(h2, r2.ex); @@ -1802,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final SubtractAction r1 = new SubtractAction(m); final SubtractAction r2 = new SubtractAction(m); final SubtractAction r3 = new SubtractAction(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; final CompletableFuture h1 = m.thenAcceptBoth(f, g, r1); assertTrue(fst.complete(w1)); @@ -1844,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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 fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.completeExceptionally(ex) : () -> fst.complete(v1); @@ -1888,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final SubtractAction r1 = new SubtractAction(m); final SubtractAction r2 = new SubtractAction(m); final SubtractAction r3 = new SubtractAction(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.cancel(mayInterruptIfRunning) : () -> fst.complete(v1); @@ -1929,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingBiConsumer r1 = new FailingBiConsumer(m); final FailingBiConsumer r2 = new FailingBiConsumer(m); final FailingBiConsumer r3 = new FailingBiConsumer(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; final CompletableFuture h1 = m.thenAcceptBoth(f, g, r1); assertTrue(fst.complete(w1)); @@ -1966,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final Noop r1 = new Noop(m); final Noop r2 = new Noop(m); final Noop r3 = new Noop(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; final CompletableFuture h1 = m.runAfterBoth(f, g, r1); assertTrue(fst.complete(w1)); @@ -2008,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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 fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.completeExceptionally(ex) : () -> fst.complete(v1); @@ -2052,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final Noop r1 = new Noop(m); final Noop r2 = new Noop(m); final Noop r3 = new Noop(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; final Callable complete1 = failFirst ? () -> fst.cancel(mayInterruptIfRunning) : () -> fst.complete(v1); @@ -2093,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingRunnable r1 = new FailingRunnable(m); final FailingRunnable r2 = new FailingRunnable(m); final FailingRunnable r3 = new FailingRunnable(m); - final CompletableFuture fst = fFirst ? f : g; - final CompletableFuture snd = !fFirst ? f : g; - final Integer w1 = fFirst ? v1 : v2; - final Integer w2 = !fFirst ? v1 : v2; + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Item w1 = fFirst ? v1 : v2; + final Item w2 = !fFirst ? v1 : v2; final CompletableFuture h1 = m.runAfterBoth(f, g, r1); assertTrue(fst.complete(w1)); @@ -2129,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[6]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); checkIncomplete(h0); checkIncomplete(h1); rs[0].assertNotInvoked(); @@ -2146,15 +2228,15 @@ public class CompletableFutureTest exten f.complete(v1); checkCompletedNormally(h0, inc(v1)); checkCompletedNormally(h1, inc(v1)); - final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture 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 h4 = m.applyToEither(f, g, rs[4]); - final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); + final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); + final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); rs[4].assertValue(h4.join()); rs[5].assertValue(h5.join()); assertTrue(Objects.equals(inc(v1), h4.join()) || @@ -2177,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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 h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); checkIncomplete(h0); checkIncomplete(h1); rs[0].assertNotInvoked(); @@ -2194,24 +2276,24 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); checkCompletedWithWrappedException(h0, ex); checkCompletedWithWrappedException(h1, ex); - final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); checkCompletedWithWrappedException(h2, ex); checkCompletedWithWrappedException(h3, ex); g.complete(v1); // unspecified behavior - both source completions available - final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); - final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); + final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); + final CompletableFuture 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); @@ -2231,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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 h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture 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 h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture 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); @@ -2286,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[6]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); checkIncomplete(h0); checkIncomplete(h1); rs[0].assertNotInvoked(); @@ -2302,24 +2384,24 @@ public class CompletableFutureTest exten f.cancel(mayInterruptIfRunning); checkCompletedWithWrappedCancellationException(h0); checkCompletedWithWrappedCancellationException(h1); - final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); checkCompletedWithWrappedCancellationException(h2); checkCompletedWithWrappedCancellationException(h3); g.complete(v1); // unspecified behavior - both source completions available - final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); - final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); + final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); + final CompletableFuture 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); @@ -2339,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final IncFunction[] rs = new IncFunction[6]; for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture 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 h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture 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); @@ -2392,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingFunction[] rs = new FailingFunction[6]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m); - final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); - final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); + final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); + final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); f.complete(v1); - final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); - final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); + final CompletableFuture h2 = m.applyToEither(f, g, rs[2]); + final CompletableFuture h3 = m.applyToEither(g, f, rs[3]); checkCompletedWithWrappedException(h0, rs[0].ex); checkCompletedWithWrappedException(h1, rs[1].ex); checkCompletedWithWrappedException(h2, rs[2].ex); @@ -2414,8 +2496,8 @@ public class CompletableFutureTest exten g.complete(v2); // unspecified behavior - both source completions available - final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); - final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); + final CompletableFuture h4 = m.applyToEither(f, g, rs[4]); + final CompletableFuture h5 = m.applyToEither(g, f, rs[5]); checkCompletedWithWrappedException(h4, rs[4].ex); assertTrue(Objects.equals(v1, rs[4].value) || @@ -2434,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final NoopConsumer[] rs = new NoopConsumer[6]; for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); @@ -2486,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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); @@ -2541,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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); @@ -2596,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final NoopConsumer[] rs = new NoopConsumer[6]; for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); @@ -2651,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingConsumer[] rs = new FailingConsumer[6]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m); @@ -2693,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final Noop[] rs = new Noop[6]; for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); @@ -2746,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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); @@ -2801,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture 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); @@ -2856,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final Noop[] rs = new Noop[6]; for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); @@ -2911,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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); final FailingRunnable[] rs = new FailingRunnable[6]; for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m); @@ -2946,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final CompletableFutureInc r = new CompletableFutureInc(m); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenCompose(f, r); + final CompletableFuture g = m.thenCompose(f, r); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, inc(v1)); @@ -2969,9 +3051,9 @@ public class CompletableFutureTest exten { final CFException ex = new CFException(); final CompletableFutureInc r = new CompletableFutureInc(m); - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.thenCompose(f, r); + final CompletableFuture g = m.thenCompose(f, r); if (createIncomplete) f.completeExceptionally(ex); checkCompletedWithWrappedException(g, ex); @@ -2985,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 f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final FailingCompletableFutureFunction r = new FailingCompletableFutureFunction(m); if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenCompose(f, r); + final CompletableFuture g = m.thenCompose(f, r); if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedWithWrappedException(g, r.ex); @@ -3006,10 +3088,10 @@ public class CompletableFutureTest exten for (boolean createIncomplete : new boolean[] { true, false }) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { - final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture f = new CompletableFuture<>(); final CompletableFutureInc r = new CompletableFutureInc(m); if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.thenCompose(f, r); + final CompletableFuture g = m.thenCompose(f, r); if (createIncomplete) { checkIncomplete(g); assertTrue(f.cancel(mayInterruptIfRunning)); @@ -3025,41 +3107,41 @@ 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 f = new CompletableFuture<>(); - final CompletableFuture g = new CompletableFuture<>(); - final CompletableFuture h; + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture h; // Test all permutations of orders switch (order) { case 0: assertTrue(f.complete(v1)); assertTrue(g.completeExceptionally(ex)); - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); break; case 1: assertTrue(f.complete(v1)); - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); assertTrue(g.completeExceptionally(ex)); break; case 2: assertTrue(g.completeExceptionally(ex)); assertTrue(f.complete(v1)); - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); break; case 3: assertTrue(g.completeExceptionally(ex)); - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); assertTrue(f.complete(v1)); break; case 4: - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); assertTrue(f.complete(v1)); assertTrue(g.completeExceptionally(ex)); break; case 5: - h = m.thenCompose(f, (x -> g)); + h = m.thenCompose(f, x -> g); assertTrue(f.complete(v1)); assertTrue(g.completeExceptionally(ex)); break; @@ -3071,6 +3153,121 @@ public class CompletableFutureTest exten checkCompletedNormally(f, v1); }} + /** + * exceptionallyCompose result completes normally after normal + * completion of source + */ + public void testExceptionallyCompose_normalCompletion() { + for (ExecutionMode m : ExecutionMode.values()) + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final CompletableFuture f = new CompletableFuture<>(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(m); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletableFuture g = m.exceptionallyCompose(f, r); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(f, v1); + checkCompletedNormally(g, v1); + r.assertNotInvoked(); + }} + + /** + * exceptionallyCompose result completes normally after exceptional + * completion of source + */ + public void testExceptionallyCompose_exceptionalCompletion() { + for (ExecutionMode m : ExecutionMode.values()) + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(m); + final CompletableFuture f = new CompletableFuture<>(); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletableFuture g = m.exceptionallyCompose(f, r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedNormally(g, r.value); + r.assertInvoked(); + }} + + /** + * exceptionallyCompose completes exceptionally on exception if action does + */ + public void testExceptionallyCompose_actionFailed() { + for (ExecutionMode m : ExecutionMode.values()) + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final FailingExceptionalCompletableFutureFunction r + = new FailingExceptionalCompletableFutureFunction(m); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletableFuture g = m.exceptionallyCompose(f, r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedWithWrappedException(g, r.ex); + r.assertInvoked(); + }} + + /** + * exceptionallyCompose result completes exceptionally if the + * result of the action does + */ + public void testExceptionallyCompose_actionReturnsFailingFuture() { + for (ExecutionMode m : ExecutionMode.values()) + for (int order = 0; order < 6; order++) + { + final CFException ex0 = new CFException(); + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final CompletableFuture g = new CompletableFuture<>(); + final CompletableFuture h; + // Test all permutations of orders + switch (order) { + case 0: + assertTrue(f.completeExceptionally(ex0)); + assertTrue(g.completeExceptionally(ex)); + h = m.exceptionallyCompose(f, x -> g); + break; + case 1: + assertTrue(f.completeExceptionally(ex0)); + h = m.exceptionallyCompose(f, x -> g); + assertTrue(g.completeExceptionally(ex)); + break; + case 2: + assertTrue(g.completeExceptionally(ex)); + assertTrue(f.completeExceptionally(ex0)); + h = m.exceptionallyCompose(f, x -> g); + break; + case 3: + assertTrue(g.completeExceptionally(ex)); + h = m.exceptionallyCompose(f, x -> g); + assertTrue(f.completeExceptionally(ex0)); + break; + case 4: + h = m.exceptionallyCompose(f, x -> g); + assertTrue(f.completeExceptionally(ex0)); + assertTrue(g.completeExceptionally(ex)); + break; + case 5: + h = m.exceptionallyCompose(f, x -> g); + assertTrue(f.completeExceptionally(ex0)); + assertTrue(g.completeExceptionally(ex)); + break; + default: throw new AssertionError(); + } + + checkCompletedExceptionally(g, ex); + checkCompletedWithWrappedException(h, ex); + checkCompletedExceptionally(f, ex0); + }} + // other static methods /** @@ -3088,8 +3285,9 @@ public class CompletableFutureTest exten */ public void testAllOf_normal() throws Exception { for (int k = 1; k < 10; k++) { - CompletableFuture[] fs - = (CompletableFuture[]) new CompletableFuture[k]; + @SuppressWarnings("unchecked") + CompletableFuture[] fs + = (CompletableFuture[]) new CompletableFuture[k]; for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture f = CompletableFuture.allOf(fs); @@ -3105,8 +3303,9 @@ public class CompletableFutureTest exten public void testAllOf_normal_backwards() throws Exception { for (int k = 1; k < 10; k++) { - CompletableFuture[] fs - = (CompletableFuture[]) new CompletableFuture[k]; + @SuppressWarnings("unchecked") + CompletableFuture[] fs + = (CompletableFuture[]) new CompletableFuture[k]; for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture f = CompletableFuture.allOf(fs); @@ -3122,18 +3321,20 @@ public class CompletableFutureTest exten public void testAllOf_exceptional() throws Exception { for (int k = 1; k < 10; k++) { - CompletableFuture[] fs - = (CompletableFuture[]) new CompletableFuture[k]; + @SuppressWarnings("unchecked") + CompletableFuture[] fs + = (CompletableFuture[]) new CompletableFuture[k]; CFException ex = new CFException(); for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture 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); @@ -3148,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 f = CompletableFuture.anyOf(); checkIncomplete(f); @@ -3163,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[] fs = + (CompletableFuture[])new CompletableFuture[k]; for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture 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[] fs = + (CompletableFuture[])new CompletableFuture[k]; for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture 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); } } } @@ -3197,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[] fs = + (CompletableFuture[])new CompletableFuture[k]; CFException[] exs = new CFException[k]; for (int i = 0; i < k; i++) { fs[i] = new CompletableFuture<>(); @@ -3215,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[] fs = + (CompletableFuture[])new CompletableFuture[k]; CFException[] exs = new CFException[k]; for (int i = 0; i < k; i++) { fs[i] = new CompletableFuture<>(); @@ -3236,15 +3445,17 @@ public class CompletableFutureTest exten */ @SuppressWarnings("FutureReturnValueIgnored") public void testNPE() { - CompletableFuture f = new CompletableFuture<>(); - CompletableFuture g = new CompletableFuture<>(); - CompletableFuture nullFuture = (CompletableFuture)null; + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture g = new CompletableFuture<>(); + CompletableFuture nullFuture = (CompletableFuture)null; ThreadExecutor exec = new ThreadExecutor(); - Runnable[] throwingActions = { + assertThrows( + NullPointerException.class, + () -> 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), @@ -3341,34 +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), - }; + () -> CompletableFuture.failedStage(null)); - assertThrows(NullPointerException.class, throwingActions); - 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 complete = CompletableFuture.completedFuture(v); - final CompletableFuture incomplete = new CompletableFuture<>(); + final CompletableFuture complete = CompletableFuture.completedFuture(v); + final CompletableFuture incomplete = new CompletableFuture<>(); List> futures = new ArrayList<>(); - List> srcs = new ArrayList<>(); + List> srcs = new ArrayList<>(); srcs.add(complete); srcs.add(incomplete); - for (CompletableFuture src : srcs) { + for (CompletableFuture src : srcs) { List> fs = new ArrayList<>(); fs.add(src.thenRunAsync(() -> {}, e)); fs.add(src.thenAcceptAsync(z -> {}, e)); @@ -3434,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()); }} /** @@ -3443,18 +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 complete = CompletableFuture.completedFuture(v); - final CompletableFuture incomplete = new CompletableFuture<>(); - - List> futures = new ArrayList<>(); - - List> srcs = new ArrayList<>(); - srcs.add(complete); - srcs.add(incomplete); + final CompletableFuture complete = CompletableFuture.completedFuture(v); + final CompletableFuture incomplete = new CompletableFuture<>(); List> fs = new ArrayList<>(); fs.add(incomplete.thenRunAsync(() -> {}, e)); @@ -3493,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 f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); assertSame(f, f.toCompletableFuture()); } @@ -3510,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 f = new CompletableFuture<>(); - CompletableFuture g = f.newIncompleteFuture(); + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture g = f.newIncompleteFuture(); checkIncomplete(f); checkIncomplete(g); f.complete(v1); @@ -3530,9 +3733,9 @@ public class CompletableFutureTest exten public void testCompletedStage() { AtomicInteger x = new AtomicInteger(0); AtomicReference r = new AtomicReference<>(); - CompletionStage f = CompletableFuture.completedStage(1); - f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);}); - assertEquals(x.get(), 1); + CompletionStage 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()); } @@ -3541,7 +3744,7 @@ public class CompletableFutureTest exten * it supports more than one thread. */ public void testDefaultExecutor() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); Executor e = f.defaultExecutor(); Executor c = ForkJoinPool.commonPool(); if (ForkJoinPool.getCommonPoolParallelism() > 1) @@ -3556,31 +3759,21 @@ public class CompletableFutureTest exten */ public void testFailedFuture() { CFException ex = new CFException(); - CompletableFuture f = CompletableFuture.failedFuture(ex); + CompletableFuture f = CompletableFuture.failedFuture(ex); checkCompletedExceptionally(f, ex); } /** - * failedFuture(null) throws NPE - */ - public void testFailedFuture_null() { - try { - CompletableFuture f = CompletableFuture.failedFuture(null); - shouldThrow(); - } catch (NullPointerException success) {} - } - - /** * copy returns a CompletableFuture that is completed normally, * with the same value, when source is. */ 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 f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.complete(v1)); - CompletableFuture g = f.copy(); + CompletableFuture g = f.copy(); if (createIncomplete) { checkIncomplete(f); checkIncomplete(g); @@ -3598,9 +3791,9 @@ public class CompletableFutureTest exten for (boolean createIncomplete : new boolean[] { true, false }) { CFException ex = new CFException(); - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) f.completeExceptionally(ex); - CompletableFuture g = f.copy(); + CompletableFuture g = f.copy(); if (createIncomplete) { checkIncomplete(f); checkIncomplete(g); @@ -3614,8 +3807,8 @@ public class CompletableFutureTest exten * Completion of a copy does not complete its source. */ public void testCopy_oneWayPropagation() { - CompletableFuture f = new CompletableFuture<>(); - assertTrue(f.copy().complete(1)); + CompletableFuture f = new CompletableFuture<>(); + assertTrue(f.copy().complete(one)); assertTrue(f.copy().complete(null)); assertTrue(f.copy().cancel(true)); assertTrue(f.copy().cancel(false)); @@ -3628,15 +3821,15 @@ public class CompletableFutureTest exten * completed normally, with the same value, when source is. */ public void testMinimalCompletionStage() { - CompletableFuture f = new CompletableFuture<>(); - CompletionStage g = f.minimalCompletionStage(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage g = f.minimalCompletionStage(); AtomicInteger x = new AtomicInteger(0); AtomicReference 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()); } @@ -3645,17 +3838,17 @@ public class CompletableFutureTest exten * completed exceptionally when source is. */ public void testMinimalCompletionStage2() { - CompletableFuture f = new CompletableFuture<>(); - CompletionStage g = f.minimalCompletionStage(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage g = f.minimalCompletionStage(); AtomicInteger x = new AtomicInteger(0); AtomicReference 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); } /** @@ -3664,21 +3857,21 @@ public class CompletableFutureTest exten */ public void testFailedStage() { CFException ex = new CFException(); - CompletionStage f = CompletableFuture.failedStage(ex); + CompletionStage f = CompletableFuture.failedStage(ex); AtomicInteger x = new AtomicInteger(0); AtomicReference 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 f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); f.completeAsync(() -> v1); f.join(); checkCompletedNormally(f, v1); @@ -3688,7 +3881,7 @@ public class CompletableFutureTest exten * completeAsync completes exceptionally if given supplier throws */ public void testCompleteAsync2() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); CFException ex = new CFException(); f.completeAsync(() -> { throw ex; }); try { @@ -3702,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 f = new CompletableFuture<>(); + CompletableFuture 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()); }} /** @@ -3717,7 +3910,7 @@ public class CompletableFutureTest exten * given supplier throws */ public void testCompleteAsync4() { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); CFException ex = new CFException(); ThreadExecutor executor = new ThreadExecutor(); f.completeAsync(() -> { throw ex; }, executor); @@ -3726,7 +3919,7 @@ public class CompletableFutureTest exten shouldThrow(); } catch (CompletionException success) {} checkCompletedWithWrappedException(f, ex); - assertEquals(1, executor.count.get()); + mustEqual(1, executor.count.get()); } /** @@ -3734,7 +3927,7 @@ public class CompletableFutureTest exten */ public void testOrTimeout_timesOut() { long timeoutMillis = timeoutMillis(); - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); long startTime = System.nanoTime(); assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS)); checkCompletedWithTimeoutException(f); @@ -3745,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 f = new CompletableFuture<>(); - CompletableFuture g = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture g = new CompletableFuture<>(); long startTime = System.nanoTime(); f.complete(v1); assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS)); @@ -3763,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 f = new CompletableFuture<>(); + CompletableFuture 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); } @@ -3785,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 f = new CompletableFuture<>(); - CompletableFuture g = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture 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); @@ -3804,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; @@ -3822,9 +4015,9 @@ public class CompletableFutureTest exten longDelayer = CompletableFuture.delayedExecutor(longTimeoutMillis, MILLISECONDS, executor); } long startTime = System.nanoTime(); - CompletableFuture f = + CompletableFuture f = CompletableFuture.supplyAsync(() -> v, delayer); - CompletableFuture g = + CompletableFuture g = CompletableFuture.supplyAsync(() -> v, longDelayer); assertNull(g.getNow(null)); @@ -3842,6 +4035,7 @@ public class CompletableFutureTest exten //--- tests of implementation details; not part of official tck --- + @SuppressWarnings("removal") Object resultOf(CompletableFuture f) { SecurityManager sm = System.getSecurityManager(); if (sm != null) { @@ -3869,14 +4063,14 @@ public class CompletableFutureTest exten for (ExecutionMode m : ExecutionMode.values()) { final CFException ex = new CFException(); - final CompletableFuture v42 = CompletableFuture.completedFuture(42); - final CompletableFuture incomplete = new CompletableFuture<>(); + final CompletableFuture v42 = CompletableFuture.completedFuture(fortytwo); + final CompletableFuture incomplete = new CompletableFuture<>(); final Runnable noopRunnable = new Noop(m); - final Consumer noopConsumer = new NoopConsumer(m); - final Function incFunction = new IncFunction(m); + final Consumer noopConsumer = new NoopConsumer(m); + final Function incFunction = new IncFunction(m); - List, CompletableFuture>> funs + List, CompletableFuture>> funs = new ArrayList<>(); funs.add(y -> m.thenRun(y, noopRunnable)); @@ -3894,7 +4088,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))); @@ -3905,21 +4099,21 @@ public class CompletableFutureTest exten funs.add(y -> CompletableFuture.anyOf(y, incomplete)); funs.add(y -> CompletableFuture.anyOf(incomplete, y)); - for (Function, CompletableFuture> + for (Function, CompletableFuture> fun : funs) { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); f.completeExceptionally(ex); - CompletableFuture src = m.thenApply(f, incFunction); + CompletableFuture src = m.thenApply(f, incFunction); checkCompletedWithWrappedException(src, ex); CompletableFuture dep = fun.apply(src); checkCompletedWithWrappedException(dep, ex); assertSame(resultOf(src), resultOf(dep)); } - for (Function, CompletableFuture> + for (Function, CompletableFuture> fun : funs) { - CompletableFuture f = new CompletableFuture<>(); - CompletableFuture src = m.thenApply(f, incFunction); + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture src = m.thenApply(f, incFunction); CompletableFuture dep = fun.apply(src); f.completeExceptionally(ex); checkCompletedWithWrappedException(src, ex); @@ -3928,12 +4122,12 @@ public class CompletableFutureTest exten } for (boolean mayInterruptIfRunning : new boolean[] { true, false }) - for (Function, CompletableFuture> + for (Function, CompletableFuture> fun : funs) { - CompletableFuture f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); f.cancel(mayInterruptIfRunning); checkCancelled(f); - CompletableFuture src = m.thenApply(f, incFunction); + CompletableFuture src = m.thenApply(f, incFunction); checkCompletedWithWrappedCancellationException(src); CompletableFuture dep = fun.apply(src); checkCompletedWithWrappedCancellationException(dep); @@ -3941,10 +4135,10 @@ public class CompletableFutureTest exten } for (boolean mayInterruptIfRunning : new boolean[] { true, false }) - for (Function, CompletableFuture> + for (Function, CompletableFuture> fun : funs) { - CompletableFuture f = new CompletableFuture<>(); - CompletableFuture src = m.thenApply(f, incFunction); + CompletableFuture f = new CompletableFuture<>(); + CompletableFuture src = m.thenApply(f, incFunction); CompletableFuture dep = fun.apply(src); f.cancel(mayInterruptIfRunning); checkCancelled(f); @@ -3984,12 +4178,12 @@ public class CompletableFutureTest exten .filter(method -> !permittedMethodSignatures.contains(toSignature.apply(method))) .collect(Collectors.toList()); - List> stages = new ArrayList<>(); - CompletionStage min = - new CompletableFuture().minimalCompletionStage(); + List> stages = new ArrayList<>(); + CompletionStage min = + new CompletableFuture().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 bugs = new ArrayList<>(); @@ -3999,14 +4193,11 @@ public class CompletableFutureTest exten // Manufacture boxed primitives for primitive params for (int i = 0; i < args.length; i++) { Class type = parameterTypes[i]; - if (parameterTypes[i] == boolean.class) - args[i] = false; - else if (parameterTypes[i] == int.class) - args[i] = 0; - else if (parameterTypes[i] == long.class) - args[i] = 0L; + if (type == boolean.class) args[i] = false; + else if (type == int.class) args[i] = 0; + else if (type == long.class) args[i] = 0L; } - for (CompletionStage stage : stages) { + for (CompletionStage stage : stages) { try { method.invoke(stage, args); bugs.add(method); @@ -4030,12 +4221,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 f = new CompletableFuture<>(); - CompletionStage minimal = f.minimalCompletionStage(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage minimal = f.minimalCompletionStage(); if (!createIncomplete) assertTrue(f.complete(v1)); - CompletableFuture g = minimal.toCompletableFuture(); + CompletableFuture g = minimal.toCompletableFuture(); if (createIncomplete) { checkIncomplete(f); checkIncomplete(g); @@ -4053,10 +4244,10 @@ public class CompletableFutureTest exten for (boolean createIncomplete : new boolean[] { true, false }) { CFException ex = new CFException(); - CompletableFuture f = new CompletableFuture<>(); - CompletionStage minimal = f.minimalCompletionStage(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage minimal = f.minimalCompletionStage(); if (!createIncomplete) f.completeExceptionally(ex); - CompletableFuture g = minimal.toCompletableFuture(); + CompletableFuture g = minimal.toCompletableFuture(); if (createIncomplete) { checkIncomplete(f); checkIncomplete(g); @@ -4070,11 +4261,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 f = new CompletableFuture<>(); - CompletionStage minimal = f.minimalCompletionStage(); - CompletableFuture g = minimal.toCompletableFuture(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage minimal = f.minimalCompletionStage(); + CompletableFuture g = minimal.toCompletableFuture(); assertTrue(g.complete(v1)); checkCompletedNormally(g, v1); checkIncomplete(f); @@ -4086,14 +4277,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 f = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); if (!createIncomplete) assertTrue(f.complete(v1)); - CompletionStage minimal = f.minimalCompletionStage(); + CompletionStage 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); }} @@ -4102,16 +4293,16 @@ public class CompletableFutureTest exten * does not complete its source. */ public void testMinimalCompletionStage_toCompletableFuture_oneWayPropagation() { - CompletableFuture f = new CompletableFuture<>(); - CompletionStage g = f.minimalCompletionStage(); - assertTrue(g.toCompletableFuture().complete(1)); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage 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 */ @@ -4135,18 +4326,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 f = new CompletableFuture<>(); - CompletionStage minimal = f.minimalCompletionStage(); - CompletableFuture g = new CompletableFuture<>(); + CompletableFuture f = new CompletableFuture<>(); + CompletionStage minimal = f.minimalCompletionStage(); + CompletableFuture 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 { @@ -4171,7 +4362,7 @@ public class CompletableFutureTest exten static void assertZero(CompletableFuture f) { try { f.getNow(null); - throw new AssertionFailedError("should throw"); + throw new AssertionError("should throw"); } catch (CompletionException success) { assertTrue(success.getCause() instanceof ZeroException); } @@ -4193,7 +4384,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 extends CompletableFuture { @@ -4296,30 +4487,32 @@ public class CompletableFutureTest exten } /** Test long recursive chains of CompletableFutures with cascading completions */ + @SuppressWarnings("FutureReturnValueIgnored") public void testRecursiveChains() throws Throwable { for (ExecutionMode m : ExecutionMode.values()) for (boolean addDeadEnds : new boolean[] { true, false }) { final int val = 42; final int n = expensiveTests ? 1_000 : 2; - CompletableFuture head = new CompletableFuture<>(); - CompletableFuture tail = head; + CompletableFuture head = new CompletableFuture<>(); + CompletableFuture 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()); }} /** * A single CompletableFuture with many dependents. * A demo of scalability - runtime is O(n). */ + @SuppressWarnings("FutureReturnValueIgnored") public void testManyDependents() throws Throwable { final int n = expensiveTests ? 1_000_000 : 10; final CompletableFuture head = new CompletableFuture<>(); @@ -4345,14 +4538,15 @@ public class CompletableFutureTest exten new CompletableFuture().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 incomplete = new CompletableFuture<>(); - CompletableFuture f; + final CompletableFuture incomplete = new CompletableFuture<>(); + CompletableFuture f; for (int i = 0; i < n; i++) { f = new CompletableFuture<>(); f.runAfterEither(incomplete, () -> {}); @@ -4367,7 +4561,7 @@ public class CompletableFutureTest exten f.complete(null); f = new CompletableFuture<>(); - CompletableFuture.anyOf(new CompletableFuture[] { f, incomplete }); + CompletableFuture.anyOf(f, incomplete); f.complete(null); } @@ -4385,7 +4579,7 @@ public class CompletableFutureTest exten f.complete(null); f = new CompletableFuture<>(); - CompletableFuture.anyOf(new CompletableFuture[] { incomplete, f }); + CompletableFuture.anyOf(incomplete, f); f.complete(null); } } @@ -4396,11 +4590,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[] fs - = (CompletableFuture[]) new CompletableFuture[100]; + @SuppressWarnings("unchecked") + CompletableFuture[] fs = + (CompletableFuture[])new CompletableFuture[100]; for (int i = 0; i < fs.length; i++) fs[i] = new CompletableFuture<>(); fs[fs.length - 1].complete(v); @@ -4416,8 +4611,9 @@ public class CompletableFutureTest exten */ public void testCancelledAllOfGarbageRetention() throws Throwable { final int n = expensiveTests ? 100_000 : 10; - CompletableFuture[] fs - = (CompletableFuture[]) new CompletableFuture[100]; + @SuppressWarnings("unchecked") + CompletableFuture[] fs + = (CompletableFuture[]) new CompletableFuture[100]; for (int i = 0; i < fs.length; i++) fs[i] = new CompletableFuture<>(); for (int i = 0; i < n; i++) @@ -4434,7 +4630,7 @@ public class CompletableFutureTest exten */ public void testCancelledGarbageRetention() throws Throwable { final int n = expensiveTests ? 100_000 : 10; - CompletableFuture neverCompleted = new CompletableFuture<>(); + CompletableFuture neverCompleted = new CompletableFuture<>(); for (int i = 0; i < n; i++) assertTrue(neverCompleted.thenRun(() -> {}).cancel(true)); } @@ -4449,8 +4645,8 @@ public class CompletableFutureTest exten */ public void testToCompletableFutureGarbageRetention() throws Throwable { final int n = expensiveTests ? 900_000 : 10; - CompletableFuture neverCompleted = new CompletableFuture<>(); - CompletionStage minimal = neverCompleted.minimalCompletionStage(); + CompletableFuture neverCompleted = new CompletableFuture<>(); + CompletionStage minimal = neverCompleted.minimalCompletionStage(); for (int i = 0; i < n; i++) assertTrue(minimal.toCompletableFuture().cancel(true)); } @@ -4479,4 +4675,433 @@ public class CompletableFutureTest exten // return stage.toCompletableFuture().copy().isDone(); // } + // For testing default implementations + // Only non-default interface methods defined. + static final class DelegatedCompletionStage implements CompletionStage { + final CompletableFuture cf; + DelegatedCompletionStage(CompletableFuture cf) { this.cf = cf; } + public CompletableFuture toCompletableFuture() { + return cf; } + public CompletionStage thenRun + (Runnable action) { + return cf.thenRun(action); } + public CompletionStage thenRunAsync + (Runnable action) { + return cf.thenRunAsync(action); } + public CompletionStage thenRunAsync + (Runnable action, + Executor executor) { + return cf.thenRunAsync(action, executor); } + public CompletionStage thenAccept + (Consumer action) { + return cf.thenAccept(action); } + public CompletionStage thenAcceptAsync + (Consumer action) { + return cf.thenAcceptAsync(action); } + public CompletionStage thenAcceptAsync + (Consumer action, + Executor executor) { + return cf.thenAcceptAsync(action, executor); } + public CompletionStage thenApply + (Function a) { + return cf.thenApply(a); } + public CompletionStage thenApplyAsync + (Function fn) { + return cf.thenApplyAsync(fn); } + public CompletionStage thenApplyAsync + (Function fn, + Executor executor) { + return cf.thenApplyAsync(fn, executor); } + public CompletionStage thenCombine + (CompletionStage other, + BiFunction fn) { + return cf.thenCombine(other, fn); } + public CompletionStage thenCombineAsync + (CompletionStage other, + BiFunction fn) { + return cf.thenCombineAsync(other, fn); } + public CompletionStage thenCombineAsync + (CompletionStage other, + BiFunction fn, + Executor executor) { + return cf.thenCombineAsync(other, fn, executor); } + public CompletionStage thenAcceptBoth + (CompletionStage other, + BiConsumer action) { + return cf.thenAcceptBoth(other, action); } + public CompletionStage thenAcceptBothAsync + (CompletionStage other, + BiConsumer action) { + return cf.thenAcceptBothAsync(other, action); } + public CompletionStage thenAcceptBothAsync + (CompletionStage other, + BiConsumer action, + Executor executor) { + return cf.thenAcceptBothAsync(other, action, executor); } + public CompletionStage runAfterBoth + (CompletionStage other, + Runnable action) { + return cf.runAfterBoth(other, action); } + public CompletionStage runAfterBothAsync + (CompletionStage other, + Runnable action) { + return cf.runAfterBothAsync(other, action); } + public CompletionStage runAfterBothAsync + (CompletionStage other, + Runnable action, + Executor executor) { + return cf.runAfterBothAsync(other, action, executor); } + public CompletionStage applyToEither + (CompletionStage other, + Function fn) { + return cf.applyToEither(other, fn); } + public CompletionStage applyToEitherAsync + (CompletionStage other, + Function fn) { + return cf.applyToEitherAsync(other, fn); } + public CompletionStage applyToEitherAsync + (CompletionStage other, + Function fn, + Executor executor) { + return cf.applyToEitherAsync(other, fn, executor); } + public CompletionStage acceptEither + (CompletionStage other, + Consumer action) { + return cf.acceptEither(other, action); } + public CompletionStage acceptEitherAsync + (CompletionStage other, + Consumer action) { + return cf.acceptEitherAsync(other, action); } + public CompletionStage acceptEitherAsync + (CompletionStage other, + Consumer action, + Executor executor) { + return cf.acceptEitherAsync(other, action, executor); } + public CompletionStage runAfterEither + (CompletionStage other, + Runnable action) { + return cf.runAfterEither(other, action); } + public CompletionStage runAfterEitherAsync + (CompletionStage other, + Runnable action) { + return cf.runAfterEitherAsync(other, action); } + public CompletionStage runAfterEitherAsync + (CompletionStage other, + Runnable action, + Executor executor) { + return cf.runAfterEitherAsync(other, action, executor); } + public CompletionStage thenCompose + (Function> fn) { + return cf.thenCompose(fn); } + public CompletionStage thenComposeAsync + (Function> fn) { + return cf.thenComposeAsync(fn); } + public CompletionStage thenComposeAsync + (Function> fn, + Executor executor) { + return cf.thenComposeAsync(fn, executor); } + public CompletionStage handle + (BiFunction fn) { + return cf.handle(fn); } + public CompletionStage handleAsync + (BiFunction fn) { + return cf.handleAsync(fn); } + public CompletionStage handleAsync + (BiFunction fn, + Executor executor) { + return cf.handleAsync(fn, executor); } + public CompletionStage whenComplete + (BiConsumer action) { + return cf.whenComplete(action); } + public CompletionStage whenCompleteAsync + (BiConsumer action) { + return cf.whenCompleteAsync(action); } + public CompletionStage whenCompleteAsync + (BiConsumer action, + Executor executor) { + return cf.whenCompleteAsync(action, executor); } + public CompletionStage exceptionally + (Function fn) { + return cf.exceptionally(fn); } + } + + /** + * default-implemented exceptionallyAsync action is not invoked when + * source completes normally, and source result is propagated + */ + public void testDefaultExceptionallyAsync_normalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final AtomicInteger ran = new AtomicInteger(0); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletionStage g = d.exceptionallyAsync + ((Throwable t) -> { + ran.getAndIncrement(); + throw new AssertionError("should not be called"); + }); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(g.toCompletableFuture(), v1); + checkCompletedNormally(f, v1); + mustEqual(0, ran.get()); + }} + + /** + * default-implemented exceptionallyAsync action completes with + * function value on source exception + */ + public void testDefaultExceptionallyAsync_exceptionalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final AtomicInteger ran = new AtomicInteger(0); + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyAsync + ((Throwable t) -> { + assertSame(t, ex); + ran.getAndIncrement(); + return v1; + }); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedNormally(g.toCompletableFuture(), v1); + checkCompletedExceptionally(f, ex); + mustEqual(1, ran.get()); + }} + + /** + * Under default implementation, if an "exceptionally action" + * throws an exception, it completes exceptionally with that + * exception + */ + public void testDefaultExceptionallyAsync_exceptionalCompletionActionFailed() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final AtomicInteger ran = new AtomicInteger(0); + final CFException ex1 = new CFException(); + final CFException ex2 = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex1); + final CompletionStage g = d.exceptionallyAsync + ((Throwable t) -> { + assertSame(t, ex1); + ran.getAndIncrement(); + throw ex2; + }); + if (createIncomplete) f.completeExceptionally(ex1); + + checkCompletedWithWrappedException(g.toCompletableFuture(), ex2); + checkCompletedExceptionally(f, ex1); + checkCompletedExceptionally(d.toCompletableFuture(), ex1); + mustEqual(1, ran.get()); + }} + + /** + * default-implemented exceptionallyCompose result completes + * normally after normal completion of source + */ + public void testDefaultExceptionallyCompose_normalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final CompletableFuture f = new CompletableFuture<>(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletionStage g = d.exceptionallyCompose(r); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(f, v1); + checkCompletedNormally(g.toCompletableFuture(), v1); + r.assertNotInvoked(); + }} + + /** + * default-implemented exceptionallyCompose result completes + * normally after exceptional completion of source + */ + public void testDefaultExceptionallyCompose_exceptionalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.SYNC); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyCompose(r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedNormally(g.toCompletableFuture(), r.value); + r.assertInvoked(); + }} + + /** + * default-implemented exceptionallyCompose completes + * exceptionally on exception if action does + */ + public void testDefaultExceptionallyCompose_actionFailed() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final FailingExceptionalCompletableFutureFunction r + = new FailingExceptionalCompletableFutureFunction(ExecutionMode.SYNC); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyCompose(r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex); + r.assertInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync result completes + * normally after normal completion of source + */ + public void testDefaultExceptionallyComposeAsync_normalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final CompletableFuture f = new CompletableFuture<>(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletionStage g = d.exceptionallyComposeAsync(r); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(f, v1); + checkCompletedNormally(g.toCompletableFuture(), v1); + r.assertNotInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync result completes + * normally after exceptional completion of source + */ + public void testDefaultExceptionallyComposeAsync_exceptionalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.ASYNC); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyComposeAsync(r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedNormally(g.toCompletableFuture(), r.value); + r.assertInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync completes + * exceptionally on exception if action does + */ + public void testDefaultExceptionallyComposeAsync_actionFailed() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final FailingExceptionalCompletableFutureFunction r + = new FailingExceptionalCompletableFutureFunction(ExecutionMode.ASYNC); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyComposeAsync(r); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex); + r.assertInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync result completes + * normally after normal completion of source + */ + public void testDefaultExceptionallyComposeAsyncExecutor_normalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + for (Item v1 : new Item[] { one, null }) + { + final CompletableFuture f = new CompletableFuture<>(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletionStage g = d.exceptionallyComposeAsync(r, new ThreadExecutor()); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(f, v1); + checkCompletedNormally(g.toCompletableFuture(), v1); + r.assertNotInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync result completes + * normally after exceptional completion of source + */ + public void testDefaultExceptionallyComposeAsyncExecutor_exceptionalCompletion() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final ExceptionalCompletableFutureFunction r = + new ExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR); + final CompletableFuture f = new CompletableFuture<>(); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyComposeAsync(r, new ThreadExecutor()); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedNormally(g.toCompletableFuture(), r.value); + r.assertInvoked(); + }} + + /** + * default-implemented exceptionallyComposeAsync completes + * exceptionally on exception if action does + */ + public void testDefaultExceptionallyComposeAsyncExecutor_actionFailed() { + for (boolean createIncomplete : new boolean[] { true, false }) + { + final CFException ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + final FailingExceptionalCompletableFutureFunction r + = new FailingExceptionalCompletableFutureFunction(ExecutionMode.EXECUTOR); + final DelegatedCompletionStage d = + new DelegatedCompletionStage<>(f); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletionStage g = d.exceptionallyComposeAsync(r, new ThreadExecutor()); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedExceptionally(f, ex); + checkCompletedWithWrappedException(g.toCompletableFuture(), r.ex); + r.assertInvoked(); + }} + }