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.86 by jsr166, Mon Jun 16 21:04:23 2014 UTC vs.
Revision 1.88 by jsr166, Mon Jun 16 21:23:03 2014 UTC

# Line 2922 | Line 2922 | public class CompletableFutureTest exten
2922       * when all components complete normally
2923       */
2924      public void testAllOf_normal() throws Exception {
2925 <        for (int k = 1; k < 20; k++) {
2925 >        for (int k = 1; k < 10; k++) {
2926              CompletableFuture<Integer>[] fs
2927                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2928              for (int i = 0; i < k; i++)
# Line 2939 | Line 2939 | public class CompletableFutureTest exten
2939      }
2940  
2941      public void testAllOf_backwards() throws Exception {
2942 <        for (int k = 1; k < 20; k++) {
2942 >        for (int k = 1; k < 10; k++) {
2943              CompletableFuture<Integer>[] fs
2944                  = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2945              for (int i = 0; i < k; i++)
# Line 2955 | Line 2955 | public class CompletableFutureTest exten
2955          }
2956      }
2957  
2958 +    public void testAllOf_exceptional() throws Exception {
2959 +        for (int k = 1; k < 10; k++) {
2960 +            CompletableFuture<Integer>[] fs
2961 +                = (CompletableFuture<Integer>[]) new CompletableFuture[k];
2962 +            CFException ex = new CFException();
2963 +            for (int i = 0; i < k; i++)
2964 +                fs[i] = new CompletableFuture<>();
2965 +            CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2966 +            for (int i = 0; i < k; i++) {
2967 +                checkIncomplete(f);
2968 +                checkIncomplete(CompletableFuture.allOf(fs));
2969 +                if (i != k/2) {
2970 +                    fs[i].complete(i);
2971 +                    checkCompletedNormally(fs[i], i);
2972 +                } else {
2973 +                    fs[i].completeExceptionally(ex);
2974 +                    checkCompletedExceptionally(fs[i], ex);
2975 +                }
2976 +            }
2977 +            checkCompletedWithWrappedException(f, ex);
2978 +            checkCompletedWithWrappedException(CompletableFuture.allOf(fs), ex);
2979 +        }
2980 +    }
2981 +
2982      /**
2983       * anyOf(no component futures) returns an incomplete future
2984       */
# Line 3009 | Line 3033 | public class CompletableFutureTest exten
3033      public void testAnyOf_exceptional() throws Exception {
3034          for (int k = 0; k < 10; k++) {
3035              CompletableFuture[] fs = new CompletableFuture[k];
3036 <            for (int i = 0; i < k; i++)
3036 >            CFException[] exs = new CFException[k];
3037 >            for (int i = 0; i < k; i++) {
3038                  fs[i] = new CompletableFuture<>();
3039 +                exs[i] = new CFException();
3040 +            }
3041              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3042              checkIncomplete(f);
3043              for (int i = 0; i < k; i++) {
3044 <                fs[i].completeExceptionally(new CFException());
3045 <                checkCompletedWithWrappedCFException(f);
3044 >                fs[i].completeExceptionally(exs[i]);
3045 >                checkCompletedWithWrappedException(f, exs[0]);
3046 >                checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3047 >            }
3048 >        }
3049 >    }
3050 >
3051 >    public void testAnyOf_exceptional_backwards() throws Exception {
3052 >        for (int k = 0; k < 10; k++) {
3053 >            CompletableFuture[] fs = new CompletableFuture[k];
3054 >            CFException[] exs = new CFException[k];
3055 >            for (int i = 0; i < k; i++) {
3056 >                fs[i] = new CompletableFuture<>();
3057 >                exs[i] = new CFException();
3058 >            }
3059 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3060 >            checkIncomplete(f);
3061 >            for (int i = k - 1; i >= 0; i--) {
3062 >                fs[i].completeExceptionally(exs[i]);
3063 >                checkCompletedWithWrappedException(f, exs[k - 1]);
3064                  checkCompletedWithWrappedCFException(CompletableFuture.anyOf(fs));
3065              }
3066          }

Diff Legend

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