--- jsr166/src/test/tck/CompletableFutureTest.java 2014/06/16 20:20:08 1.84 +++ jsr166/src/test/tck/CompletableFutureTest.java 2015/02/22 04:34:44 1.101 @@ -5,30 +5,31 @@ * http://creativecommons.org/publicdomain/zero/1.0/ */ -import junit.framework.*; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; + +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; import java.util.concurrent.Callable; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.CancellationException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionException; import java.util.concurrent.CompletionStage; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Executor; import java.util.concurrent.ForkJoinPool; import java.util.concurrent.ForkJoinTask; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.TimeUnit.SECONDS; -import java.util.*; -import java.util.function.Supplier; -import java.util.function.Consumer; import java.util.function.BiConsumer; -import java.util.function.Function; import java.util.function.BiFunction; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; + +import junit.framework.Test; +import junit.framework.TestSuite; public class CompletableFutureTest extends JSR166TestCase { @@ -57,9 +58,8 @@ public class CompletableFutureTest exten } void checkCompletedNormally(CompletableFuture f, T value) { - try { - assertEquals(value, f.get(LONG_DELAY_MS, MILLISECONDS)); - } catch (Throwable fail) { threadUnexpectedException(fail); } + checkTimedGet(f, value); + try { assertEquals(value, f.join()); } catch (Throwable fail) { threadUnexpectedException(fail); } @@ -76,12 +76,16 @@ public class CompletableFutureTest exten } void checkCompletedWithWrappedCFException(CompletableFuture f) { + long startTime = System.nanoTime(); + long timeoutMillis = LONG_DELAY_MS; try { - f.get(LONG_DELAY_MS, MILLISECONDS); + f.get(timeoutMillis, MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { assertTrue(success.getCause() instanceof CFException); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertTrue(millisElapsedSince(startTime) < timeoutMillis/2); + try { f.join(); shouldThrow(); @@ -107,12 +111,16 @@ public class CompletableFutureTest exten void checkCompletedExceptionallyWithRootCause(CompletableFuture f, Throwable ex) { + long startTime = System.nanoTime(); + long timeoutMillis = LONG_DELAY_MS; try { - f.get(LONG_DELAY_MS, MILLISECONDS); + f.get(timeoutMillis, MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { assertSame(ex, success.getCause()); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertTrue(millisElapsedSince(startTime) < timeoutMillis/2); + try { f.join(); shouldThrow(); @@ -158,11 +166,15 @@ public class CompletableFutureTest exten } void checkCancelled(CompletableFuture f) { + long startTime = System.nanoTime(); + long timeoutMillis = LONG_DELAY_MS; try { - f.get(LONG_DELAY_MS, MILLISECONDS); + f.get(timeoutMillis, MILLISECONDS); shouldThrow(); } catch (CancellationException success) { } catch (Throwable fail) { threadUnexpectedException(fail); } + assertTrue(millisElapsedSince(startTime) < timeoutMillis/2); + try { f.join(); shouldThrow(); @@ -183,12 +195,16 @@ public class CompletableFutureTest exten } void checkCompletedWithWrappedCancellationException(CompletableFuture f) { + long startTime = System.nanoTime(); + long timeoutMillis = LONG_DELAY_MS; try { - f.get(LONG_DELAY_MS, MILLISECONDS); + f.get(timeoutMillis, MILLISECONDS); shouldThrow(); } catch (ExecutionException success) { assertTrue(success.getCause() instanceof CancellationException); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertTrue(millisElapsedSince(startTime) < timeoutMillis/2); + try { f.join(); shouldThrow(); @@ -257,8 +273,9 @@ public class CompletableFutureTest exten { CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); - assertTrue(f.cancel(true)); - assertTrue(f.cancel(true)); + assertTrue(f.cancel(mayInterruptIfRunning)); + assertTrue(f.cancel(mayInterruptIfRunning)); + assertTrue(f.cancel(!mayInterruptIfRunning)); checkCancelled(f); }} @@ -530,7 +547,6 @@ public class CompletableFutureTest exten } } - class CompletableFutureInc extends CheckedIntegerAction implements Function> { @@ -569,12 +585,15 @@ public class CompletableFutureTest exten } } + static final boolean defaultExecutorIsCommonPool + = ForkJoinPool.getCommonPoolParallelism() > 1; + /** * Permits the testing of parallel code for the 3 different * execution modes without copy/pasting all the test methods. */ enum ExecutionMode { - DEFAULT { + SYNC { public void checkExecutionMode() { assertFalse(ThreadExecutor.startedCurrentThread()); assertNull(ForkJoinTask.getPool()); @@ -650,8 +669,8 @@ public class CompletableFutureTest exten ASYNC { public void checkExecutionMode() { - assertSame(ForkJoinPool.commonPool(), - ForkJoinTask.getPool()); + assertEquals(defaultExecutorIsCommonPool, + (ForkJoinPool.commonPool() == ForkJoinTask.getPool())); } public CompletableFuture runAsync(Runnable a) { return CompletableFuture.runAsync(a); @@ -875,7 +894,7 @@ public class CompletableFutureTest exten if (!createIncomplete) f.completeExceptionally(ex); final CompletableFuture g = f.exceptionally ((Throwable t) -> { - ExecutionMode.DEFAULT.checkExecutionMode(); + ExecutionMode.SYNC.checkExecutionMode(); threadAssertSame(t, ex); a.getAndIncrement(); return v1; @@ -888,7 +907,6 @@ public class CompletableFutureTest exten public void testExceptionally_exceptionalCompletionActionFailed() { for (boolean createIncomplete : new boolean[] { true, false }) - for (Integer v1 : new Integer[] { 1, null }) { final AtomicInteger a = new AtomicInteger(0); final CFException ex1 = new CFException(); @@ -897,7 +915,7 @@ public class CompletableFutureTest exten if (!createIncomplete) f.completeExceptionally(ex1); final CompletableFuture g = f.exceptionally ((Throwable t) -> { - ExecutionMode.DEFAULT.checkExecutionMode(); + ExecutionMode.SYNC.checkExecutionMode(); threadAssertSame(t, ex1); a.getAndIncrement(); throw ex2; @@ -942,7 +960,6 @@ public class CompletableFutureTest exten public void testWhenComplete_exceptionalCompletion() { for (ExecutionMode m : ExecutionMode.values()) for (boolean createIncomplete : new boolean[] { true, false }) - for (Integer v1 : new Integer[] { 1, null }) { final AtomicInteger a = new AtomicInteger(0); final CFException ex = new CFException(); @@ -1027,7 +1044,6 @@ public class CompletableFutureTest exten public void testWhenComplete_actionFailedSourceFailed() { for (boolean createIncomplete : new boolean[] { true, false }) for (ExecutionMode m : ExecutionMode.values()) - for (Integer v1 : new Integer[] { 1, null }) { final AtomicInteger a = new AtomicInteger(0); final CFException ex1 = new CFException(); @@ -1264,21 +1280,31 @@ public class CompletableFutureTest exten */ public void testThenRun_normalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final Noop r = new Noop(m); - if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenRun(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.complete(v1)); - } + final Noop[] rs = new Noop[6]; + for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); - checkCompletedNormally(g, null); + final CompletableFuture h0 = m.thenRun(f, rs[0]); + final CompletableFuture h1 = m.runAfterBoth(f, f, rs[1]); + final CompletableFuture h2 = m.runAfterEither(f, f, rs[2]); + checkIncomplete(h0); + checkIncomplete(h1); + checkIncomplete(h2); + assertTrue(f.complete(v1)); + final CompletableFuture h3 = m.thenRun(f, rs[3]); + final CompletableFuture h4 = m.runAfterBoth(f, f, rs[4]); + final CompletableFuture h5 = m.runAfterEither(f, f, rs[5]); + + checkCompletedNormally(h0, null); + checkCompletedNormally(h1, null); + checkCompletedNormally(h2, null); + checkCompletedNormally(h3, null); + checkCompletedNormally(h4, null); + checkCompletedNormally(h5, null); checkCompletedNormally(f, v1); - r.assertInvoked(); + for (Noop r : rs) r.assertInvoked(); }} /** @@ -1287,21 +1313,31 @@ public class CompletableFutureTest exten */ public void testThenRun_exceptionalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) { final CFException ex = new CFException(); final CompletableFuture f = new CompletableFuture<>(); - final Noop r = new Noop(m); - if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.thenRun(f, r); - if (createIncomplete) { - checkIncomplete(g); - f.completeExceptionally(ex); - } + final Noop[] rs = new Noop[6]; + for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); - checkCompletedWithWrappedException(g, ex); + final CompletableFuture h0 = m.thenRun(f, rs[0]); + final CompletableFuture h1 = m.runAfterBoth(f, f, rs[1]); + final CompletableFuture h2 = m.runAfterEither(f, f, rs[2]); + checkIncomplete(h0); + checkIncomplete(h1); + checkIncomplete(h2); + assertTrue(f.completeExceptionally(ex)); + final CompletableFuture h3 = m.thenRun(f, rs[3]); + final CompletableFuture h4 = m.runAfterBoth(f, f, rs[4]); + final CompletableFuture h5 = m.runAfterEither(f, f, rs[5]); + + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); + checkCompletedWithWrappedException(h4, ex); + checkCompletedWithWrappedException(h5, ex); checkCompletedExceptionally(f, ex); - r.assertNotInvoked(); + for (Noop r : rs) r.assertNotInvoked(); }} /** @@ -1309,21 +1345,31 @@ public class CompletableFutureTest exten */ public void testThenRun_sourceCancelled() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { final CompletableFuture f = new CompletableFuture<>(); - final Noop r = new Noop(m); - if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.thenRun(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.cancel(mayInterruptIfRunning)); - } + final Noop[] rs = new Noop[6]; + for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); - checkCompletedWithWrappedCancellationException(g); + final CompletableFuture h0 = m.thenRun(f, rs[0]); + final CompletableFuture h1 = m.runAfterBoth(f, f, rs[1]); + final CompletableFuture h2 = m.runAfterEither(f, f, rs[2]); + checkIncomplete(h0); + checkIncomplete(h1); + checkIncomplete(h2); + assertTrue(f.cancel(mayInterruptIfRunning)); + final CompletableFuture h3 = m.thenRun(f, rs[3]); + final CompletableFuture h4 = m.runAfterBoth(f, f, rs[4]); + final CompletableFuture h5 = m.runAfterEither(f, f, rs[5]); + + checkCompletedWithWrappedCancellationException(h0); + checkCompletedWithWrappedCancellationException(h1); + checkCompletedWithWrappedCancellationException(h2); + checkCompletedWithWrappedCancellationException(h3); + checkCompletedWithWrappedCancellationException(h4); + checkCompletedWithWrappedCancellationException(h5); checkCancelled(f); - r.assertNotInvoked(); + for (Noop r : rs) r.assertNotInvoked(); }} /** @@ -1331,19 +1377,26 @@ public class CompletableFutureTest exten */ public void testThenRun_actionFailed() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final FailingRunnable r = new FailingRunnable(m); - if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenRun(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.complete(v1)); - } + final FailingRunnable[] rs = new FailingRunnable[6]; + for (int i = 0; i < rs.length; i++) rs[i] = new FailingRunnable(m); - checkCompletedWithWrappedCFException(g); + final CompletableFuture h0 = m.thenRun(f, rs[0]); + final CompletableFuture h1 = m.runAfterBoth(f, f, rs[1]); + final CompletableFuture h2 = m.runAfterEither(f, f, rs[2]); + assertTrue(f.complete(v1)); + final CompletableFuture h3 = m.thenRun(f, rs[3]); + final CompletableFuture h4 = m.runAfterBoth(f, f, rs[4]); + final CompletableFuture h5 = m.runAfterEither(f, f, rs[5]); + + checkCompletedWithWrappedCFException(h0); + checkCompletedWithWrappedCFException(h1); + checkCompletedWithWrappedCFException(h2); + checkCompletedWithWrappedCFException(h3); + checkCompletedWithWrappedCFException(h4); + checkCompletedWithWrappedCFException(h5); checkCompletedNormally(f, v1); }} @@ -1352,21 +1405,26 @@ public class CompletableFutureTest exten */ public void testThenApply_normalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final IncFunction r = new IncFunction(m); - if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenApply(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.complete(v1)); - } + final IncFunction[] rs = new IncFunction[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - checkCompletedNormally(g, inc(v1)); + 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]); + + checkCompletedNormally(h0, inc(v1)); + checkCompletedNormally(h1, inc(v1)); + checkCompletedNormally(h2, inc(v1)); + checkCompletedNormally(h3, inc(v1)); checkCompletedNormally(f, v1); - r.assertValue(inc(v1)); + for (IncFunction r : rs) r.assertValue(inc(v1)); }} /** @@ -1375,21 +1433,24 @@ public class CompletableFutureTest exten */ public void testThenApply_exceptionalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) { final CFException ex = new CFException(); final CompletableFuture f = new CompletableFuture<>(); - final IncFunction r = new IncFunction(m); - if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.thenApply(f, r); - if (createIncomplete) { - checkIncomplete(g); - f.completeExceptionally(ex); - } + final IncFunction[] rs = new IncFunction[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - checkCompletedWithWrappedException(g, ex); + 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]); + + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); checkCompletedExceptionally(f, ex); - r.assertNotInvoked(); + for (IncFunction r : rs) r.assertNotInvoked(); }} /** @@ -1397,21 +1458,24 @@ public class CompletableFutureTest exten */ public void testThenApply_sourceCancelled() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { final CompletableFuture f = new CompletableFuture<>(); - final IncFunction r = new IncFunction(m); - if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.thenApply(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.cancel(mayInterruptIfRunning)); - } + final IncFunction[] rs = new IncFunction[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new IncFunction(m); - checkCompletedWithWrappedCancellationException(g); + 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]); + + checkCompletedWithWrappedCancellationException(h0); + checkCompletedWithWrappedCancellationException(h1); + checkCompletedWithWrappedCancellationException(h2); + checkCompletedWithWrappedCancellationException(h3); checkCancelled(f); - r.assertNotInvoked(); + for (IncFunction r : rs) r.assertNotInvoked(); }} /** @@ -1419,19 +1483,22 @@ public class CompletableFutureTest exten */ public void testThenApply_actionFailed() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final FailingFunction r = new FailingFunction(m); - if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenApply(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.complete(v1)); - } + final FailingFunction[] rs = new FailingFunction[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new FailingFunction(m); - checkCompletedWithWrappedCFException(g); + 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]); + + checkCompletedWithWrappedCFException(h0); + checkCompletedWithWrappedCFException(h1); + checkCompletedWithWrappedCFException(h2); + checkCompletedWithWrappedCFException(h3); checkCompletedNormally(f, v1); }} @@ -1440,21 +1507,26 @@ public class CompletableFutureTest exten */ public void testThenAccept_normalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final NoopConsumer r = new NoopConsumer(m); - if (!createIncomplete) assertTrue(f.complete(v1)); - final CompletableFuture g = m.thenAccept(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.complete(v1)); - } + final NoopConsumer[] rs = new NoopConsumer[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); - checkCompletedNormally(g, null); - r.assertValue(v1); + final CompletableFuture h0 = m.thenAccept(f, rs[0]); + final CompletableFuture h1 = m.acceptEither(f, f, rs[1]); + checkIncomplete(h0); + checkIncomplete(h1); + assertTrue(f.complete(v1)); + final CompletableFuture h2 = m.thenAccept(f, rs[2]); + final CompletableFuture h3 = m.acceptEither(f, f, rs[3]); + + checkCompletedNormally(h0, null); + checkCompletedNormally(h1, null); + checkCompletedNormally(h2, null); + checkCompletedNormally(h3, null); checkCompletedNormally(f, v1); + for (NoopConsumer r : rs) r.assertValue(v1); }} /** @@ -1463,21 +1535,24 @@ public class CompletableFutureTest exten */ public void testThenAccept_exceptionalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) { final CFException ex = new CFException(); final CompletableFuture f = new CompletableFuture<>(); - final NoopConsumer r = new NoopConsumer(m); - if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.thenAccept(f, r); - if (createIncomplete) { - checkIncomplete(g); - f.completeExceptionally(ex); - } + final NoopConsumer[] rs = new NoopConsumer[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); - checkCompletedWithWrappedException(g, ex); + final CompletableFuture h0 = m.thenAccept(f, rs[0]); + final CompletableFuture h1 = m.acceptEither(f, f, rs[1]); + assertTrue(f.completeExceptionally(ex)); + final CompletableFuture h2 = m.thenAccept(f, rs[2]); + final CompletableFuture h3 = m.acceptEither(f, f, rs[3]); + + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); checkCompletedExceptionally(f, ex); - r.assertNotInvoked(); + for (NoopConsumer r : rs) r.assertNotInvoked(); }} /** @@ -1485,21 +1560,24 @@ public class CompletableFutureTest exten */ public void testThenAccept_sourceCancelled() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { final CompletableFuture f = new CompletableFuture<>(); - final NoopConsumer r = new NoopConsumer(m); - if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.thenAccept(f, r); - if (createIncomplete) { - checkIncomplete(g); - assertTrue(f.cancel(mayInterruptIfRunning)); - } + final NoopConsumer[] rs = new NoopConsumer[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new NoopConsumer(m); - checkCompletedWithWrappedCancellationException(g); + final CompletableFuture h0 = m.thenAccept(f, rs[0]); + final CompletableFuture h1 = m.acceptEither(f, f, rs[1]); + assertTrue(f.cancel(mayInterruptIfRunning)); + final CompletableFuture h2 = m.thenAccept(f, rs[2]); + final CompletableFuture h3 = m.acceptEither(f, f, rs[3]); + + checkCompletedWithWrappedCancellationException(h0); + checkCompletedWithWrappedCancellationException(h1); + checkCompletedWithWrappedCancellationException(h2); + checkCompletedWithWrappedCancellationException(h3); checkCancelled(f); - r.assertNotInvoked(); + for (NoopConsumer r : rs) r.assertNotInvoked(); }} /** @@ -1507,19 +1585,22 @@ public class CompletableFutureTest exten */ public void testThenAccept_actionFailed() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) { final CompletableFuture f = new CompletableFuture<>(); - final FailingConsumer r = new FailingConsumer(m); - if (!createIncomplete) f.complete(v1); - final CompletableFuture g = m.thenAccept(f, r); - if (createIncomplete) { - checkIncomplete(g); - f.complete(v1); - } + final FailingConsumer[] rs = new FailingConsumer[4]; + for (int i = 0; i < rs.length; i++) rs[i] = new FailingConsumer(m); - checkCompletedWithWrappedCFException(g); + final CompletableFuture h0 = m.thenAccept(f, rs[0]); + final CompletableFuture h1 = m.acceptEither(f, f, rs[1]); + assertTrue(f.complete(v1)); + final CompletableFuture h2 = m.thenAccept(f, rs[2]); + final CompletableFuture h3 = m.acceptEither(f, f, rs[3]); + + checkCompletedWithWrappedCFException(h0); + checkCompletedWithWrappedCFException(h1); + checkCompletedWithWrappedCFException(h2); + checkCompletedWithWrappedCFException(h3); checkCompletedNormally(f, v1); }} @@ -1535,31 +1616,35 @@ public class CompletableFutureTest exten { 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 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 h1 = m.thenCombine(f, g, r1); + 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, r2); - checkIncomplete(h1); - checkIncomplete(h2); - r1.assertNotInvoked(); - r2.assertNotInvoked(); + 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)); + checkCompletedNormally(h3, subtract(w1, w1)); + rs[1].assertValue(subtract(w1, w1)); + rs[3].assertValue(subtract(w1, w1)); assertTrue(snd.complete(w2)); - final CompletableFuture h3 = m.thenCombine(f, g, r3); + final CompletableFuture h4 = m.thenCombine(f, g, rs[4]); - checkCompletedNormally(h1, subtract(v1, v2)); + checkCompletedNormally(h0, subtract(v1, v2)); checkCompletedNormally(h2, subtract(v1, v2)); - checkCompletedNormally(h3, subtract(v1, v2)); - r1.assertValue(subtract(v1, v2)); - r2.assertValue(subtract(v1, v2)); - r3.assertValue(subtract(v1, v2)); + checkCompletedNormally(h4, subtract(v1, v2)); + rs[0].assertValue(subtract(v1, v2)); + rs[2].assertValue(subtract(v1, v2)); + rs[4].assertValue(subtract(v1, v2)); + checkCompletedNormally(f, v1); checkCompletedNormally(g, v2); }} @@ -2906,6 +2991,58 @@ public class CompletableFutureTest exten checkCancelled(f); }} + /** + * thenCompose result completes exceptionally if the result of the action does + */ + public void testThenCompose_actionReturnsFailingFuture() { + for (ExecutionMode m : ExecutionMode.values()) + for (int order = 0; order < 6; order++) + for (Integer v1 : new Integer[] { 1, null }) + { + 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.complete(v1)); + assertTrue(g.completeExceptionally(ex)); + h = m.thenCompose(f, (x -> g)); + break; + case 1: + assertTrue(f.complete(v1)); + 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)); + break; + case 3: + assertTrue(g.completeExceptionally(ex)); + h = m.thenCompose(f, (x -> g)); + assertTrue(f.complete(v1)); + break; + case 4: + h = m.thenCompose(f, (x -> g)); + assertTrue(f.complete(v1)); + assertTrue(g.completeExceptionally(ex)); + break; + case 5: + h = m.thenCompose(f, (x -> g)); + assertTrue(f.complete(v1)); + assertTrue(g.completeExceptionally(ex)); + break; + default: throw new AssertionError(); + } + + checkCompletedExceptionally(g, ex); + checkCompletedWithWrappedException(h, ex); + checkCompletedNormally(f, v1); + }} + // other static methods /** @@ -2922,13 +3059,13 @@ public class CompletableFutureTest exten * when all components complete normally */ public void testAllOf_normal() throws Exception { - for (int k = 1; k < 20; ++k) { + for (int k = 1; k < 10; k++) { CompletableFuture[] fs = (CompletableFuture[]) new CompletableFuture[k]; - for (int i = 0; i < k; ++i) + for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture f = CompletableFuture.allOf(fs); - for (int i = 0; i < k; ++i) { + for (int i = 0; i < k; i++) { checkIncomplete(f); checkIncomplete(CompletableFuture.allOf(fs)); fs[i].complete(one); @@ -2939,10 +3076,10 @@ public class CompletableFutureTest exten } public void testAllOf_backwards() throws Exception { - for (int k = 1; k < 20; ++k) { + for (int k = 1; k < 10; k++) { CompletableFuture[] fs = (CompletableFuture[]) new CompletableFuture[k]; - for (int i = 0; i < k; ++i) + for (int i = 0; i < k; i++) fs[i] = new CompletableFuture<>(); CompletableFuture f = CompletableFuture.allOf(fs); for (int i = k - 1; i >= 0; i--) { @@ -2955,29 +3092,74 @@ public class CompletableFutureTest exten } } + public void testAllOf_exceptional() throws Exception { + for (int k = 1; k < 10; k++) { + 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++) { + checkIncomplete(f); + checkIncomplete(CompletableFuture.allOf(fs)); + if (i != k/2) { + fs[i].complete(i); + checkCompletedNormally(fs[i], i); + } else { + fs[i].completeExceptionally(ex); + checkCompletedExceptionally(fs[i], ex); + } + } + checkCompletedWithWrappedException(f, ex); + checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex); + } + } + /** * anyOf(no component futures) returns an incomplete future */ public void testAnyOf_empty() throws Exception { + for (Integer v1 : new Integer[] { 1, null }) + { CompletableFuture f = CompletableFuture.anyOf(); checkIncomplete(f); - } + + f.complete(v1); + checkCompletedNormally(f, v1); + }} /** * anyOf returns a future completed normally with a value when * a component future does */ public void testAnyOf_normal() throws Exception { - for (int k = 0; k < 10; ++k) { + for (int k = 0; k < 10; k++) { CompletableFuture[] fs = new CompletableFuture[k]; - for (int i = 0; i < k; ++i) + 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(one); - checkCompletedNormally(f, one); - checkCompletedNormally(CompletableFuture.anyOf(fs), one); + 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); + } + } + } + public void testAnyOf_normal_backwards() throws Exception { + for (int k = 0; k < 10; k++) { + CompletableFuture[] fs = 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); } } } @@ -2986,15 +3168,36 @@ public class CompletableFutureTest exten * anyOf result completes exceptionally when any component does. */ public void testAnyOf_exceptional() throws Exception { - for (int k = 0; k < 10; ++k) { + for (int k = 0; k < 10; k++) { + CompletableFuture[] fs = new CompletableFuture[k]; + CFException[] exs = new CFException[k]; + for (int i = 0; i < k; i++) { + fs[i] = new CompletableFuture<>(); + exs[i] = new CFException(); + } + CompletableFuture f = CompletableFuture.anyOf(fs); + checkIncomplete(f); + for (int i = 0; i < k; i++) { + fs[i].completeExceptionally(exs[i]); + checkCompletedWithWrappedException(f, exs[0]); + checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs)); + } + } + } + + public void testAnyOf_exceptional_backwards() throws Exception { + for (int k = 0; k < 10; k++) { CompletableFuture[] fs = new CompletableFuture[k]; - for (int i = 0; i < k; ++i) + CFException[] exs = new CFException[k]; + for (int i = 0; i < k; i++) { fs[i] = new CompletableFuture<>(); + exs[i] = new CFException(); + } CompletableFuture f = CompletableFuture.anyOf(fs); checkIncomplete(f); - for (int i = 0; i < k; ++i) { - fs[i].completeExceptionally(new CFException()); - checkCompletedWithWrappedCFException(f); + for (int i = k - 1; i >= 0; i--) { + fs[i].completeExceptionally(exs[i]); + checkCompletedWithWrappedException(f, exs[k - 1]); checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs)); } } @@ -3007,13 +3210,12 @@ public class CompletableFutureTest exten CompletableFuture f = new CompletableFuture<>(); CompletableFuture g = new CompletableFuture<>(); CompletableFuture nullFuture = (CompletableFuture)null; - CompletableFuture h; ThreadExecutor exec = new ThreadExecutor(); Runnable[] throwingActions = { () -> CompletableFuture.supplyAsync(null), () -> CompletableFuture.supplyAsync(null, exec), - () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.DEFAULT, 42), null), + () -> CompletableFuture.supplyAsync(new IntegerSupplier(ExecutionMode.SYNC, 42), null), () -> CompletableFuture.runAsync(null), () -> CompletableFuture.runAsync(null, exec), @@ -3137,41 +3339,44 @@ public class CompletableFutureTest exten final CompletableFuture v42 = CompletableFuture.completedFuture(42); final CompletableFuture incomplete = new CompletableFuture<>(); - List, CompletableFuture>> dependentFactories + List, CompletableFuture>> funs = new ArrayList<>(); - dependentFactories.add((y) -> m.thenRun(y, new Noop(m))); - dependentFactories.add((y) -> m.thenAccept(y, new NoopConsumer(m))); - dependentFactories.add((y) -> m.thenApply(y, new IncFunction(m))); + funs.add((y) -> m.thenRun(y, new Noop(m))); + funs.add((y) -> m.thenAccept(y, new NoopConsumer(m))); + funs.add((y) -> m.thenApply(y, new IncFunction(m))); + + funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m))); + funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m))); + funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m))); - dependentFactories.add((y) -> m.runAfterEither(y, incomplete, new Noop(m))); - dependentFactories.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m))); - dependentFactories.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m))); + funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m))); + funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m))); + funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m))); - dependentFactories.add((y) -> m.runAfterBoth(y, v42, new Noop(m))); - dependentFactories.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m))); - dependentFactories.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m))); + funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {})); - dependentFactories.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {})); + funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m))); - dependentFactories.add((y) -> m.thenCompose(y, new CompletableFutureInc(m))); + funs.add((y) -> CompletableFuture.allOf(new CompletableFuture[] {y, v42})); + funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture[] {y, incomplete})); for (Function, CompletableFuture> - dependentFactory : dependentFactories) { + fun : funs) { CompletableFuture f = new CompletableFuture<>(); f.completeExceptionally(ex); CompletableFuture src = m.thenApply(f, new IncFunction(m)); checkCompletedWithWrappedException(src, ex); - CompletableFuture dep = dependentFactory.apply(src); + CompletableFuture dep = fun.apply(src); checkCompletedWithWrappedException(dep, ex); assertSame(resultOf(src), resultOf(dep)); } for (Function, CompletableFuture> - dependentFactory : dependentFactories) { + fun : funs) { CompletableFuture f = new CompletableFuture<>(); CompletableFuture src = m.thenApply(f, new IncFunction(m)); - CompletableFuture dep = dependentFactory.apply(src); + CompletableFuture dep = fun.apply(src); f.completeExceptionally(ex); checkCompletedWithWrappedException(src, ex); checkCompletedWithWrappedException(dep, ex); @@ -3180,23 +3385,23 @@ public class CompletableFutureTest exten for (boolean mayInterruptIfRunning : new boolean[] { true, false }) for (Function, CompletableFuture> - dependentFactory : dependentFactories) { + fun : funs) { CompletableFuture f = new CompletableFuture<>(); f.cancel(mayInterruptIfRunning); checkCancelled(f); CompletableFuture src = m.thenApply(f, new IncFunction(m)); checkCompletedWithWrappedCancellationException(src); - CompletableFuture dep = dependentFactory.apply(src); + CompletableFuture dep = fun.apply(src); checkCompletedWithWrappedCancellationException(dep); assertSame(resultOf(src), resultOf(dep)); } for (boolean mayInterruptIfRunning : new boolean[] { true, false }) for (Function, CompletableFuture> - dependentFactory : dependentFactories) { + fun : funs) { CompletableFuture f = new CompletableFuture<>(); CompletableFuture src = m.thenApply(f, new IncFunction(m)); - CompletableFuture dep = dependentFactory.apply(src); + CompletableFuture dep = fun.apply(src); f.cancel(mayInterruptIfRunning); checkCancelled(f); checkCompletedWithWrappedCancellationException(src);