--- jsr166/src/test/tck/CompletableFutureTest.java 2014/06/06 19:19:04 1.66 +++ jsr166/src/test/tck/CompletableFutureTest.java 2014/06/16 17:08:15 1.79 @@ -105,8 +105,8 @@ public class CompletableFutureTest exten assertTrue(f.toString().contains("[Completed exceptionally]")); } - void checkCompletedWithWrappedCFException(CompletableFuture f, - CFException ex) { + void checkCompletedExceptionallyWithRootCause(CompletableFuture f, + Throwable ex) { try { f.get(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); @@ -131,11 +131,32 @@ public class CompletableFutureTest exten } catch (ExecutionException success) { assertSame(ex, success.getCause()); } catch (Throwable fail) { threadUnexpectedException(fail); } + assertTrue(f.isDone()); assertFalse(f.isCancelled()); assertTrue(f.toString().contains("[Completed exceptionally]")); } + void checkCompletedWithWrappedException(CompletableFuture f, + Throwable ex) { + checkCompletedExceptionallyWithRootCause(f, ex); + try { + CompletableFuture spy = f.handle + ((U u, Throwable t) -> t); + assertTrue(spy.join() instanceof CompletionException); + assertSame(ex, spy.join().getCause()); + } catch (Throwable fail) { threadUnexpectedException(fail); } + } + + void checkCompletedExceptionally(CompletableFuture f, Throwable ex) { + checkCompletedExceptionallyWithRootCause(f, ex); + try { + CompletableFuture spy = f.handle + ((U u, Throwable t) -> t); + assertSame(ex, spy.join()); + } catch (Throwable fail) { threadUnexpectedException(fail); } + } + void checkCancelled(CompletableFuture f) { try { f.get(LONG_DELAY_MS, MILLISECONDS); @@ -206,11 +227,14 @@ public class CompletableFutureTest exten * isCancelled, join, get, and getNow */ public void testComplete() { + for (Integer v1 : new Integer[] { 1, null }) + { CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); - f.complete(one); - checkCompletedNormally(f, one); - } + assertTrue(f.complete(v1)); + assertFalse(f.complete(v1)); + checkCompletedNormally(f, v1); + }} /** * completeExceptionally completes exceptionally, as indicated by @@ -218,9 +242,10 @@ public class CompletableFutureTest exten */ public void testCompleteExceptionally() { CompletableFuture f = new CompletableFuture<>(); + CFException ex = new CFException(); checkIncomplete(f); - f.completeExceptionally(new CFException()); - checkCompletedWithWrappedCFException(f); + f.completeExceptionally(ex); + checkCompletedExceptionally(f, ex); } /** @@ -228,11 +253,14 @@ public class CompletableFutureTest exten * methods isDone, isCancelled, join, get, and getNow */ public void testCancel() { + for (boolean mayInterruptIfRunning : new boolean[] { true, false }) + { CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); assertTrue(f.cancel(true)); + assertTrue(f.cancel(true)); checkCancelled(f); - } + }} /** * obtrudeValue forces completion with given value @@ -240,7 +268,7 @@ public class CompletableFutureTest exten public void testObtrudeValue() { CompletableFuture f = new CompletableFuture<>(); checkIncomplete(f); - f.complete(one); + assertTrue(f.complete(one)); checkCompletedNormally(f, one); f.obtrudeValue(three); checkCompletedNormally(f, three); @@ -261,39 +289,58 @@ public class CompletableFutureTest exten * obtrudeException forces completion with given exception */ public void testObtrudeException() { - CompletableFuture f = new CompletableFuture<>(); - checkIncomplete(f); - f.complete(one); - checkCompletedNormally(f, one); - f.obtrudeException(new CFException()); - checkCompletedWithWrappedCFException(f); + for (Integer v1 : new Integer[] { 1, null }) + { + CFException ex; + CompletableFuture f; + f = new CompletableFuture<>(); - f.obtrudeException(new CFException()); - checkCompletedWithWrappedCFException(f); + assertTrue(f.complete(v1)); + for (int i = 0; i < 2; i++) { + f.obtrudeException(ex = new CFException()); + checkCompletedExceptionally(f, ex); + } + f = new CompletableFuture<>(); + for (int i = 0; i < 2; i++) { + f.obtrudeException(ex = new CFException()); + checkCompletedExceptionally(f, ex); + } + + f = new CompletableFuture<>(); + f.completeExceptionally(ex = new CFException()); + f.obtrudeValue(v1); + checkCompletedNormally(f, v1); + f.obtrudeException(ex = new CFException()); + checkCompletedExceptionally(f, ex); f.completeExceptionally(new CFException()); - f.obtrudeValue(four); - checkCompletedNormally(f, four); - f.obtrudeException(new CFException()); - checkCompletedWithWrappedCFException(f); - } + checkCompletedExceptionally(f, ex); + assertFalse(f.complete(v1)); + checkCompletedExceptionally(f, ex); + }} /** * getNumberOfDependents returns number of dependent tasks */ public void testGetNumberOfDependents() { + for (ExecutionMode m : ExecutionMode.values()) + for (Integer v1 : new Integer[] { 1, null }) + { CompletableFuture f = new CompletableFuture<>(); assertEquals(0, f.getNumberOfDependents()); - CompletableFuture g = f.thenRun(new Noop(ExecutionMode.DEFAULT)); + final CompletableFuture g = m.thenRun(f, new Noop(m)); assertEquals(1, f.getNumberOfDependents()); assertEquals(0, g.getNumberOfDependents()); - CompletableFuture h = f.thenRun(new Noop(ExecutionMode.DEFAULT)); + final CompletableFuture h = m.thenRun(f, new Noop(m)); assertEquals(2, f.getNumberOfDependents()); - f.complete(1); + assertEquals(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()); + }} /** * toString indicates current completion state @@ -304,12 +351,18 @@ public class CompletableFutureTest exten f = new CompletableFuture(); assertTrue(f.toString().contains("[Not completed]")); - f.complete("foo"); + assertTrue(f.complete("foo")); assertTrue(f.toString().contains("[Completed normally]")); f = new CompletableFuture(); - f.completeExceptionally(new IndexOutOfBoundsException()); + assertTrue(f.completeExceptionally(new IndexOutOfBoundsException())); assertTrue(f.toString().contains("[Completed exceptionally]")); + + for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { + f = new CompletableFuture(); + assertTrue(f.cancel(mayInterruptIfRunning)); + assertTrue(f.toString().contains("[Completed exceptionally]")); + } } /** @@ -486,7 +539,7 @@ public class CompletableFutureTest exten invoked(); value = x; CompletableFuture f = new CompletableFuture<>(); - f.complete(inc(x)); + assertTrue(f.complete(inc(x))); return f; } } @@ -794,21 +847,20 @@ public class CompletableFutureTest exten { final AtomicInteger a = new AtomicInteger(0); final CompletableFuture f = new CompletableFuture<>(); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = f.exceptionally ((Throwable t) -> { // Should not be called a.getAndIncrement(); throw new AssertionError(); }); - if (createIncomplete) f.complete(v1); + if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, v1); checkCompletedNormally(f, v1); assertEquals(0, a.get()); }} - /** * exceptionally action completes with function value on source * exception @@ -852,7 +904,150 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.completeExceptionally(ex1); - checkCompletedWithWrappedCFException(g, ex2); + checkCompletedWithWrappedException(g, ex2); + assertEquals(1, a.get()); + }} + + /** + * whenComplete action executes on normal completion, propagating + * source result. + */ + public void testWhenComplete_normalCompletion1() { + 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 CompletableFuture f = new CompletableFuture<>(); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + threadAssertSame(x, v1); + threadAssertNull(t); + a.getAndIncrement(); + }); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedNormally(g, v1); + checkCompletedNormally(f, v1); + assertEquals(1, a.get()); + }} + + /** + * whenComplete action executes on exceptional completion, propagating + * source result. + */ + 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(); + final CompletableFuture f = new CompletableFuture<>(); + if (!createIncomplete) f.completeExceptionally(ex); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + threadAssertNull(x); + threadAssertSame(t, ex); + a.getAndIncrement(); + }); + if (createIncomplete) f.completeExceptionally(ex); + + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); + assertEquals(1, a.get()); + }} + + /** + * whenComplete action executes on cancelled source, propagating + * CancellationException. + */ + public void testWhenComplete_sourceCancelled() { + for (ExecutionMode m : ExecutionMode.values()) + 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<>(); + if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + threadAssertNull(x); + threadAssertTrue(t instanceof CancellationException); + a.getAndIncrement(); + }); + if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); + + checkCompletedWithWrappedCancellationException(g); + checkCancelled(f); + assertEquals(1, a.get()); + }} + + /** + * If a whenComplete action throws an exception when triggered by + * a normal completion, it completes exceptionally + */ + public void testWhenComplete_actionFailed() { + 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 ex = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + if (!createIncomplete) assertTrue(f.complete(v1)); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + threadAssertSame(x, v1); + threadAssertNull(t); + a.getAndIncrement(); + throw ex; + }); + if (createIncomplete) assertTrue(f.complete(v1)); + + checkCompletedWithWrappedException(g, ex); + checkCompletedNormally(f, v1); + assertEquals(1, a.get()); + }} + + /** + * If a whenComplete action throws an exception when triggered by + * a source completion that also throws an exception, the source + * exception takes precedence. + */ + 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(); + final CFException ex2 = new CFException(); + final CompletableFuture f = new CompletableFuture<>(); + + if (!createIncomplete) f.completeExceptionally(ex1); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + threadAssertSame(t, ex1); + threadAssertNull(x); + a.getAndIncrement(); + throw ex2; + }); + if (createIncomplete) f.completeExceptionally(ex1); + + checkCompletedWithWrappedException(g, ex1); + checkCompletedExceptionally(f, ex1); assertEquals(1, a.get()); }} @@ -867,7 +1062,7 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final AtomicInteger a = new AtomicInteger(0); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.handle (f, (Integer x, Throwable t) -> { @@ -877,7 +1072,7 @@ public class CompletableFutureTest exten a.getAndIncrement(); return inc(v1); }); - if (createIncomplete) f.complete(v1); + if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); @@ -909,7 +1104,7 @@ public class CompletableFutureTest exten if (createIncomplete) f.completeExceptionally(ex); checkCompletedNormally(g, v1); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedExceptionally(f, ex); assertEquals(1, a.get()); }} @@ -965,8 +1160,8 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.completeExceptionally(ex1); - checkCompletedWithWrappedCFException(g, ex2); - checkCompletedWithWrappedCFException(f, ex1); + checkCompletedWithWrappedException(g, ex2); + checkCompletedExceptionally(f, ex1); assertEquals(1, a.get()); }} @@ -978,7 +1173,7 @@ public class CompletableFutureTest exten final CompletableFuture f = new CompletableFuture<>(); final AtomicInteger a = new AtomicInteger(0); final CFException ex = new CFException(); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.handle (f, (Integer x, Throwable t) -> { @@ -988,9 +1183,9 @@ public class CompletableFutureTest exten a.getAndIncrement(); throw ex; }); - if (createIncomplete) f.complete(v1); + if (createIncomplete) assertTrue(f.complete(v1)); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedWithWrappedException(g, ex); checkCompletedNormally(f, v1); assertEquals(1, a.get()); }} @@ -1074,11 +1269,11 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final Noop r = new Noop(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenRun(f, r); if (createIncomplete) { checkIncomplete(g); - f.complete(v1); + assertTrue(f.complete(v1)); } checkCompletedNormally(g, null); @@ -1104,8 +1299,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1141,11 +1336,11 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final FailingRunnable r = new FailingRunnable(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenRun(f, r); if (createIncomplete) { checkIncomplete(g); - f.complete(v1); + assertTrue(f.complete(v1)); } checkCompletedWithWrappedCFException(g); @@ -1162,16 +1357,16 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final IncFunction r = new IncFunction(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenApply(f, r); if (createIncomplete) { checkIncomplete(g); - f.complete(v1); + assertTrue(f.complete(v1)); } checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(inc(v1)); }} /** @@ -1192,8 +1387,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1229,11 +1424,11 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final FailingFunction r = new FailingFunction(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenApply(f, r); if (createIncomplete) { checkIncomplete(g); - f.complete(v1); + assertTrue(f.complete(v1)); } checkCompletedWithWrappedCFException(g); @@ -1250,11 +1445,11 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final NoopConsumer r = new NoopConsumer(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenAccept(f, r); if (createIncomplete) { checkIncomplete(g); - f.complete(v1); + assertTrue(f.complete(v1)); } checkCompletedNormally(g, null); @@ -1280,8 +1475,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1334,88 +1529,126 @@ public class CompletableFutureTest exten */ public void testThenCombine_normalCompletion() { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : new boolean[] { true, false }) for (boolean fFirst : new boolean[] { true, false }) for (Integer v1 : new Integer[] { 1, null }) for (Integer v2 : new Integer[] { 2, null }) { final CompletableFuture f = new CompletableFuture<>(); final CompletableFuture g = new CompletableFuture<>(); - final SubtractFunction r = new SubtractFunction(m); - - if (fFirst) f.complete(v1); else g.complete(v2); - if (!createIncomplete) - if (!fFirst) f.complete(v1); else g.complete(v2); - final CompletableFuture h = m.thenCombine(f, g, r); - if (createIncomplete) { - checkIncomplete(h); - r.assertNotInvoked(); - if (!fFirst) f.complete(v1); else g.complete(v2); - } - - checkCompletedNormally(h, subtract(v1, v2)); + 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 Integer w1 = fFirst ? v1 : v2; + final Integer w2 = !fFirst ? v1 : v2; + + final CompletableFuture h1 = m.thenCombine(f, g, r1); + assertTrue(fst.complete(w1)); + final CompletableFuture h2 = m.thenCombine(f, g, r2); + checkIncomplete(h1); + checkIncomplete(h2); + r1.assertNotInvoked(); + r2.assertNotInvoked(); + assertTrue(snd.complete(w2)); + final CompletableFuture h3 = m.thenCombine(f, g, r3); + + checkCompletedNormally(h1, 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(f, v1); checkCompletedNormally(g, v2); - r.assertInvoked(); }} /** * thenCombine result completes exceptionally after exceptional * completion of either source */ - public void testThenCombine_exceptionalCompletion() { + public void testThenCombine_exceptionalCompletion() throws Throwable { for (ExecutionMode m : ExecutionMode.values()) - for (boolean createIncomplete : 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 }) { final CompletableFuture f = new CompletableFuture<>(); final CompletableFuture g = new CompletableFuture<>(); final CFException ex = new CFException(); - final SubtractFunction r = new SubtractFunction(m); - - (fFirst ? f : g).complete(v1); - if (!createIncomplete) - (!fFirst ? f : g).completeExceptionally(ex); - final CompletableFuture h = m.thenCombine(f, g, r); - if (createIncomplete) { - checkIncomplete(h); - (!fFirst ? f : g).completeExceptionally(ex); - } - - checkCompletedWithWrappedCFException(h, ex); - r.assertNotInvoked(); - checkCompletedNormally(fFirst ? f : g, v1); - checkCompletedWithWrappedCFException(!fFirst ? f : g, ex); + 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 Callable complete1 = failFirst ? + () -> fst.completeExceptionally(ex) : + () -> fst.complete(v1); + final Callable complete2 = failFirst ? + () -> snd.complete(v1) : + () -> snd.completeExceptionally(ex); + + final CompletableFuture h1 = m.thenCombine(f, g, r1); + assertTrue(complete1.call()); + final CompletableFuture h2 = m.thenCombine(f, g, r2); + checkIncomplete(h1); + checkIncomplete(h2); + assertTrue(complete2.call()); + final CompletableFuture h3 = m.thenCombine(f, g, r3); + + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); + r1.assertNotInvoked(); + r2.assertNotInvoked(); + r3.assertNotInvoked(); + checkCompletedNormally(failFirst ? snd : fst, v1); + checkCompletedExceptionally(failFirst ? fst : snd, ex); }} /** * thenCombine result completes exceptionally if either source cancelled */ - public void testThenCombine_sourceCancelled() { + public void testThenCombine_sourceCancelled() throws Throwable { for (ExecutionMode m : ExecutionMode.values()) for (boolean mayInterruptIfRunning : new boolean[] { true, false }) - for (boolean createIncomplete : 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 }) { final CompletableFuture f = new CompletableFuture<>(); final CompletableFuture g = new CompletableFuture<>(); - final SubtractFunction r = new SubtractFunction(m); + final SubtractFunction r1 = new SubtractFunction(m); + final SubtractFunction r2 = new SubtractFunction(m); + final SubtractFunction r3 = new SubtractFunction(m); - (fFirst ? f : g).complete(v1); - if (!createIncomplete) - assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning)); - final CompletableFuture h = m.thenCombine(f, g, r); - if (createIncomplete) { - checkIncomplete(h); - assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning)); - } + final CompletableFuture fst = fFirst ? f : g; + final CompletableFuture snd = !fFirst ? f : g; + final Callable complete1 = failFirst ? + () -> fst.cancel(mayInterruptIfRunning) : + () -> fst.complete(v1); + final Callable complete2 = failFirst ? + () -> snd.complete(v1) : + () -> snd.cancel(mayInterruptIfRunning); - checkCompletedWithWrappedCancellationException(h); - checkCancelled(!fFirst ? f : g); - r.assertNotInvoked(); - checkCompletedNormally(fFirst ? f : g, v1); + final CompletableFuture h1 = m.thenCombine(f, g, r1); + assertTrue(complete1.call()); + final CompletableFuture h2 = m.thenCombine(f, g, r2); + checkIncomplete(h1); + checkIncomplete(h2); + assertTrue(complete2.call()); + final CompletableFuture h3 = m.thenCombine(f, g, r3); + + checkCompletedWithWrappedCancellationException(h1); + checkCompletedWithWrappedCancellationException(h2); + checkCompletedWithWrappedCancellationException(h3); + r1.assertNotInvoked(); + r2.assertNotInvoked(); + r3.assertNotInvoked(); + checkCompletedNormally(failFirst ? snd : fst, v1); + checkCancelled(failFirst ? fst : snd); }} /** @@ -1429,18 +1662,24 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final CompletableFuture g = new CompletableFuture<>(); - final FailingBiFunction r = new FailingBiFunction(m); - final CompletableFuture h = m.thenCombine(f, g, r); + 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 h1 = m.thenCombine(f, g, r1); + assertTrue(fst.complete(w1)); + final CompletableFuture h2 = m.thenCombine(f, g, r2); + assertTrue(snd.complete(w2)); + final CompletableFuture h3 = m.thenCombine(f, g, r3); - if (fFirst) { - f.complete(v1); - g.complete(v2); - } else { - g.complete(v2); - f.complete(v1); - } - - checkCompletedWithWrappedCFException(h); + checkCompletedWithWrappedCFException(h1); + checkCompletedWithWrappedCFException(h2); + checkCompletedWithWrappedCFException(h3); checkCompletedNormally(f, v1); checkCompletedNormally(g, v2); }} @@ -1460,14 +1699,14 @@ public class CompletableFutureTest exten final CompletableFuture g = new CompletableFuture<>(); final SubtractAction r = new SubtractAction(m); - if (fFirst) f.complete(v1); else g.complete(v2); + assertTrue(fFirst ? f.complete(v1) : g.complete(v2)); if (!createIncomplete) - if (!fFirst) f.complete(v1); else g.complete(v2); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); final CompletableFuture h = m.thenAcceptBoth(f, g, r); if (createIncomplete) { checkIncomplete(h); r.assertNotInvoked(); - if (!fFirst) f.complete(v1); else g.complete(v2); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); } checkCompletedNormally(h, null); @@ -1491,19 +1730,19 @@ public class CompletableFutureTest exten final CFException ex = new CFException(); final SubtractAction r = new SubtractAction(m); - (fFirst ? f : g).complete(v1); + assertTrue((fFirst ? f : g).complete(v1)); if (!createIncomplete) - (!fFirst ? f : g).completeExceptionally(ex); + assertTrue((!fFirst ? f : g).completeExceptionally(ex)); final CompletableFuture h = m.thenAcceptBoth(f, g, r); if (createIncomplete) { checkIncomplete(h); - (!fFirst ? f : g).completeExceptionally(ex); + assertTrue((!fFirst ? f : g).completeExceptionally(ex)); } - checkCompletedWithWrappedCFException(h, ex); + checkCompletedWithWrappedException(h, ex); r.assertNotInvoked(); checkCompletedNormally(fFirst ? f : g, v1); - checkCompletedWithWrappedCFException(!fFirst ? f : g, ex); + checkCompletedExceptionally(!fFirst ? f : g, ex); }} /** @@ -1520,7 +1759,7 @@ public class CompletableFutureTest exten final CompletableFuture g = new CompletableFuture<>(); final SubtractAction r = new SubtractAction(m); - (fFirst ? f : g).complete(v1); + assertTrue((fFirst ? f : g).complete(v1)); if (!createIncomplete) assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning)); final CompletableFuture h = m.thenAcceptBoth(f, g, r); @@ -1549,13 +1788,8 @@ public class CompletableFutureTest exten final FailingBiConsumer r = new FailingBiConsumer(m); final CompletableFuture h = m.thenAcceptBoth(f, g, r); - if (fFirst) { - f.complete(v1); - g.complete(v2); - } else { - g.complete(v2); - f.complete(v1); - } + assertTrue(fFirst ? f.complete(v1) : g.complete(v2)); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); checkCompletedWithWrappedCFException(h); checkCompletedNormally(f, v1); @@ -1577,14 +1811,14 @@ public class CompletableFutureTest exten final CompletableFuture g = new CompletableFuture<>(); final Noop r = new Noop(m); - if (fFirst) f.complete(v1); else g.complete(v2); + assertTrue(fFirst ? f.complete(v1) : g.complete(v2)); if (!createIncomplete) - if (!fFirst) f.complete(v1); else g.complete(v2); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); final CompletableFuture h = m.runAfterBoth(f, g, r); if (createIncomplete) { checkIncomplete(h); r.assertNotInvoked(); - if (!fFirst) f.complete(v1); else g.complete(v2); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); } checkCompletedNormally(h, null); @@ -1608,19 +1842,19 @@ public class CompletableFutureTest exten final CFException ex = new CFException(); final Noop r = new Noop(m); - (fFirst ? f : g).complete(v1); + assertTrue((fFirst ? f : g).complete(v1)); if (!createIncomplete) - (!fFirst ? f : g).completeExceptionally(ex); + assertTrue((!fFirst ? f : g).completeExceptionally(ex)); final CompletableFuture h = m.runAfterBoth(f, g, r); if (createIncomplete) { checkIncomplete(h); - (!fFirst ? f : g).completeExceptionally(ex); + assertTrue((!fFirst ? f : g).completeExceptionally(ex)); } - checkCompletedWithWrappedCFException(h, ex); + checkCompletedWithWrappedException(h, ex); r.assertNotInvoked(); checkCompletedNormally(fFirst ? f : g, v1); - checkCompletedWithWrappedCFException(!fFirst ? f : g, ex); + checkCompletedExceptionally(!fFirst ? f : g, ex); }} /** @@ -1637,8 +1871,7 @@ public class CompletableFutureTest exten final CompletableFuture g = new CompletableFuture<>(); final Noop r = new Noop(m); - - (fFirst ? f : g).complete(v1); + assertTrue((fFirst ? f : g).complete(v1)); if (!createIncomplete) assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning)); final CompletableFuture h = m.runAfterBoth(f, g, r); @@ -1668,13 +1901,8 @@ public class CompletableFutureTest exten final FailingRunnable r2 = new FailingRunnable(m); CompletableFuture h1 = m.runAfterBoth(f, g, r1); - if (fFirst) { - f.complete(v1); - g.complete(v2); - } else { - g.complete(v2); - f.complete(v1); - } + assertTrue(fFirst ? f.complete(v1) : g.complete(v2)); + assertTrue(!fFirst ? f.complete(v1) : g.complete(v2)); CompletableFuture h2 = m.runAfterBoth(f, g, r2); checkCompletedWithWrappedCFException(h1); @@ -1752,12 +1980,12 @@ public class CompletableFutureTest exten rs[0].assertNotInvoked(); rs[1].assertNotInvoked(); f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, 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]); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); g.complete(v1); // unspecified behavior - both source completions available @@ -1767,24 +1995,24 @@ public class CompletableFutureTest exten assertEquals(inc(v1), h4.join()); rs[4].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h4, ex); rs[4].assertNotInvoked(); } try { assertEquals(inc(v1), h5.join()); rs[5].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h5, ex); + checkCompletedWithWrappedException(h5, ex); rs[5].assertNotInvoked(); } - checkCompletedWithWrappedCFException(f, ex); + checkCompletedExceptionally(f, ex); checkCompletedNormally(g, v1); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, ex); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); + checkCompletedWithWrappedException(h4, ex); for (int i = 0; i < 4; i++) rs[i].assertNotInvoked(); }} @@ -1801,13 +2029,8 @@ public class CompletableFutureTest exten final CompletableFuture h0 = m.applyToEither(f, g, rs[0]); final CompletableFuture h1 = m.applyToEither(g, f, rs[1]); - if (fFirst) { - f.complete(v1); - g.completeExceptionally(ex); - } else { - g.completeExceptionally(ex); - f.complete(v1); - } + 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]); @@ -1816,33 +2039,33 @@ public class CompletableFutureTest exten assertEquals(inc(v1), h0.join()); rs[0].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h0, ex); + checkCompletedWithWrappedException(h0, ex); rs[0].assertNotInvoked(); } try { assertEquals(inc(v1), h1.join()); rs[1].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h1, ex); + checkCompletedWithWrappedException(h1, ex); rs[1].assertNotInvoked(); } try { assertEquals(inc(v1), h2.join()); rs[2].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h2, ex); + checkCompletedWithWrappedException(h2, ex); rs[2].assertNotInvoked(); } try { assertEquals(inc(v1), h3.join()); rs[3].assertValue(inc(v1)); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h3, ex); rs[3].assertNotInvoked(); } checkCompletedNormally(f, v1); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedExceptionally(g, ex); }} /** @@ -1900,6 +2123,58 @@ public class CompletableFutureTest exten for (int i = 0; i < 4; i++) rs[i].assertNotInvoked(); }} + public void testApplyToEither_sourceCancelled2() { + 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 }) + { + 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]); + 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]); + + // unspecified behavior - both source completions available + try { + assertEquals(inc(v1), h0.join()); + rs[0].assertValue(inc(v1)); + } catch (CompletionException ok) { + checkCompletedWithWrappedCancellationException(h0); + rs[0].assertNotInvoked(); + } + try { + assertEquals(inc(v1), h1.join()); + rs[1].assertValue(inc(v1)); + } catch (CompletionException ok) { + checkCompletedWithWrappedCancellationException(h1); + rs[1].assertNotInvoked(); + } + try { + assertEquals(inc(v1), h2.join()); + rs[2].assertValue(inc(v1)); + } catch (CompletionException ok) { + checkCompletedWithWrappedCancellationException(h2); + rs[2].assertNotInvoked(); + } + try { + assertEquals(inc(v1), h3.join()); + rs[3].assertValue(inc(v1)); + } catch (CompletionException ok) { + checkCompletedWithWrappedCancellationException(h3); + rs[3].assertNotInvoked(); + } + + checkCompletedNormally(f, v1); + checkCancelled(g); + }} + /** * applyToEither result completes exceptionally if action does */ @@ -2014,12 +2289,12 @@ public class CompletableFutureTest exten rs[0].assertNotInvoked(); rs[1].assertNotInvoked(); f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, ex); + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); final CompletableFuture h2 = m.acceptEither(f, g, rs[2]); final CompletableFuture h3 = m.acceptEither(g, f, rs[3]); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); g.complete(v1); @@ -2030,27 +2305,79 @@ public class CompletableFutureTest exten assertNull(h4.join()); rs[4].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h4, ex); rs[4].assertNotInvoked(); } try { assertNull(h5.join()); rs[5].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h5, ex); + checkCompletedWithWrappedException(h5, ex); rs[5].assertNotInvoked(); } - checkCompletedWithWrappedCFException(f, ex); + checkCompletedExceptionally(f, ex); checkCompletedNormally(g, v1); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, ex); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); + checkCompletedWithWrappedException(h4, ex); for (int i = 0; i < 4; i++) rs[i].assertNotInvoked(); }} + public void testAcceptEither_exceptionalCompletion2() { + for (ExecutionMode m : ExecutionMode.values()) + for (boolean fFirst : new boolean[] { true, false }) + for (Integer v1 : new Integer[] { 1, null }) + { + 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); + + final CompletableFuture h0 = m.acceptEither(f, g, rs[0]); + final CompletableFuture h1 = m.acceptEither(g, f, rs[1]); + assertTrue(fFirst ? f.complete(v1) : g.completeExceptionally(ex)); + assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex)); + final CompletableFuture h2 = m.acceptEither(f, g, rs[2]); + final CompletableFuture h3 = m.acceptEither(g, f, rs[3]); + + // unspecified behavior - both source completions available + try { + assertEquals(null, h0.join()); + rs[0].assertValue(v1); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h0, ex); + rs[0].assertNotInvoked(); + } + try { + assertEquals(null, h1.join()); + rs[1].assertValue(v1); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h1, ex); + rs[1].assertNotInvoked(); + } + try { + assertEquals(null, h2.join()); + rs[2].assertValue(v1); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h2, ex); + rs[2].assertNotInvoked(); + } + try { + assertEquals(null, h3.join()); + rs[3].assertValue(v1); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h3, ex); + rs[3].assertNotInvoked(); + } + + checkCompletedNormally(f, v1); + checkCompletedExceptionally(g, ex); + }} + /** * acceptEither result completes exceptionally if either source cancelled */ @@ -2216,15 +2543,15 @@ public class CompletableFutureTest exten checkIncomplete(h1); rs[0].assertNotInvoked(); rs[1].assertNotInvoked(); - f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, ex); + assertTrue(f.completeExceptionally(ex)); + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); final CompletableFuture h2 = m.runAfterEither(f, g, rs[2]); final CompletableFuture h3 = m.runAfterEither(g, f, rs[3]); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); - g.complete(v1); + assertTrue(g.complete(v1)); // unspecified behavior - both source completions available final CompletableFuture h4 = m.runAfterEither(f, g, rs[4]); @@ -2233,27 +2560,79 @@ public class CompletableFutureTest exten assertNull(h4.join()); rs[4].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h4, ex); rs[4].assertNotInvoked(); } try { assertNull(h5.join()); rs[5].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h5, ex); + checkCompletedWithWrappedException(h5, ex); rs[5].assertNotInvoked(); } - checkCompletedWithWrappedCFException(f, ex); + checkCompletedExceptionally(f, ex); checkCompletedNormally(g, v1); - checkCompletedWithWrappedCFException(h0, ex); - checkCompletedWithWrappedCFException(h1, ex); - checkCompletedWithWrappedCFException(h2, ex); - checkCompletedWithWrappedCFException(h3, ex); - checkCompletedWithWrappedCFException(h4, ex); + checkCompletedWithWrappedException(h0, ex); + checkCompletedWithWrappedException(h1, ex); + checkCompletedWithWrappedException(h2, ex); + checkCompletedWithWrappedException(h3, ex); + checkCompletedWithWrappedException(h4, ex); for (int i = 0; i < 4; i++) rs[i].assertNotInvoked(); }} + public void testRunAfterEither_exceptionalCompletion2() { + for (ExecutionMode m : ExecutionMode.values()) + for (boolean fFirst : new boolean[] { true, false }) + for (Integer v1 : new Integer[] { 1, null }) + { + 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); + + final CompletableFuture h0 = m.runAfterEither(f, g, rs[0]); + final CompletableFuture h1 = m.runAfterEither(g, f, rs[1]); + assertTrue( fFirst ? f.complete(v1) : g.completeExceptionally(ex)); + assertTrue(!fFirst ? f.complete(v1) : g.completeExceptionally(ex)); + final CompletableFuture h2 = m.runAfterEither(f, g, rs[2]); + final CompletableFuture h3 = m.runAfterEither(g, f, rs[3]); + + // unspecified behavior - both source completions available + try { + assertEquals(null, h0.join()); + rs[0].assertInvoked(); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h0, ex); + rs[0].assertNotInvoked(); + } + try { + assertEquals(null, h1.join()); + rs[1].assertInvoked(); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h1, ex); + rs[1].assertNotInvoked(); + } + try { + assertEquals(null, h2.join()); + rs[2].assertInvoked(); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h2, ex); + rs[2].assertNotInvoked(); + } + try { + assertEquals(null, h3.join()); + rs[3].assertInvoked(); + } catch (CompletionException ok) { + checkCompletedWithWrappedException(h3, ex); + rs[3].assertNotInvoked(); + } + + checkCompletedNormally(f, v1); + checkCompletedExceptionally(g, ex); + }} + /** * runAfterEither result completes exceptionally if either source cancelled */ @@ -2281,7 +2660,7 @@ public class CompletableFutureTest exten checkCompletedWithWrappedCancellationException(h2); checkCompletedWithWrappedCancellationException(h3); - g.complete(v1); + assertTrue(g.complete(v1)); // unspecified behavior - both source completions available final CompletableFuture h4 = m.runAfterEither(f, g, rs[4]); @@ -2325,7 +2704,7 @@ public class CompletableFutureTest exten final CompletableFuture h0 = m.runAfterEither(f, g, rs[0]); final CompletableFuture h1 = m.runAfterEither(g, f, rs[1]); - f.complete(v1); + assertTrue(f.complete(v1)); final CompletableFuture h2 = m.runAfterEither(f, g, rs[2]); final CompletableFuture h3 = m.runAfterEither(g, f, rs[3]); checkCompletedWithWrappedCFException(h0); @@ -2333,7 +2712,7 @@ public class CompletableFutureTest exten checkCompletedWithWrappedCFException(h2); checkCompletedWithWrappedCFException(h3); for (int i = 0; i < 4; i++) rs[i].assertInvoked(); - g.complete(v2); + assertTrue(g.complete(v2)); final CompletableFuture h4 = m.runAfterEither(f, g, rs[4]); final CompletableFuture h5 = m.runAfterEither(g, f, rs[5]); checkCompletedWithWrappedCFException(h4); @@ -2354,13 +2733,13 @@ public class CompletableFutureTest exten { final CompletableFuture f = new CompletableFuture<>(); final CompletableFutureInc r = new CompletableFutureInc(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenCompose(f, r); - if (createIncomplete) f.complete(v1); + if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(v1); }} /** @@ -2378,8 +2757,8 @@ public class CompletableFutureTest exten final CompletableFuture g = m.thenCompose(f, r); if (createIncomplete) f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -2394,9 +2773,9 @@ public class CompletableFutureTest exten final CompletableFuture f = new CompletableFuture<>(); final FailingCompletableFutureFunction r = new FailingCompletableFutureFunction(m); - if (!createIncomplete) f.complete(v1); + if (!createIncomplete) assertTrue(f.complete(v1)); final CompletableFuture g = m.thenCompose(f, r); - if (createIncomplete) f.complete(v1); + if (createIncomplete) assertTrue(f.complete(v1)); checkCompletedWithWrappedCFException(g); checkCompletedNormally(f, v1); @@ -2635,141 +3014,22 @@ public class CompletableFutureTest exten assertSame(f, f.toCompletableFuture()); } - /** - * whenComplete action executes on normal completion, propagating - * source result. - */ - public void testWhenComplete_normalCompletion1() { - 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 CompletableFuture f = new CompletableFuture<>(); - if (!createIncomplete) f.complete(v1); - final CompletableFuture g = m.whenComplete - (f, - (Integer x, Throwable t) -> { - threadAssertSame(x, v1); - threadAssertNull(t); - a.getAndIncrement(); - }); - if (createIncomplete) f.complete(v1); - - checkCompletedNormally(g, v1); - checkCompletedNormally(f, v1); - assertEquals(1, a.get()); - }} - - /** - * whenComplete action executes on exceptional completion, propagating - * source result. - */ - 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(); - final CompletableFuture f = new CompletableFuture<>(); - if (!createIncomplete) f.completeExceptionally(ex); - final CompletableFuture g = m.whenComplete - (f, - (Integer x, Throwable t) -> { - threadAssertNull(x); - threadAssertSame(t, ex); - a.getAndIncrement(); - }); - if (createIncomplete) f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(f, ex); - checkCompletedWithWrappedCFException(g, ex); - assertEquals(1, a.get()); - }} - - /** - * whenComplete action executes on cancelled source, propagating - * CancellationException. - */ - public void testWhenComplete_sourceCancelled() { - for (ExecutionMode m : ExecutionMode.values()) - 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<>(); - if (!createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - final CompletableFuture g = m.whenComplete - (f, - (Integer x, Throwable t) -> { - threadAssertNull(x); - threadAssertTrue(t instanceof CancellationException); - a.getAndIncrement(); - }); - if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning)); - - //try { g.join(); } catch (Throwable t) { throw new Error(t); } - checkCompletedWithWrappedCancellationException(g); - checkCancelled(f); - assertEquals(1, a.get()); - }} - - /** - * If a whenComplete action throws an exception when triggered by - * a normal completion, it completes exceptionally - */ - public void testWhenComplete_actionFailed() { - 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 ex = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); - if (!createIncomplete) f.complete(v1); - final CompletableFuture g = m.whenComplete - (f, - (Integer x, Throwable t) -> { - threadAssertSame(x, v1); - threadAssertNull(t); - a.getAndIncrement(); - throw ex; - }); - if (createIncomplete) f.complete(v1); - checkCompletedNormally(f, v1); - checkCompletedWithWrappedCFException(g, ex); - assertEquals(1, a.get()); - }} - - /** - * If a whenComplete action throws an exception when triggered by - * a source completion that also throws an exception, the source - * exception takes precedence. - */ - 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(); - final CFException ex2 = new CFException(); - final CompletableFuture f = new CompletableFuture<>(); - - if (!createIncomplete) f.completeExceptionally(ex1); - final CompletableFuture g = m.whenComplete - (f, - (Integer x, Throwable t) -> { - threadAssertSame(t, ex1); - threadAssertNull(x); - a.getAndIncrement(); - throw ex2; - }); - if (createIncomplete) f.completeExceptionally(ex1); - - checkCompletedWithWrappedCFException(f, ex1); - checkCompletedWithWrappedCFException(g, ex1); - assertEquals(1, a.get()); - }} +// public void testRunAfterEither_resultDeterminedAtTimeOfCreation() { +// for (ExecutionMode m : ExecutionMode.values()) +// for (boolean mayInterruptIfRunning : new boolean[] { true, false }) +// for (Integer v1 : new Integer[] { 1, null }) +// { +// final CompletableFuture f = new CompletableFuture<>(); +// final CompletableFuture g = new CompletableFuture<>(); +// final Noop[] rs = new Noop[2]; +// for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m); +// f.complete(v1); +// final CompletableFuture h0 = m.runAfterEither(f, g, rs[0]); +// final CompletableFuture h1 = m.runAfterEither(g, f, rs[1]); +// assertTrue(g.cancel(mayInterruptIfRunning)); +// checkCompletedNormally(h0, null); +// checkCompletedNormally(h1, null); +// for (Noop r : rs) r.assertInvoked(); +// }} }