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.80 by jsr166, Mon Jun 16 17:29:03 2014 UTC vs.
Revision 1.89 by jsr166, Mon Jun 16 21:34:49 2014 UTC

# Line 1680 | Line 1680 | public class CompletableFutureTest exten
1680          checkCompletedWithWrappedCFException(h1);
1681          checkCompletedWithWrappedCFException(h2);
1682          checkCompletedWithWrappedCFException(h3);
1683 +        r1.assertInvoked();
1684 +        r2.assertInvoked();
1685 +        r3.assertInvoked();
1686          checkCompletedNormally(f, v1);
1687          checkCompletedNormally(g, v2);
1688      }}
# Line 1841 | Line 1844 | public class CompletableFutureTest exten
1844          checkCompletedWithWrappedCFException(h1);
1845          checkCompletedWithWrappedCFException(h2);
1846          checkCompletedWithWrappedCFException(h3);
1847 +        r1.assertInvoked();
1848 +        r2.assertInvoked();
1849 +        r3.assertInvoked();
1850          checkCompletedNormally(f, v1);
1851          checkCompletedNormally(g, v2);
1852      }}
# Line 1851 | Line 1857 | public class CompletableFutureTest exten
1857       */
1858      public void testRunAfterBoth_normalCompletion() {
1859          for (ExecutionMode m : ExecutionMode.values())
1854        for (boolean createIncomplete : new boolean[] { true, false })
1860          for (boolean fFirst : new boolean[] { true, false })
1861          for (Integer v1 : new Integer[] { 1, null })
1862          for (Integer v2 : new Integer[] { 2, null })
1863      {
1864          final CompletableFuture<Integer> f = new CompletableFuture<>();
1865          final CompletableFuture<Integer> g = new CompletableFuture<>();
1866 <        final Noop r = new Noop(m);
1866 >        final Noop r1 = new Noop(m);
1867 >        final Noop r2 = new Noop(m);
1868 >        final Noop r3 = new Noop(m);
1869  
1870 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1871 <        if (!createIncomplete)
1872 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1873 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1867 <        if (createIncomplete) {
1868 <            checkIncomplete(h);
1869 <            r.assertNotInvoked();
1870 <            assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
1871 <        }
1870 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1871 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1872 >        final Integer w1 =  fFirst ? v1 : v2;
1873 >        final Integer w2 = !fFirst ? v1 : v2;
1874  
1875 <        checkCompletedNormally(h, null);
1876 <        r.assertInvoked();
1875 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1876 >        assertTrue(fst.complete(w1));
1877 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1878 >        checkIncomplete(h1);
1879 >        checkIncomplete(h2);
1880 >        r1.assertNotInvoked();
1881 >        r2.assertNotInvoked();
1882 >        assertTrue(snd.complete(w2));
1883 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1884 >
1885 >        checkCompletedNormally(h1, null);
1886 >        checkCompletedNormally(h2, null);
1887 >        checkCompletedNormally(h3, null);
1888 >        r1.assertInvoked();
1889 >        r2.assertInvoked();
1890 >        r3.assertInvoked();
1891          checkCompletedNormally(f, v1);
1892          checkCompletedNormally(g, v2);
1893      }}
# Line 1880 | Line 1896 | public class CompletableFutureTest exten
1896       * runAfterBoth result completes exceptionally after exceptional
1897       * completion of either source
1898       */
1899 <    public void testRunAfterBoth_exceptionalCompletion() {
1899 >    public void testRunAfterBoth_exceptionalCompletion() throws Throwable {
1900          for (ExecutionMode m : ExecutionMode.values())
1885        for (boolean createIncomplete : new boolean[] { true, false })
1901          for (boolean fFirst : new boolean[] { true, false })
1902 +        for (boolean failFirst : new boolean[] { true, false })
1903          for (Integer v1 : new Integer[] { 1, null })
1904      {
1905          final CompletableFuture<Integer> f = new CompletableFuture<>();
1906          final CompletableFuture<Integer> g = new CompletableFuture<>();
1907          final CFException ex = new CFException();
1908 <        final Noop r = new Noop(m);
1908 >        final Noop r1 = new Noop(m);
1909 >        final Noop r2 = new Noop(m);
1910 >        final Noop r3 = new Noop(m);
1911  
1912 <        assertTrue((fFirst ? f : g).complete(v1));
1913 <        if (!createIncomplete)
1914 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1915 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1916 <        if (createIncomplete) {
1917 <            checkIncomplete(h);
1918 <            assertTrue((!fFirst ? f : g).completeExceptionally(ex));
1919 <        }
1912 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1913 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1914 >        final Callable<Boolean> complete1 = failFirst ?
1915 >            () -> fst.completeExceptionally(ex) :
1916 >            () -> fst.complete(v1);
1917 >        final Callable<Boolean> complete2 = failFirst ?
1918 >            () -> snd.complete(v1) :
1919 >            () -> snd.completeExceptionally(ex);
1920  
1921 <        checkCompletedWithWrappedException(h, ex);
1922 <        r.assertNotInvoked();
1923 <        checkCompletedNormally(fFirst ? f : g, v1);
1924 <        checkCompletedExceptionally(!fFirst ? f : g, ex);
1921 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1922 >        assertTrue(complete1.call());
1923 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1924 >        checkIncomplete(h1);
1925 >        checkIncomplete(h2);
1926 >        assertTrue(complete2.call());
1927 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1928 >
1929 >        checkCompletedWithWrappedException(h1, ex);
1930 >        checkCompletedWithWrappedException(h2, ex);
1931 >        checkCompletedWithWrappedException(h3, ex);
1932 >        r1.assertNotInvoked();
1933 >        r2.assertNotInvoked();
1934 >        r3.assertNotInvoked();
1935 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1936 >        checkCompletedExceptionally(failFirst ? fst : snd, ex);
1937      }}
1938  
1939      /**
1940       * runAfterBoth result completes exceptionally if either source cancelled
1941       */
1942 <    public void testRunAfterBoth_sourceCancelled() {
1942 >    public void testRunAfterBoth_sourceCancelled() throws Throwable {
1943          for (ExecutionMode m : ExecutionMode.values())
1944          for (boolean mayInterruptIfRunning : new boolean[] { true, false })
1915        for (boolean createIncomplete : new boolean[] { true, false })
1945          for (boolean fFirst : new boolean[] { true, false })
1946 +        for (boolean failFirst : new boolean[] { true, false })
1947          for (Integer v1 : new Integer[] { 1, null })
1948      {
1949          final CompletableFuture<Integer> f = new CompletableFuture<>();
1950          final CompletableFuture<Integer> g = new CompletableFuture<>();
1951 <        final Noop r = new Noop(m);
1951 >        final Noop r1 = new Noop(m);
1952 >        final Noop r2 = new Noop(m);
1953 >        final Noop r3 = new Noop(m);
1954  
1955 <        assertTrue((fFirst ? f : g).complete(v1));
1956 <        if (!createIncomplete)
1957 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1958 <        final CompletableFuture<Void> h = m.runAfterBoth(f, g, r);
1959 <        if (createIncomplete) {
1960 <            checkIncomplete(h);
1961 <            assertTrue((!fFirst ? f : g).cancel(mayInterruptIfRunning));
1962 <        }
1955 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1956 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1957 >        final Callable<Boolean> complete1 = failFirst ?
1958 >            () -> fst.cancel(mayInterruptIfRunning) :
1959 >            () -> fst.complete(v1);
1960 >        final Callable<Boolean> complete2 = failFirst ?
1961 >            () -> snd.complete(v1) :
1962 >            () -> snd.cancel(mayInterruptIfRunning);
1963  
1964 <        checkCompletedWithWrappedCancellationException(h);
1965 <        checkCancelled(!fFirst ? f : g);
1966 <        r.assertNotInvoked();
1967 <        checkCompletedNormally(fFirst ? f : g, v1);
1964 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1965 >        assertTrue(complete1.call());
1966 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1967 >        checkIncomplete(h1);
1968 >        checkIncomplete(h2);
1969 >        assertTrue(complete2.call());
1970 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
1971 >
1972 >        checkCompletedWithWrappedCancellationException(h1);
1973 >        checkCompletedWithWrappedCancellationException(h2);
1974 >        checkCompletedWithWrappedCancellationException(h3);
1975 >        r1.assertNotInvoked();
1976 >        r2.assertNotInvoked();
1977 >        r3.assertNotInvoked();
1978 >        checkCompletedNormally(failFirst ? snd : fst, v1);
1979 >        checkCancelled(failFirst ? fst : snd);
1980      }}
1981  
1982      /**
# Line 1948 | Line 1992 | public class CompletableFutureTest exten
1992          final CompletableFuture<Integer> g = new CompletableFuture<>();
1993          final FailingRunnable r1 = new FailingRunnable(m);
1994          final FailingRunnable r2 = new FailingRunnable(m);
1995 +        final FailingRunnable r3 = new FailingRunnable(m);
1996  
1997 <        CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
1998 <        assertTrue(fFirst ? f.complete(v1) : g.complete(v2));
1999 <        assertTrue(!fFirst ? f.complete(v1) : g.complete(v2));
2000 <        CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
1997 >        final CompletableFuture<Integer> fst =  fFirst ? f : g;
1998 >        final CompletableFuture<Integer> snd = !fFirst ? f : g;
1999 >        final Integer w1 =  fFirst ? v1 : v2;
2000 >        final Integer w2 = !fFirst ? v1 : v2;
2001 >
2002 >        final CompletableFuture<Void> h1 = m.runAfterBoth(f, g, r1);
2003 >        assertTrue(fst.complete(w1));
2004 >        final CompletableFuture<Void> h2 = m.runAfterBoth(f, g, r2);
2005 >        assertTrue(snd.complete(w2));
2006 >        final CompletableFuture<Void> h3 = m.runAfterBoth(f, g, r3);
2007  
2008          checkCompletedWithWrappedCFException(h1);
2009          checkCompletedWithWrappedCFException(h2);
2010 +        checkCompletedWithWrappedCFException(h3);
2011 +        r1.assertInvoked();
2012 +        r2.assertInvoked();
2013 +        r3.assertInvoked();
2014          checkCompletedNormally(f, v1);
2015          checkCompletedNormally(g, v2);
2016      }}
# Line 2867 | 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)
2928 >            for (int i = 0; i < k; i++)
2929                  fs[i] = new CompletableFuture<>();
2930              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2931 <            for (int i = 0; i < k; ++i) {
2931 >            for (int i = 0; i < k; i++) {
2932                  checkIncomplete(f);
2933                  checkIncomplete(CompletableFuture.allOf(fs));
2934                  fs[i].complete(one);
# Line 2884 | 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)
2945 >            for (int i = 0; i < k; i++)
2946                  fs[i] = new CompletableFuture<>();
2947              CompletableFuture<Void> f = CompletableFuture.allOf(fs);
2948              for (int i = k - 1; i >= 0; i--) {
# Line 2900 | 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       */
2985      public void testAnyOf_empty() throws Exception {
2986 +        for (Integer v1 : new Integer[] { 1, null })
2987 +    {
2988          CompletableFuture<Object> f = CompletableFuture.anyOf();
2989          checkIncomplete(f);
2990 <    }
2990 >
2991 >        f.complete(v1);
2992 >        checkCompletedNormally(f, v1);
2993 >    }}
2994  
2995      /**
2996       * anyOf returns a future completed normally with a value when
2997       * a component future does
2998       */
2999      public void testAnyOf_normal() throws Exception {
3000 <        for (int k = 0; k < 10; ++k) {
3000 >        for (int k = 0; k < 10; k++) {
3001              CompletableFuture[] fs = new CompletableFuture[k];
3002 <            for (int i = 0; i < k; ++i)
3002 >            for (int i = 0; i < k; i++)
3003                  fs[i] = new CompletableFuture<>();
3004              CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3005              checkIncomplete(f);
3006 <            for (int i = 0; i < k; ++i) {
3007 <                fs[i].complete(one);
3008 <                checkCompletedNormally(f, one);
3009 <                checkCompletedNormally(CompletableFuture.anyOf(fs), one);
3006 >            for (int i = 0; i < k; i++) {
3007 >                fs[i].complete(i);
3008 >                checkCompletedNormally(f, 0);
3009 >                int x = (int) CompletableFuture.anyOf(fs).join();
3010 >                assertTrue(0 <= x && x <= i);
3011 >            }
3012 >        }
3013 >    }
3014 >    public void testAnyOf_normal_backwards() throws Exception {
3015 >        for (int k = 0; k < 10; k++) {
3016 >            CompletableFuture[] fs = new CompletableFuture[k];
3017 >            for (int i = 0; i < k; i++)
3018 >                fs[i] = new CompletableFuture<>();
3019 >            CompletableFuture<Object> f = CompletableFuture.anyOf(fs);
3020 >            checkIncomplete(f);
3021 >            for (int i = k - 1; i >= 0; i--) {
3022 >                fs[i].complete(i);
3023 >                checkCompletedNormally(f, k - 1);
3024 >                int x = (int) CompletableFuture.anyOf(fs).join();
3025 >                assertTrue(i <= x && x <= k - 1);
3026              }
3027          }
3028      }
# Line 2931 | Line 3031 | public class CompletableFutureTest exten
3031       * anyOf result completes exceptionally when any component does.
3032       */
3033      public void testAnyOf_exceptional() throws Exception {
3034 <        for (int k = 0; k < 10; ++k) {
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);
3043 >            for (int i = 0; i < k; i++) {
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          }
# Line 3063 | Line 3184 | public class CompletableFutureTest exten
3184          assertSame(f, f.toCompletableFuture());
3185      }
3186  
3187 < //     public void testRunAfterEither_resultDeterminedAtTimeOfCreation() {
3188 < //         for (ExecutionMode m : ExecutionMode.values())
3189 < //         for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3190 < //         for (Integer v1 : new Integer[] { 1, null })
3191 < //     {
3192 < //         final CompletableFuture<Integer> f = new CompletableFuture<>();
3193 < //         final CompletableFuture<Integer> g = new CompletableFuture<>();
3194 < //         final Noop[] rs = new Noop[2];
3195 < //         for (int i = 0; i < rs.length; i++) rs[i] = new Noop(m);
3196 < //         f.complete(v1);
3197 < //         final CompletableFuture<Void> h0 = m.runAfterEither(f, g, rs[0]);
3198 < //         final CompletableFuture<Void> h1 = m.runAfterEither(g, f, rs[1]);
3199 < //         assertTrue(g.cancel(mayInterruptIfRunning));
3200 < //         checkCompletedNormally(h0, null);
3201 < //         checkCompletedNormally(h1, null);
3202 < //         for (Noop r : rs) r.assertInvoked();
3203 < //     }}
3187 >    //--- tests of implementation details; not part of official tck ---
3188 >
3189 >    Object resultOf(CompletableFuture<?> f) {
3190 >        try {
3191 >            java.lang.reflect.Field resultField
3192 >                = CompletableFuture.class.getDeclaredField("result");
3193 >            resultField.setAccessible(true);
3194 >            return resultField.get(f);
3195 >        } catch (Throwable t) { throw new AssertionError(t); }
3196 >    }
3197 >
3198 >    public void testExceptionPropagationReusesResultObject() {
3199 >        if (!testImplementationDetails) return;
3200 >        for (ExecutionMode m : ExecutionMode.values())
3201 >    {
3202 >        final CFException ex = new CFException();
3203 >        final CompletableFuture<Integer> v42 = CompletableFuture.completedFuture(42);
3204 >        final CompletableFuture<Integer> incomplete = new CompletableFuture<>();
3205 >
3206 >        List<Function<CompletableFuture<Integer>, CompletableFuture<?>>> funs
3207 >            = new ArrayList<>();
3208 >
3209 >        funs.add((y) -> m.thenRun(y, new Noop(m)));
3210 >        funs.add((y) -> m.thenAccept(y, new NoopConsumer(m)));
3211 >        funs.add((y) -> m.thenApply(y, new IncFunction(m)));
3212 >
3213 >        funs.add((y) -> m.runAfterEither(y, incomplete, new Noop(m)));
3214 >        funs.add((y) -> m.acceptEither(y, incomplete, new NoopConsumer(m)));
3215 >        funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
3216 >
3217 >        funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
3218 >        funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
3219 >        funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
3220 >
3221 >        funs.add((y) -> m.whenComplete(y, (Integer x, Throwable t) -> {}));
3222 >
3223 >        funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
3224 >
3225 >        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
3226 >        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
3227 >
3228 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3229 >                 fun : funs) {
3230 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3231 >            f.completeExceptionally(ex);
3232 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3233 >            checkCompletedWithWrappedException(src, ex);
3234 >            CompletableFuture<?> dep = fun.apply(src);
3235 >            checkCompletedWithWrappedException(dep, ex);
3236 >            assertSame(resultOf(src), resultOf(dep));
3237 >        }
3238 >
3239 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3240 >                 fun : funs) {
3241 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3242 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3243 >            CompletableFuture<?> dep = fun.apply(src);
3244 >            f.completeExceptionally(ex);
3245 >            checkCompletedWithWrappedException(src, ex);
3246 >            checkCompletedWithWrappedException(dep, ex);
3247 >            assertSame(resultOf(src), resultOf(dep));
3248 >        }
3249 >
3250 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3251 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3252 >                 fun : funs) {
3253 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3254 >            f.cancel(mayInterruptIfRunning);
3255 >            checkCancelled(f);
3256 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3257 >            checkCompletedWithWrappedCancellationException(src);
3258 >            CompletableFuture<?> dep = fun.apply(src);
3259 >            checkCompletedWithWrappedCancellationException(dep);
3260 >            assertSame(resultOf(src), resultOf(dep));
3261 >        }
3262 >
3263 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false })
3264 >        for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
3265 >                 fun : funs) {
3266 >            CompletableFuture<Integer> f = new CompletableFuture<>();
3267 >            CompletableFuture<Integer> src = m.thenApply(f, new IncFunction(m));
3268 >            CompletableFuture<?> dep = fun.apply(src);
3269 >            f.cancel(mayInterruptIfRunning);
3270 >            checkCancelled(f);
3271 >            checkCompletedWithWrappedCancellationException(src);
3272 >            checkCompletedWithWrappedCancellationException(dep);
3273 >            assertSame(resultOf(src), resultOf(dep));
3274 >        }
3275 >    }}
3276  
3277   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines