ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/CompletableFutureTest.java
(Generate patch)

Comparing jsr166/src/test/tck/CompletableFutureTest.java (file contents):
Revision 1.6 by jsr166, Fri Mar 22 16:10:19 2013 UTC vs.
Revision 1.15 by jsr166, Wed Apr 3 16:59:57 2013 UTC

# Line 53 | Line 53 | public class CompletableFutureTest exten
53          catch (Throwable fail) { threadUnexpectedException(fail); }
54      }
55  
56 <    void checkCompletedNormally(CompletableFuture<?> f, Object value) {
56 >    <T> void checkCompletedNormally(CompletableFuture<T> f, T value) {
57          try {
58              assertEquals(value, f.join());
59          } catch (Throwable fail) { threadUnexpectedException(fail); }
# Line 75 | Line 75 | public class CompletableFutureTest exten
75          try {
76              f.join();
77              shouldThrow();
78 <        } catch (Throwable ex) {
79 <            assertTrue(ex instanceof CompletionException &&
80 <                       ((CompletionException)ex).getCause() instanceof CFException);
78 >        } catch (CompletionException success) {
79 >            assertTrue(success.getCause() instanceof CFException);
80          }
81          try {
82              f.getNow(null);
83              shouldThrow();
84 <        } catch (Throwable ex) {
85 <            assertTrue(ex instanceof CompletionException &&
87 <                       ((CompletionException)ex).getCause() instanceof CFException);
84 >        } catch (CompletionException success) {
85 >            assertTrue(success.getCause() instanceof CFException);
86          }
87          try {
88              f.get();
89              shouldThrow();
90 <        } catch (Throwable ex) {
91 <            assertTrue(ex instanceof ExecutionException &&
92 <                       ((ExecutionException)ex).getCause() instanceof CFException);
95 <        }
90 >        } catch (ExecutionException success) {
91 >            assertTrue(success.getCause() instanceof CFException);
92 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
93          try {
94              f.get(0L, SECONDS);
95              shouldThrow();
96 <        } catch (Throwable ex) {
97 <            assertTrue(ex instanceof ExecutionException &&
98 <                       ((ExecutionException)ex).getCause() instanceof CFException);
102 <        }
96 >        } catch (ExecutionException success) {
97 >            assertTrue(success.getCause() instanceof CFException);
98 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
99          assertTrue(f.isDone());
100          assertFalse(f.isCancelled());
101 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
102      }
103  
104      void checkCancelled(CompletableFuture<?> f) {
105          try {
106              f.join();
107              shouldThrow();
108 <        } catch (Throwable ex) {
112 <            assertTrue(ex instanceof CancellationException);
113 <        }
108 >        } catch (CancellationException success) {}
109          try {
110              f.getNow(null);
111              shouldThrow();
112 <        } catch (Throwable ex) {
118 <            assertTrue(ex instanceof CancellationException);
119 <        }
112 >        } catch (CancellationException success) {}
113          try {
114              f.get();
115              shouldThrow();
116 <        } catch (Throwable ex) {
117 <            assertTrue(ex instanceof CancellationException);
125 <        }
116 >        } catch (CancellationException success) {
117 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
118          try {
119              f.get(0L, SECONDS);
120              shouldThrow();
121 <        } catch (Throwable ex) {
122 <            assertTrue(ex instanceof CancellationException);
131 <        }
121 >        } catch (CancellationException success) {
122 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
123          assertTrue(f.isDone());
124          assertTrue(f.isCancelled());
125 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
126      }
127  
128      void checkCompletedWithWrappedCancellationException(CompletableFuture<?> f) {
129          try {
130              f.join();
131              shouldThrow();
132 <        } catch (Throwable ex) {
133 <            assertTrue(ex instanceof CompletionException &&
142 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
132 >        } catch (CompletionException success) {
133 >            assertTrue(success.getCause() instanceof CancellationException);
134          }
135          try {
136              f.getNow(null);
137              shouldThrow();
138 <        } catch (Throwable ex) {
139 <            assertTrue(ex instanceof CompletionException &&
149 <                       ((CompletionException)ex).getCause() instanceof CancellationException);
138 >        } catch (CompletionException success) {
139 >            assertTrue(success.getCause() instanceof CancellationException);
140          }
141          try {
142              f.get();
143              shouldThrow();
144 <        } catch (Throwable ex) {
145 <            assertTrue(ex instanceof ExecutionException &&
146 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
157 <        }
144 >        } catch (ExecutionException success) {
145 >            assertTrue(success.getCause() instanceof CancellationException);
146 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
147          try {
148              f.get(0L, SECONDS);
149              shouldThrow();
150 <        } catch (Throwable ex) {
151 <            assertTrue(ex instanceof ExecutionException &&
152 <                       ((ExecutionException)ex).getCause() instanceof CancellationException);
164 <        }
150 >        } catch (ExecutionException success) {
151 >            assertTrue(success.getCause() instanceof CancellationException);
152 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
153          assertTrue(f.isDone());
154          assertFalse(f.isCancelled());
155 +        assertTrue(f.toString().contains("[Completed exceptionally]"));
156      }
157  
158      /**
# Line 285 | Line 274 | public class CompletableFutureTest exten
274          assertTrue(f.toString().contains("[Completed exceptionally]"));
275      }
276  
277 +    /**
278 +     * completedFuture returns a completed CompletableFuture with given value
279 +     */
280 +    public void testCompletedFuture() {
281 +        CompletableFuture<String> f = CompletableFuture.completedFuture("test");
282 +        checkCompletedNormally(f, "test");
283 +    }
284 +
285      static final Supplier<Integer> supplyOne =
286          () -> Integer.valueOf(1);
287      static final Function<Integer, Integer> inc =
# Line 358 | Line 355 | public class CompletableFutureTest exten
355      }
356  
357      static final class IntegerHandler implements BiFunction<Integer, Throwable, Integer> {
358 +        boolean ran;
359          public Integer apply(Integer x, Throwable t) {
360 +            ran = true;
361              return (t == null) ? two : three;
362          }
363      }
# Line 387 | Line 386 | public class CompletableFutureTest exten
386       * normal or exceptional completion of source
387       */
388      public void testHandle() {
389 <        CompletableFuture<Integer> f = new CompletableFuture<Integer>();
390 <        IntegerHandler r = new IntegerHandler();
391 <        CompletableFuture<Integer> g = f.handle(r);
389 >        CompletableFuture<Integer> f, g;
390 >        IntegerHandler r;
391 >
392 >        f = new CompletableFuture<Integer>();
393          f.completeExceptionally(new CFException());
394 +        g = f.handle(r = new IntegerHandler());
395 +        assertTrue(r.ran);
396          checkCompletedNormally(g, three);
397  
398          f = new CompletableFuture<Integer>();
399 <        r = new IntegerHandler();
400 <        g = f.handle(r);
399 >        g = f.handle(r = new IntegerHandler());
400 >        assertFalse(r.ran);
401 >        f.completeExceptionally(new CFException());
402 >        checkCompletedNormally(g, three);
403 >        assertTrue(r.ran);
404 >
405 >        f = new CompletableFuture<Integer>();
406 >        f.complete(one);
407 >        g = f.handle(r = new IntegerHandler());
408 >        assertTrue(r.ran);
409 >        checkCompletedNormally(g, two);
410 >
411 >        f = new CompletableFuture<Integer>();
412 >        g = f.handle(r = new IntegerHandler());
413 >        assertFalse(r.ran);
414          f.complete(one);
415 +        assertTrue(r.ran);
416          checkCompletedNormally(g, two);
417      }
418  
# Line 408 | Line 424 | public class CompletableFutureTest exten
424          CompletableFuture<Void> f = CompletableFuture.runAsync(r);
425          assertNull(f.join());
426          assertTrue(r.ran);
427 +        checkCompletedNormally(f, null);
428      }
429  
430      /**
# Line 418 | Line 435 | public class CompletableFutureTest exten
435          CompletableFuture<Void> f = CompletableFuture.runAsync(r, new ThreadExecutor());
436          assertNull(f.join());
437          assertTrue(r.ran);
438 +        checkCompletedNormally(f, null);
439      }
440  
441      /**
# Line 456 | Line 474 | public class CompletableFutureTest exten
474          assertTrue(r.ran);
475      }
476  
477 <    // seq conmpletion methods
477 >    // seq completion methods
478  
479      /**
480       * thenRun result completes normally after normal completion of source
# Line 1671 | Line 1689 | public class CompletableFutureTest exten
1689      }
1690  
1691      /**
1692 <     * thenCompse result completes normally after normal completion of source
1692 >     * thenComposeAsync result completes normally after normal
1693 >     * completion of source
1694       */
1695      public void testThenComposeAsync() {
1696          CompletableFuture<Integer> f = new CompletableFuture<Integer>();
# Line 1682 | Line 1701 | public class CompletableFutureTest exten
1701      }
1702  
1703      /**
1704 <     * thenComposeAsync result completes exceptionally after exceptional
1705 <     * completion of source
1704 >     * thenComposeAsync result completes exceptionally after
1705 >     * exceptional completion of source
1706       */
1707      public void testThenComposeAsync2() {
1708          CompletableFuture<Integer> f = new CompletableFuture<Integer>();
# Line 1716 | Line 1735 | public class CompletableFutureTest exten
1735      }
1736  
1737  
1738 <    // aaync with explicit executors
1738 >    // async with explicit executors
1739  
1740      /**
1741       * thenRunAsync result completes normally after normal completion of source
# Line 2293 | Line 2312 | public class CompletableFutureTest exten
2312      }
2313  
2314      /**
2315 <     * thenCompse result completes normally after normal completion of source
2315 >     * thenComposeAsync result completes normally after normal
2316 >     * completion of source
2317       */
2318      public void testThenComposeAsyncE() {
2319          CompletableFuture<Integer> f = new CompletableFuture<Integer>();
# Line 2304 | Line 2324 | public class CompletableFutureTest exten
2324      }
2325  
2326      /**
2327 <     * thenComposeAsync result completes exceptionally after exceptional
2328 <     * completion of source
2327 >     * thenComposeAsync result completes exceptionally after
2328 >     * exceptional completion of source
2329       */
2330      public void testThenComposeAsync2E() {
2331          CompletableFuture<Integer> f = new CompletableFuture<Integer>();
# Line 2356 | Line 2376 | public class CompletableFutureTest exten
2376              CompletableFuture[] fs = new CompletableFuture[k];
2377              for (int i = 0; i < k; ++i)
2378                  fs[i] = new CompletableFuture<Integer>();
2379 <            CompletableFuture<?> f = CompletableFuture.allOf(fs);
2379 >            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2380              for (int i = 0; i < k; ++i) {
2381                  checkIncomplete(f);
2382                  fs[i].complete(one);
2383              }
2384 <            assertTrue(f.isDone());
2365 <            assertFalse(f.isCancelled());
2384 >            checkCompletedNormally(f, null);
2385          }
2386      }
2387  
# Line 2375 | Line 2394 | public class CompletableFutureTest exten
2394      }
2395  
2396      /**
2397 <     * allOf returns a future completed when any components complete
2397 >     * anyOf returns a future completed when any components complete
2398       */
2399      public void testAnyOf() throws Exception {
2400          for (int k = 1; k < 20; ++k) {
2401              CompletableFuture[] fs = new CompletableFuture[k];
2402              for (int i = 0; i < k; ++i)
2403                  fs[i] = new CompletableFuture<Integer>();
2404 <            CompletableFuture<?> f = CompletableFuture.anyOf(fs);
2404 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
2405              checkIncomplete(f);
2406              for (int i = 0; i < k; ++i) {
2407                  fs[i].complete(one);
2408 <                assertTrue(f.isDone());
2408 >                checkCompletedNormally(f, one);
2409              }
2410          }
2411      }
# Line 2397 | Line 2416 | public class CompletableFutureTest exten
2416      public void testNPE() {
2417          CompletableFuture<Integer> f = new CompletableFuture<Integer>();
2418          CompletableFuture<Integer> g = new CompletableFuture<Integer>();
2419 <        CompletableFuture h;
2420 <        try { h = f.thenApply(null); } catch (NullPointerException ok) {}
2421 <        try { h = f.thenAccept(null); } catch (NullPointerException ok) {}
2422 <        try { h = f.thenRun(null); } catch (NullPointerException ok) {}
2423 <        try { h = f.thenCombine(g, null); } catch (NullPointerException ok) {}
2424 <        try { h = f.thenCombine(null, null); } catch (NullPointerException ok) {}
2425 <        try { h = f.applyToEither(g, null); } catch (NullPointerException ok) {}
2426 <        try { h = f.applyToEither(null, null); } catch (NullPointerException ok) {}
2427 <        try { h = f.thenAcceptBoth(g, null); } catch (NullPointerException ok) {}
2428 <        try { h = f.thenAcceptBoth(null, null); } catch (NullPointerException ok) {}
2429 <        try { h = f.runAfterEither(g, null); } catch (NullPointerException ok) {}
2430 <        try { h = f.runAfterEither(null, null); } catch (NullPointerException ok) {}
2431 <        try { h = f.runAfterBoth(g, null); } catch (NullPointerException ok) {}
2432 <        try { h = f.runAfterBoth(null, null); } catch (NullPointerException ok) {}
2433 <        try { h = f.exceptionally(null); } catch (NullPointerException ok) {}
2434 <        try { h = f.handle(null); } catch (NullPointerException ok) {}
2435 <        try { h = f.thenCompose(null); } catch (NullPointerException ok) {}
2436 <
2437 <        try { h = f.thenApplyAsync(null); } catch (NullPointerException ok) {}
2438 <        try { h = f.thenAcceptAsync(null); } catch (NullPointerException ok) {}
2439 <        try { h = f.thenRunAsync(null); } catch (NullPointerException ok) {}
2440 <        try { h = f.thenCombineAsync(g, null); } catch (NullPointerException ok) {}
2441 <        try { h = f.thenCombineAsync(null, null); } catch (NullPointerException ok) {}
2442 <        try { h = f.applyToEitherAsync(g, null); } catch (NullPointerException ok) {}
2443 <        try { h = f.applyToEitherAsync(null, null); } catch (NullPointerException ok) {}
2444 <        try { h = f.thenAcceptBothAsync(g, null); } catch (NullPointerException ok) {}
2445 <        try { h = f.thenAcceptBothAsync(null, null); } catch (NullPointerException ok) {}
2446 <        try { h = f.runAfterEitherAsync(g, null); } catch (NullPointerException ok) {}
2447 <        try { h = f.runAfterEitherAsync(null, null); } catch (NullPointerException ok) {}
2448 <        try { h = f.runAfterBothAsync(g, null); } catch (NullPointerException ok) {}
2449 <        try { h = f.runAfterBothAsync(null, null); } catch (NullPointerException ok) {}
2419 >        CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
2420 >        CompletableFuture<?> h;
2421 >        Executor exec = new ThreadExecutor();
2422 >
2423 >        Runnable[] throwingActions = {
2424 >            () -> { CompletableFuture.supplyAsync(null); },
2425 >            () -> { CompletableFuture.supplyAsync(null, exec); },
2426 >            () -> { CompletableFuture.supplyAsync(() -> one, null); },
2427 >
2428 >            () -> { CompletableFuture.runAsync(null); },
2429 >            () -> { CompletableFuture.runAsync(null, exec); },
2430 >            () -> { CompletableFuture.runAsync(() -> {}, null); },
2431 >
2432 >            () -> { f.completeExceptionally(null); },
2433 >
2434 >            () -> { f.thenApply(null); },
2435 >            () -> { f.thenApplyAsync(null); },
2436 >            () -> { f.thenApplyAsync((x) -> x, null); },
2437 >            () -> { f.thenApplyAsync(null, exec); },
2438 >
2439 >            () -> { f.thenAccept(null); },
2440 >            () -> { f.thenAcceptAsync(null); },
2441 >            () -> { f.thenAcceptAsync((x) -> { ; }, null); },
2442 >            () -> { f.thenAcceptAsync(null, exec); },
2443 >
2444 >            () -> { f.thenRun(null); },
2445 >            () -> { f.thenRunAsync(null); },
2446 >            () -> { f.thenRunAsync(() -> { ; }, null); },
2447 >            () -> { f.thenRunAsync(null, exec); },
2448 >
2449 >            () -> { f.thenCombine(g, null); },
2450 >            () -> { f.thenCombineAsync(g, null); },
2451 >            () -> { f.thenCombineAsync(g, null, exec); },
2452 >            () -> { f.thenCombine(nullFuture, (x, y) -> x); },
2453 >            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x); },
2454 >            () -> { f.thenCombineAsync(nullFuture, (x, y) -> x, exec); },
2455 >            () -> { f.thenCombineAsync(g, (x, y) -> x, null); },
2456 >
2457 >            () -> { f.thenAcceptBoth(g, null); },
2458 >            () -> { f.thenAcceptBothAsync(g, null); },
2459 >            () -> { f.thenAcceptBothAsync(g, null, exec); },
2460 >            () -> { f.thenAcceptBoth(nullFuture, (x, y) -> {}); },
2461 >            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}); },
2462 >            () -> { f.thenAcceptBothAsync(nullFuture, (x, y) -> {}, exec); },
2463 >            () -> { f.thenAcceptBothAsync(g, (x, y) -> {}, null); },
2464 >
2465 >            () -> { f.runAfterBoth(g, null); },
2466 >            () -> { f.runAfterBothAsync(g, null); },
2467 >            () -> { f.runAfterBothAsync(g, null, exec); },
2468 >            () -> { f.runAfterBoth(nullFuture, () -> {}); },
2469 >            () -> { f.runAfterBothAsync(nullFuture, () -> {}); },
2470 >            () -> { f.runAfterBothAsync(nullFuture, () -> {}, exec); },
2471 >            () -> { f.runAfterBothAsync(g, () -> {}, null); },
2472 >
2473 >            () -> { f.applyToEither(g, null); },
2474 >            () -> { f.applyToEitherAsync(g, null); },
2475 >            () -> { f.applyToEitherAsync(g, null, exec); },
2476 >            () -> { f.applyToEither(nullFuture, (x) -> x); },
2477 >            () -> { f.applyToEitherAsync(nullFuture, (x) -> x); },
2478 >            () -> { f.applyToEitherAsync(nullFuture, (x) -> x, exec); },
2479 >            () -> { f.applyToEitherAsync(g, (x) -> x, null); },
2480 >
2481 >            () -> { f.acceptEither(g, null); },
2482 >            () -> { f.acceptEitherAsync(g, null); },
2483 >            () -> { f.acceptEitherAsync(g, null, exec); },
2484 >            () -> { f.acceptEither(nullFuture, (x) -> {}); },
2485 >            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}); },
2486 >            () -> { f.acceptEitherAsync(nullFuture, (x) -> {}, exec); },
2487 >            () -> { f.acceptEitherAsync(g, (x) -> {}, null); },
2488 >
2489 >            () -> { f.runAfterEither(g, null); },
2490 >            () -> { f.runAfterEitherAsync(g, null); },
2491 >            () -> { f.runAfterEitherAsync(g, null, exec); },
2492 >            () -> { f.runAfterEither(nullFuture, () -> {}); },
2493 >            () -> { f.runAfterEitherAsync(nullFuture, () -> {}); },
2494 >            () -> { f.runAfterEitherAsync(nullFuture, () -> {}, exec); },
2495 >            () -> { f.runAfterEitherAsync(g, () -> {}, null); },
2496 >
2497 >            () -> { f.thenCompose(null); },
2498 >            () -> { f.thenComposeAsync(null); },
2499 >            () -> { f.thenComposeAsync(new CompletableFutureInc(), null); },
2500 >            () -> { f.thenComposeAsync(null, exec); },
2501 >
2502 >            () -> { f.exceptionally(null); },
2503 >
2504 >            () -> { f.handle(null); },
2505 >
2506 >            () -> { CompletableFuture.allOf((CompletableFuture<?>)null); },
2507 >            () -> { CompletableFuture.allOf((CompletableFuture<?>[])null); },
2508 >            () -> { CompletableFuture.allOf(f, null); },
2509 >            () -> { CompletableFuture.allOf(null, f); },
2510 >
2511 >            () -> { CompletableFuture.anyOf((CompletableFuture<?>)null); },
2512 >            () -> { CompletableFuture.anyOf((CompletableFuture<?>[])null); },
2513 >            () -> { CompletableFuture.anyOf(f, null); },
2514 >            () -> { CompletableFuture.anyOf(null, f); },
2515 >
2516 >            // TODO: Crashes javac with lambda-8-2013-03-31...
2517 >            //() -> { CompletableFuture<?> x = f.thenAccept(null); },
2518 >            //() -> { CompletableFuture<Void> x = f.thenRun(null); },
2519 >            //() -> { CompletableFuture<Integer> x = f.thenApply(() -> { ; }); },
2520 >        };
2521  
2522 +        assertThrows(NullPointerException.class, throwingActions);
2523      }
2524  
2434
2525   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines