--- jsr166/src/test/tck/CompletableFutureTest.java 2014/06/06 19:39:50 1.69 +++ jsr166/src/test/tck/CompletableFutureTest.java 2014/06/06 21:11:10 1.73 @@ -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,22 +283,35 @@ 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 @@ -852,7 +887,7 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.completeExceptionally(ex1); - checkCompletedWithWrappedCFException(g, ex2); + checkCompletedWithWrappedException(g, ex2); assertEquals(1, a.get()); }} @@ -909,7 +944,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 +1000,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 +1025,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 +1139,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1171,7 +1206,7 @@ public class CompletableFutureTest exten checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(inc(v1)); }} /** @@ -1192,8 +1227,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1280,8 +1315,8 @@ public class CompletableFutureTest exten f.completeExceptionally(ex); } - checkCompletedWithWrappedCFException(g, ex); - checkCompletedWithWrappedCFException(f, ex); + checkCompletedWithWrappedException(g, ex); + checkCompletedExceptionally(f, ex); r.assertNotInvoked(); }} @@ -1356,7 +1391,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 +1418,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 +1535,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 +1652,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); }} /** @@ -1752,12 +1787,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 +1802,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 +1851,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); }} /** @@ -2071,12 +2106,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); @@ -2087,24 +2122,24 @@ 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(); }} @@ -2136,33 +2171,33 @@ public class CompletableFutureTest exten assertEquals(null, h0.join()); rs[0].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h0, ex); + checkCompletedWithWrappedException(h0, ex); rs[0].assertNotInvoked(); } try { assertEquals(null, h1.join()); rs[1].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h1, ex); + checkCompletedWithWrappedException(h1, ex); rs[1].assertNotInvoked(); } try { assertEquals(null, h2.join()); rs[2].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h2, ex); + checkCompletedWithWrappedException(h2, ex); rs[2].assertNotInvoked(); } try { assertEquals(null, h3.join()); rs[3].assertValue(v1); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h3, ex); rs[3].assertNotInvoked(); } checkCompletedNormally(f, v1); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedExceptionally(g, ex); }} /** @@ -2331,12 +2366,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); @@ -2347,24 +2382,24 @@ 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(); }} @@ -2396,33 +2431,33 @@ public class CompletableFutureTest exten assertEquals(null, h0.join()); rs[0].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h0, ex); + checkCompletedWithWrappedException(h0, ex); rs[0].assertNotInvoked(); } try { assertEquals(null, h1.join()); rs[1].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h1, ex); + checkCompletedWithWrappedException(h1, ex); rs[1].assertNotInvoked(); } try { assertEquals(null, h2.join()); rs[2].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h2, ex); + checkCompletedWithWrappedException(h2, ex); rs[2].assertNotInvoked(); } try { assertEquals(null, h3.join()); rs[3].assertInvoked(); } catch (CompletionException ok) { - checkCompletedWithWrappedCFException(h3, ex); + checkCompletedWithWrappedException(h3, ex); rs[3].assertNotInvoked(); } checkCompletedNormally(f, v1); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedExceptionally(g, ex); }} /** @@ -2531,7 +2566,7 @@ public class CompletableFutureTest exten checkCompletedNormally(g, inc(v1)); checkCompletedNormally(f, v1); - r.assertInvoked(); + r.assertValue(v1); }} /** @@ -2549,8 +2584,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(); }} @@ -2821,6 +2856,7 @@ public class CompletableFutureTest exten final CompletableFuture g = m.whenComplete (f, (Integer x, Throwable t) -> { + m.checkExecutionMode(); threadAssertSame(x, v1); threadAssertNull(t); a.getAndIncrement(); @@ -2848,13 +2884,14 @@ public class CompletableFutureTest exten final CompletableFuture g = m.whenComplete (f, (Integer x, Throwable t) -> { + m.checkExecutionMode(); threadAssertNull(x); threadAssertSame(t, ex); a.getAndIncrement(); }); if (createIncomplete) f.completeExceptionally(ex); - checkCompletedWithWrappedCFException(f, ex); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedExceptionally(f, ex); + checkCompletedWithWrappedException(g, ex); assertEquals(1, a.get()); }} @@ -2873,13 +2910,13 @@ public class CompletableFutureTest exten 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)); - //try { g.join(); } catch (Throwable t) { throw new Error(t); } checkCompletedWithWrappedCancellationException(g); checkCancelled(f); assertEquals(1, a.get()); @@ -2901,6 +2938,7 @@ public class CompletableFutureTest exten final CompletableFuture g = m.whenComplete (f, (Integer x, Throwable t) -> { + m.checkExecutionMode(); threadAssertSame(x, v1); threadAssertNull(t); a.getAndIncrement(); @@ -2908,7 +2946,7 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.complete(v1); checkCompletedNormally(f, v1); - checkCompletedWithWrappedCFException(g, ex); + checkCompletedWithWrappedException(g, ex); assertEquals(1, a.get()); }} @@ -2931,6 +2969,7 @@ public class CompletableFutureTest exten final CompletableFuture g = m.whenComplete (f, (Integer x, Throwable t) -> { + m.checkExecutionMode(); threadAssertSame(t, ex1); threadAssertNull(x); a.getAndIncrement(); @@ -2938,8 +2977,8 @@ public class CompletableFutureTest exten }); if (createIncomplete) f.completeExceptionally(ex1); - checkCompletedWithWrappedCFException(f, ex1); - checkCompletedWithWrappedCFException(g, ex1); + checkCompletedExceptionally(f, ex1); + checkCompletedWithWrappedException(g, ex1); assertEquals(1, a.get()); }}