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.70 by jsr166, Fri Jun 6 19:48:38 2014 UTC vs.
Revision 1.71 by jsr166, Fri Jun 6 20:01:16 2014 UTC

# Line 2821 | Line 2821 | public class CompletableFutureTest exten
2821          final CompletableFuture<Integer> g = m.whenComplete
2822              (f,
2823               (Integer x, Throwable t) -> {
2824 +                m.checkExecutionMode();
2825                  threadAssertSame(x, v1);
2826                  threadAssertNull(t);
2827                  a.getAndIncrement();
# Line 2848 | Line 2849 | public class CompletableFutureTest exten
2849          final CompletableFuture<Integer> g = m.whenComplete
2850              (f,
2851               (Integer x, Throwable t) -> {
2852 +                m.checkExecutionMode();
2853                  threadAssertNull(x);
2854                  threadAssertSame(t, ex);
2855                  a.getAndIncrement();
# Line 2873 | Line 2875 | public class CompletableFutureTest exten
2875          final CompletableFuture<Integer> g = m.whenComplete
2876              (f,
2877               (Integer x, Throwable t) -> {
2878 +                m.checkExecutionMode();
2879                  threadAssertNull(x);
2880                  threadAssertTrue(t instanceof CancellationException);
2881                  a.getAndIncrement();
2882              });
2883          if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
2884  
2882 –        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
2885          checkCompletedWithWrappedCancellationException(g);
2886          checkCancelled(f);
2887          assertEquals(1, a.get());
# Line 2901 | Line 2903 | public class CompletableFutureTest exten
2903          final CompletableFuture<Integer> g = m.whenComplete
2904              (f,
2905               (Integer x, Throwable t) -> {
2906 +                m.checkExecutionMode();
2907                  threadAssertSame(x, v1);
2908                  threadAssertNull(t);
2909                  a.getAndIncrement();
# Line 2931 | Line 2934 | public class CompletableFutureTest exten
2934          final CompletableFuture<Integer> g = m.whenComplete
2935              (f,
2936               (Integer x, Throwable t) -> {
2937 +                m.checkExecutionMode();
2938                  threadAssertSame(t, ex1);
2939                  threadAssertNull(x);
2940                  a.getAndIncrement();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines