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.136 by jsr166, Sun Nov 15 20:17:11 2015 UTC vs.
Revision 1.152 by jsr166, Sun Jun 26 19:03:27 2016 UTC

# Line 30 | Line 30 | import java.util.concurrent.ExecutionExc
30   import java.util.concurrent.Executor;
31   import java.util.concurrent.ForkJoinPool;
32   import java.util.concurrent.ForkJoinTask;
33 + import java.util.concurrent.RejectedExecutionException;
34   import java.util.concurrent.TimeoutException;
35   import java.util.concurrent.TimeUnit;
36   import java.util.concurrent.atomic.AtomicInteger;
# Line 459 | Line 460 | public class CompletableFutureTest exten
460      class FailingSupplier extends CheckedAction
461          implements Supplier<Integer>
462      {
463 <        FailingSupplier(ExecutionMode m) { super(m); }
463 >        final CFException ex;
464 >        FailingSupplier(ExecutionMode m) { super(m); ex = new CFException(); }
465          public Integer get() {
466              invoked();
467 <            throw new CFException();
467 >            throw ex;
468          }
469      }
470  
471      class FailingConsumer extends CheckedIntegerAction
472          implements Consumer<Integer>
473      {
474 <        FailingConsumer(ExecutionMode m) { super(m); }
474 >        final CFException ex;
475 >        FailingConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
476          public void accept(Integer x) {
477              invoked();
478              value = x;
479 <            throw new CFException();
479 >            throw ex;
480          }
481      }
482  
483      class FailingBiConsumer extends CheckedIntegerAction
484          implements BiConsumer<Integer, Integer>
485      {
486 <        FailingBiConsumer(ExecutionMode m) { super(m); }
486 >        final CFException ex;
487 >        FailingBiConsumer(ExecutionMode m) { super(m); ex = new CFException(); }
488          public void accept(Integer x, Integer y) {
489              invoked();
490              value = subtract(x, y);
491 <            throw new CFException();
491 >            throw ex;
492          }
493      }
494  
495      class FailingFunction extends CheckedIntegerAction
496          implements Function<Integer, Integer>
497      {
498 <        FailingFunction(ExecutionMode m) { super(m); }
498 >        final CFException ex;
499 >        FailingFunction(ExecutionMode m) { super(m); ex = new CFException(); }
500          public Integer apply(Integer x) {
501              invoked();
502              value = x;
503 <            throw new CFException();
503 >            throw ex;
504          }
505      }
506  
507      class FailingBiFunction extends CheckedIntegerAction
508          implements BiFunction<Integer, Integer, Integer>
509      {
510 <        FailingBiFunction(ExecutionMode m) { super(m); }
510 >        final CFException ex;
511 >        FailingBiFunction(ExecutionMode m) { super(m); ex = new CFException(); }
512          public Integer apply(Integer x, Integer y) {
513              invoked();
514              value = subtract(x, y);
515 <            throw new CFException();
515 >            throw ex;
516          }
517      }
518  
519      class FailingRunnable extends CheckedAction implements Runnable {
520 <        FailingRunnable(ExecutionMode m) { super(m); }
520 >        final CFException ex;
521 >        FailingRunnable(ExecutionMode m) { super(m); ex = new CFException(); }
522          public void run() {
523              invoked();
524 <            throw new CFException();
524 >            throw ex;
525          }
526      }
527  
# Line 534 | Line 541 | public class CompletableFutureTest exten
541      class FailingCompletableFutureFunction extends CheckedIntegerAction
542          implements Function<Integer, CompletableFuture<Integer>>
543      {
544 <        FailingCompletableFutureFunction(ExecutionMode m) { super(m); }
544 >        final CFException ex;
545 >        FailingCompletableFutureFunction(ExecutionMode m) { super(m); ex = new CFException(); }
546          public CompletableFuture<Integer> apply(Integer x) {
547              invoked();
548              value = x;
549 <            throw new CFException();
549 >            throw ex;
550          }
551      }
552  
# Line 1040 | Line 1048 | public class CompletableFutureTest exten
1048  
1049          checkCompletedWithWrappedException(g, ex1);
1050          checkCompletedExceptionally(f, ex1);
1051 +        if (testImplementationDetails) {
1052 +            assertEquals(1, ex1.getSuppressed().length);
1053 +            assertSame(ex2, ex1.getSuppressed()[0]);
1054 +        }
1055          assertEquals(1, a.get());
1056      }}
1057  
# Line 1218 | Line 1230 | public class CompletableFutureTest exten
1230      {
1231          final FailingRunnable r = new FailingRunnable(m);
1232          final CompletableFuture<Void> f = m.runAsync(r);
1233 <        checkCompletedWithWrappedCFException(f);
1233 >        checkCompletedWithWrappedException(f, r.ex);
1234          r.assertInvoked();
1235      }}
1236  
# Line 1252 | Line 1264 | public class CompletableFutureTest exten
1264      {
1265          FailingSupplier r = new FailingSupplier(m);
1266          CompletableFuture<Integer> f = m.supplyAsync(r);
1267 <        checkCompletedWithWrappedCFException(f);
1267 >        checkCompletedWithWrappedException(f, r.ex);
1268          r.assertInvoked();
1269      }}
1270  
# Line 1374 | Line 1386 | public class CompletableFutureTest exten
1386          final CompletableFuture<Void> h4 = m.runAfterBoth(f, f, rs[4]);
1387          final CompletableFuture<Void> h5 = m.runAfterEither(f, f, rs[5]);
1388  
1389 <        checkCompletedWithWrappedCFException(h0);
1390 <        checkCompletedWithWrappedCFException(h1);
1391 <        checkCompletedWithWrappedCFException(h2);
1392 <        checkCompletedWithWrappedCFException(h3);
1393 <        checkCompletedWithWrappedCFException(h4);
1394 <        checkCompletedWithWrappedCFException(h5);
1389 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1390 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1391 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1392 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1393 >        checkCompletedWithWrappedException(h4, rs[4].ex);
1394 >        checkCompletedWithWrappedException(h5, rs[5].ex);
1395          checkCompletedNormally(f, v1);
1396      }}
1397  
# Line 1478 | Line 1490 | public class CompletableFutureTest exten
1490          final CompletableFuture<Integer> h2 = m.thenApply(f, rs[2]);
1491          final CompletableFuture<Integer> h3 = m.applyToEither(f, f, rs[3]);
1492  
1493 <        checkCompletedWithWrappedCFException(h0);
1494 <        checkCompletedWithWrappedCFException(h1);
1495 <        checkCompletedWithWrappedCFException(h2);
1496 <        checkCompletedWithWrappedCFException(h3);
1493 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1494 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1495 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1496 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1497          checkCompletedNormally(f, v1);
1498      }}
1499  
# Line 1580 | Line 1592 | public class CompletableFutureTest exten
1592          final CompletableFuture<Void> h2 = m.thenAccept(f, rs[2]);
1593          final CompletableFuture<Void> h3 = m.acceptEither(f, f, rs[3]);
1594  
1595 <        checkCompletedWithWrappedCFException(h0);
1596 <        checkCompletedWithWrappedCFException(h1);
1597 <        checkCompletedWithWrappedCFException(h2);
1598 <        checkCompletedWithWrappedCFException(h3);
1595 >        checkCompletedWithWrappedException(h0, rs[0].ex);
1596 >        checkCompletedWithWrappedException(h1, rs[1].ex);
1597 >        checkCompletedWithWrappedException(h2, rs[2].ex);
1598 >        checkCompletedWithWrappedException(h3, rs[3].ex);
1599          checkCompletedNormally(f, v1);
1600      }}
1601  
# Line 1745 | Line 1757 | public class CompletableFutureTest exten
1757          assertTrue(snd.complete(w2));
1758          final CompletableFuture<Integer> h3 = m.thenCombine(f, g, r3);
1759  
1760 <        checkCompletedWithWrappedCFException(h1);
1761 <        checkCompletedWithWrappedCFException(h2);
1762 <        checkCompletedWithWrappedCFException(h3);
1760 >        checkCompletedWithWrappedException(h1, r1.ex);
1761 >        checkCompletedWithWrappedException(h2, r2.ex);
1762 >        checkCompletedWithWrappedException(h3, r3.ex);
1763          r1.assertInvoked();
1764          r2.assertInvoked();
1765          r3.assertInvoked();
# Line 1909 | Line 1921 | public class CompletableFutureTest exten
1921          assertTrue(snd.complete(w2));
1922          final CompletableFuture<Void> h3 = m.thenAcceptBoth(f, g, r3);
1923  
1924 <        checkCompletedWithWrappedCFException(h1);
1925 <        checkCompletedWithWrappedCFException(h2);
1926 <        checkCompletedWithWrappedCFException(h3);
1924 >        checkCompletedWithWrappedException(h1, r1.ex);
1925 >        checkCompletedWithWrappedException(h2, r2.ex);
1926 >        checkCompletedWithWrappedException(h3, r3.ex);
1927          r1.assertInvoked();
1928          r2.assertInvoked();
1929          r3.assertInvoked();
# Line 2073 | Line 2085 | public class CompletableFutureTest exten
2085          assertTrue(snd.complete(w2));
2086          final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2087  
2088 <        checkCompletedWithWrappedCFException(h1);
2089 <        checkCompletedWithWrappedCFException(h2);
2090 <        checkCompletedWithWrappedCFException(h3);
2088 >        checkCompletedWithWrappedException(h1, r1.ex);
2089 >        checkCompletedWithWrappedException(h2, r2.ex);
2090 >        checkCompletedWithWrappedException(h3, r3.ex);
2091          r1.assertInvoked();
2092          r2.assertInvoked();
2093          r3.assertInvoked();
# Line 2365 | Line 2377 | public class CompletableFutureTest exten
2377          f.complete(v1);
2378          final CompletableFuture<Integer> h2 = m.applyToEither(f, g, rs[2]);
2379          final CompletableFuture<Integer> h3 = m.applyToEither(g, f, rs[3]);
2380 <        checkCompletedWithWrappedCFException(h0);
2381 <        checkCompletedWithWrappedCFException(h1);
2382 <        checkCompletedWithWrappedCFException(h2);
2383 <        checkCompletedWithWrappedCFException(h3);
2380 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2381 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2382 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2383 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2384          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2385  
2386          g.complete(v2);
# Line 2377 | Line 2389 | public class CompletableFutureTest exten
2389          final CompletableFuture<Integer> h4 = m.applyToEither(f, g, rs[4]);
2390          final CompletableFuture<Integer> h5 = m.applyToEither(g, f, rs[5]);
2391  
2392 <        checkCompletedWithWrappedCFException(h4);
2392 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2393          assertTrue(Objects.equals(v1, rs[4].value) ||
2394                     Objects.equals(v2, rs[4].value));
2395 <        checkCompletedWithWrappedCFException(h5);
2395 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2396          assertTrue(Objects.equals(v1, rs[5].value) ||
2397                     Objects.equals(v2, rs[5].value));
2398  
# Line 2624 | Line 2636 | public class CompletableFutureTest exten
2636          f.complete(v1);
2637          final CompletableFuture<Void> h2 = m.acceptEither(f, g, rs[2]);
2638          final CompletableFuture<Void> h3 = m.acceptEither(g, f, rs[3]);
2639 <        checkCompletedWithWrappedCFException(h0);
2640 <        checkCompletedWithWrappedCFException(h1);
2641 <        checkCompletedWithWrappedCFException(h2);
2642 <        checkCompletedWithWrappedCFException(h3);
2639 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2640 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2641 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2642 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2643          for (int i = 0; i < 4; i++) rs[i].assertValue(v1);
2644  
2645          g.complete(v2);
# Line 2636 | Line 2648 | public class CompletableFutureTest exten
2648          final CompletableFuture<Void> h4 = m.acceptEither(f, g, rs[4]);
2649          final CompletableFuture<Void> h5 = m.acceptEither(g, f, rs[5]);
2650  
2651 <        checkCompletedWithWrappedCFException(h4);
2651 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2652          assertTrue(Objects.equals(v1, rs[4].value) ||
2653                     Objects.equals(v2, rs[4].value));
2654 <        checkCompletedWithWrappedCFException(h5);
2654 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2655          assertTrue(Objects.equals(v1, rs[5].value) ||
2656                     Objects.equals(v2, rs[5].value));
2657  
# Line 2879 | Line 2891 | public class CompletableFutureTest exten
2891          assertTrue(f.complete(v1));
2892          final CompletableFuture<Void> h2 = m.runAfterEither(f, g, rs[2]);
2893          final CompletableFuture<Void> h3 = m.runAfterEither(g, f, rs[3]);
2894 <        checkCompletedWithWrappedCFException(h0);
2895 <        checkCompletedWithWrappedCFException(h1);
2896 <        checkCompletedWithWrappedCFException(h2);
2897 <        checkCompletedWithWrappedCFException(h3);
2894 >        checkCompletedWithWrappedException(h0, rs[0].ex);
2895 >        checkCompletedWithWrappedException(h1, rs[1].ex);
2896 >        checkCompletedWithWrappedException(h2, rs[2].ex);
2897 >        checkCompletedWithWrappedException(h3, rs[3].ex);
2898          for (int i = 0; i < 4; i++) rs[i].assertInvoked();
2899          assertTrue(g.complete(v2));
2900          final CompletableFuture<Void> h4 = m.runAfterEither(f, g, rs[4]);
2901          final CompletableFuture<Void> h5 = m.runAfterEither(g, f, rs[5]);
2902 <        checkCompletedWithWrappedCFException(h4);
2903 <        checkCompletedWithWrappedCFException(h5);
2902 >        checkCompletedWithWrappedException(h4, rs[4].ex);
2903 >        checkCompletedWithWrappedException(h5, rs[5].ex);
2904  
2905          checkCompletedNormally(f, v1);
2906          checkCompletedNormally(g, v2);
# Line 2949 | Line 2961 | public class CompletableFutureTest exten
2961          final CompletableFuture<Integer> g = m.thenCompose(f, r);
2962          if (createIncomplete) assertTrue(f.complete(v1));
2963  
2964 <        checkCompletedWithWrappedCFException(g);
2964 >        checkCompletedWithWrappedException(g, r.ex);
2965          checkCompletedNormally(f, v1);
2966      }}
2967  
# Line 3058 | Line 3070 | public class CompletableFutureTest exten
3070          }
3071      }
3072  
3073 <    public void testAllOf_backwards() throws Exception {
3073 >    public void testAllOf_normal_backwards() throws Exception {
3074          for (int k = 1; k < 10; k++) {
3075              CompletableFuture<Integer>[] fs
3076                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
# Line 3291 | Line 3303 | public class CompletableFutureTest exten
3303              () -> f.obtrudeException(null),
3304  
3305              () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
3306 <            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
3306 >            () -> CompletableFuture.delayedExecutor(1L, null, exec),
3307              () -> CompletableFuture.delayedExecutor(1L, null),
3308  
3309              () -> f.orTimeout(1L, null),
# Line 3306 | Line 3318 | public class CompletableFutureTest exten
3318      }
3319  
3320      /**
3321 +     * Test submissions to an executor that rejects all tasks.
3322 +     */
3323 +    public void testRejectingExecutor() {
3324 +        final RejectedExecutionException ex = new RejectedExecutionException();
3325 +        final Executor e = (Runnable r) -> { throw ex; };
3326 +
3327 +        for (Integer v : new Integer[] { 1, null }) {
3328 +
3329 +        final CompletableFuture<Integer> complete = CompletableFuture.completedFuture(v);
3330 +        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3331 +
3332 +        List<CompletableFuture<?>> futures = new ArrayList<>();
3333 +
3334 +        List<CompletableFuture<Integer>> srcs = new ArrayList<>();
3335 +        srcs.add(complete);
3336 +        srcs.add(incomplete);
3337 +
3338 +        for (CompletableFuture<Integer> src : srcs) {
3339 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3340 +            fs.add(src.thenRunAsync(() -> {}, e));
3341 +            fs.add(src.thenAcceptAsync((z) -> {}, e));
3342 +            fs.add(src.thenApplyAsync((z) -> z, e));
3343 +
3344 +            fs.add(src.thenCombineAsync(src, (x, y) -> x, e));
3345 +            fs.add(src.thenAcceptBothAsync(src, (x, y) -> {}, e));
3346 +            fs.add(src.runAfterBothAsync(src, () -> {}, e));
3347 +
3348 +            fs.add(src.applyToEitherAsync(src, (z) -> z, e));
3349 +            fs.add(src.acceptEitherAsync(src, (z) -> {}, e));
3350 +            fs.add(src.runAfterEitherAsync(src, () -> {}, e));
3351 +
3352 +            fs.add(src.thenComposeAsync((z) -> null, e));
3353 +            fs.add(src.whenCompleteAsync((z, t) -> {}, e));
3354 +            fs.add(src.handleAsync((z, t) -> null, e));
3355 +
3356 +            for (CompletableFuture<?> future : fs) {
3357 +                if (src.isDone())
3358 +                    checkCompletedWithWrappedException(future, ex);
3359 +                else
3360 +                    checkIncomplete(future);
3361 +            }
3362 +            futures.addAll(fs);
3363 +        }
3364 +
3365 +        {
3366 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3367 +
3368 +            fs.add(complete.thenCombineAsync(incomplete, (x, y) -> x, e));
3369 +            fs.add(incomplete.thenCombineAsync(complete, (x, y) -> x, e));
3370 +
3371 +            fs.add(complete.thenAcceptBothAsync(incomplete, (x, y) -> {}, e));
3372 +            fs.add(incomplete.thenAcceptBothAsync(complete, (x, y) -> {}, e));
3373 +
3374 +            fs.add(complete.runAfterBothAsync(incomplete, () -> {}, e));
3375 +            fs.add(incomplete.runAfterBothAsync(complete, () -> {}, e));
3376 +
3377 +            for (CompletableFuture<?> future : fs)
3378 +                checkIncomplete(future);
3379 +            futures.addAll(fs);
3380 +        }
3381 +
3382 +        {
3383 +            List<CompletableFuture<?>> fs = new ArrayList<>();
3384 +
3385 +            fs.add(complete.applyToEitherAsync(incomplete, (z) -> z, e));
3386 +            fs.add(incomplete.applyToEitherAsync(complete, (z) -> z, e));
3387 +
3388 +            fs.add(complete.acceptEitherAsync(incomplete, (z) -> {}, e));
3389 +            fs.add(incomplete.acceptEitherAsync(complete, (z) -> {}, e));
3390 +
3391 +            fs.add(complete.runAfterEitherAsync(incomplete, () -> {}, e));
3392 +            fs.add(incomplete.runAfterEitherAsync(complete, () -> {}, e));
3393 +
3394 +            for (CompletableFuture<?> future : fs)
3395 +                checkCompletedWithWrappedException(future, ex);
3396 +            futures.addAll(fs);
3397 +        }
3398 +
3399 +        incomplete.complete(v);
3400 +
3401 +        for (CompletableFuture<?> future : futures)
3402 +            checkCompletedWithWrappedException(future, ex);
3403 +        }
3404 +    }
3405 +
3406 +    /**
3407       * toCompletableFuture returns this CompletableFuture.
3408       */
3409      public void testToCompletableFuture() {
# Line 3521 | Line 3619 | public class CompletableFutureTest exten
3619          long timeoutMillis = timeoutMillis();
3620          CompletableFuture<Integer> f = new CompletableFuture<>();
3621          long startTime = System.nanoTime();
3622 <        f.orTimeout(timeoutMillis, MILLISECONDS);
3622 >        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
3623          checkCompletedWithTimeoutException(f);
3624          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3625      }
# Line 3536 | Line 3634 | public class CompletableFutureTest exten
3634          CompletableFuture<Integer> g = new CompletableFuture<>();
3635          long startTime = System.nanoTime();
3636          f.complete(v1);
3637 <        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3638 <        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
3637 >        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3638 >        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
3639          g.complete(v1);
3640          checkCompletedNormally(f, v1);
3641          checkCompletedNormally(g, v1);
# Line 3552 | Line 3650 | public class CompletableFutureTest exten
3650                         () -> testCompleteOnTimeout_timesOut(null));
3651      }
3652  
3653 +    /**
3654 +     * completeOnTimeout completes with given value if not complete
3655 +     */
3656      public void testCompleteOnTimeout_timesOut(Integer v) {
3657          long timeoutMillis = timeoutMillis();
3658          CompletableFuture<Integer> f = new CompletableFuture<>();
3659          long startTime = System.nanoTime();
3660 <        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
3660 >        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
3661          assertSame(v, f.join());
3662          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
3663          f.complete(99);         // should have no effect
# Line 3573 | Line 3674 | public class CompletableFutureTest exten
3674          CompletableFuture<Integer> g = new CompletableFuture<>();
3675          long startTime = System.nanoTime();
3676          f.complete(v1);
3677 <        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3678 <        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
3677 >        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3678 >        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
3679          g.complete(v1);
3680          checkCompletedNormally(f, v1);
3681          checkCompletedNormally(g, v1);
# Line 3625 | Line 3726 | public class CompletableFutureTest exten
3726      //--- tests of implementation details; not part of official tck ---
3727  
3728      Object resultOf(CompletableFuture<?> f) {
3729 +        SecurityManager sm = System.getSecurityManager();
3730 +        if (sm != null) {
3731 +            try {
3732 +                System.setSecurityManager(null);
3733 +            } catch (SecurityException giveUp) {
3734 +                return "Reflection not available";
3735 +            }
3736 +        }
3737 +
3738          try {
3739              java.lang.reflect.Field resultField
3740                  = CompletableFuture.class.getDeclaredField("result");
3741              resultField.setAccessible(true);
3742              return resultField.get(f);
3743 <        } catch (Throwable t) { throw new AssertionError(t); }
3743 >        } catch (Throwable t) {
3744 >            throw new AssertionError(t);
3745 >        } finally {
3746 >            if (sm != null) System.setSecurityManager(sm);
3747 >        }
3748      }
3749  
3750      public void testExceptionPropagationReusesResultObject() {
# Line 3653 | Line 3767 | public class CompletableFutureTest exten
3767          funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3768  
3769          funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3770 +        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
3771          funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3772 +        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
3773          funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3774 +        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
3775  
3776          funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
3777  
3778          funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3779  
3780 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
3781          funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3782 +        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
3783 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
3784          funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3785 +        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
3786  
3787          for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3788                   fun : funs) {
# Line 3826 | Line 3947 | public class CompletableFutureTest exten
3947              AtomicReference<Throwable> firstFailure = new AtomicReference<>(null);
3948          }
3949  
3950 <        // Monadic "plus"
3950 >        /** Implements "monadic plus". */
3951          static <T> CompletableFuture<T> plus(CompletableFuture<? extends T> f,
3952                                               CompletableFuture<? extends T> g) {
3953              PlusFuture<T> plus = new PlusFuture<T>();
3954              BiConsumer<T, Throwable> action = (T result, Throwable ex) -> {
3955 <                if (ex == null) {
3956 <                    if (plus.complete(result))
3957 <                        if (plus.firstFailure.get() != null)
3955 >                try {
3956 >                    if (ex == null) {
3957 >                        if (plus.complete(result))
3958 >                            if (plus.firstFailure.get() != null)
3959 >                                plus.firstFailure.set(null);
3960 >                    }
3961 >                    else if (plus.firstFailure.compareAndSet(null, ex)) {
3962 >                        if (plus.isDone())
3963                              plus.firstFailure.set(null);
3964 <                }
3965 <                else if (plus.firstFailure.compareAndSet(null, ex)) {
3966 <                    if (plus.isDone())
3967 <                        plus.firstFailure.set(null);
3968 <                }
3969 <                else {
3970 <                    // first failure has precedence
3971 <                    Throwable first = plus.firstFailure.getAndSet(null);
3972 <
3973 <                    // may fail with "Self-suppression not permitted"
3974 <                    try { first.addSuppressed(ex); }
3975 <                    catch (Exception ignored) {}
3976 <
3851 <                    plus.completeExceptionally(first);
3964 >                    }
3965 >                    else {
3966 >                        // first failure has precedence
3967 >                        Throwable first = plus.firstFailure.getAndSet(null);
3968 >
3969 >                        // may fail with "Self-suppression not permitted"
3970 >                        try { first.addSuppressed(ex); }
3971 >                        catch (Exception ignored) {}
3972 >
3973 >                        plus.completeExceptionally(first);
3974 >                    }
3975 >                } catch (Throwable unexpected) {
3976 >                    plus.completeExceptionally(unexpected);
3977                  }
3978              };
3979              f.whenComplete(action);
# Line 3917 | Line 4042 | public class CompletableFutureTest exten
4042                                   Monad.plus(godot, Monad.unit(5L)));
4043      }
4044  
4045 +    /**
4046 +     * A single CompletableFuture with many dependents.
4047 +     * A demo of scalability - runtime is O(n).
4048 +     */
4049 +    public void testManyDependents() throws Throwable {
4050 +        final int n = 1_000;
4051 +        final CompletableFuture<Void> head = new CompletableFuture<>();
4052 +        final CompletableFuture<Void> complete = CompletableFuture.completedFuture((Void)null);
4053 +        final AtomicInteger count = new AtomicInteger(0);
4054 +        for (int i = 0; i < n; i++) {
4055 +            head.thenRun(() -> count.getAndIncrement());
4056 +            head.thenAccept((x) -> count.getAndIncrement());
4057 +            head.thenApply((x) -> count.getAndIncrement());
4058 +
4059 +            head.runAfterBoth(complete, () -> count.getAndIncrement());
4060 +            head.thenAcceptBoth(complete, (x, y) -> count.getAndIncrement());
4061 +            head.thenCombine(complete, (x, y) -> count.getAndIncrement());
4062 +            complete.runAfterBoth(head, () -> count.getAndIncrement());
4063 +            complete.thenAcceptBoth(head, (x, y) -> count.getAndIncrement());
4064 +            complete.thenCombine(head, (x, y) -> count.getAndIncrement());
4065 +
4066 +            head.runAfterEither(new CompletableFuture<Void>(), () -> count.getAndIncrement());
4067 +            head.acceptEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4068 +            head.applyToEither(new CompletableFuture<Void>(), (x) -> count.getAndIncrement());
4069 +            new CompletableFuture<Void>().runAfterEither(head, () -> count.getAndIncrement());
4070 +            new CompletableFuture<Void>().acceptEither(head, (x) -> count.getAndIncrement());
4071 +            new CompletableFuture<Void>().applyToEither(head, (x) -> count.getAndIncrement());
4072 +        }
4073 +        head.complete(null);
4074 +        assertEquals(5 * 3 * n, count.get());
4075 +    }
4076 +
4077   //     static <U> U join(CompletionStage<U> stage) {
4078   //         CompletableFuture<U> f = new CompletableFuture<>();
4079   //         stage.whenComplete((v, ex) -> {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines