--- jsr166/src/test/tck/CompletableFutureTest.java 2014/06/06 19:19:04 1.66 +++ jsr166/src/test/tck/CompletableFutureTest.java 2014/06/07 21:46:50 1.77 @@ -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); @@ -218,9 +239,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); } /** @@ -261,39 +283,57 @@ 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); + 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); + f.complete(v1); + checkCompletedExceptionally(f, ex); + }} /** * getNumberOfDependents returns number of dependent tasks */ public void testGetNumberOfDependents() { + for (ExecutionMode m : ExecutionMode.values()) + { 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()); + assertEquals(0, h.getNumberOfDependents()); f.complete(1); checkCompletedNormally(g, null); + checkCompletedNormally(h, null); assertEquals(0, f.getNumberOfDependents()); assertEquals(0, g.getNumberOfDependents()); - } + assertEquals(0, h.getNumberOfDependents()); + }} /** * toString indicates current completion state @@ -310,6 +350,12 @@ public class CompletableFutureTest exten f = new CompletableFuture(); f.completeExceptionally(new IndexOutOfBoundsException()); assertTrue(f.toString().contains("[Completed exceptionally]")); + + for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { + f = new CompletableFuture(); + f.cancel(mayInterruptIfRunning); + assertTrue(f.toString().contains("[Completed exceptionally]")); + } } /** @@ -808,7 +854,6 @@ public class CompletableFutureTest exten assertEquals(0, a.get()); }} - /** * exceptionally action completes with function value on source * exception @@ -852,7 +897,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) f.complete(v1); + final CompletableFuture g = m.whenComplete + (f, + (Integer x, Throwable t) -> { + m.checkExecutionMode(); + 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) -> { + 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) 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) 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()); }} @@ -909,7 +1097,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 +1153,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()); }} @@ -990,7 +1178,7 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.complete(v1); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedWithWrappedException(g, ex); checkCompletedNormally(f, v1); assertEquals(1, a.get()); }} @@ -1104,8 +1292,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1171,7 +1359,7 @@ public class CompletableFutureTest exten checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(inc(v1)); }} /** @@ -1192,8 +1380,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1280,8 +1468,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1356,7 +1544,7 @@ public class CompletableFutureTest exten checkCompletedNormally(h, subtract(v1, v2)); checkCompletedNormally(f, v1); checkCompletedNormally(g, v2); - r.assertInvoked(); + r.assertValue(subtract(v1, v2)); }} /** @@ -1383,10 +1571,10 @@ public class CompletableFutureTest exten (!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); }} /** @@ -1500,10 +1688,10 @@ public class CompletableFutureTest exten (!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); }} /** @@ -1617,10 +1805,10 @@ public class CompletableFutureTest exten (!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,7 +1825,6 @@ public class CompletableFutureTest exten final CompletableFuture g = new CompletableFuture<>(); final Noop r = new Noop(m); - (fFirst ? f : g).complete(v1); if (!createIncomplete) assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning)); @@ -1752,12 +1939,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 +1954,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(); }} @@ -1816,33 +2003,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 +2087,63 @@ 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]); + if (fFirst) { + f.complete(v1); + g.cancel(mayInterruptIfRunning); + } else { + g.cancel(mayInterruptIfRunning); + f.complete(v1); + } + 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 +2258,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 +2274,84 @@ 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]); + if (fFirst) { + f.complete(v1); + g.completeExceptionally(ex); + } else { + g.completeExceptionally(ex); + f.complete(v1); + } + 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 */ @@ -2217,12 +2518,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.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); @@ -2233,27 +2534,84 @@ 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]); + if (fFirst) { + f.complete(v1); + g.completeExceptionally(ex); + } else { + g.completeExceptionally(ex); + f.complete(v1); + } + 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 */ @@ -2360,7 +2718,7 @@ public class CompletableFutureTest exten checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(v1); }} /** @@ -2378,8 +2736,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(); }} @@ -2635,141 +2993,4 @@ 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()); - }} - }