--- jsr166/src/test/tck/CompletableFutureTest.java	2016/04/11 06:23:38	1.145
+++ jsr166/src/test/tck/CompletableFutureTest.java	2016/06/26 16:01:17	1.149
@@ -3556,6 +3556,9 @@ public class CompletableFutureTest exten
                        () -> testCompleteOnTimeout_timesOut(null));
     }
 
+    /**
+     * completeOnTimeout completes with given value if not complete
+     */
     public void testCompleteOnTimeout_timesOut(Integer v) {
         long timeoutMillis = timeoutMillis();
         CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -3629,12 +3632,25 @@ public class CompletableFutureTest exten
     //--- tests of implementation details; not part of official tck ---
 
     Object resultOf(CompletableFuture<?> f) {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) {
+            try {
+                System.setSecurityManager(null);
+            } catch (SecurityException giveUp) {
+                return "Reflection not available";
+            }
+        }
+
         try {
             java.lang.reflect.Field resultField
                 = CompletableFuture.class.getDeclaredField("result");
             resultField.setAccessible(true);
             return resultField.get(f);
-        } catch (Throwable t) { throw new AssertionError(t); }
+        } catch (Throwable t) {
+            throw new AssertionError(t);
+        } finally {
+            if (sm != null) System.setSecurityManager(sm);
+        }
     }
 
     public void testExceptionPropagationReusesResultObject() {
@@ -3657,15 +3673,22 @@ public class CompletableFutureTest exten
         funs.add((y) -> m.applyToEither(y, incomplete, new IncFunction(m)));
 
         funs.add((y) -> m.runAfterBoth(y, v42, new Noop(m)));
+        funs.add((y) -> m.runAfterBoth(v42, y, new Noop(m)));
         funs.add((y) -> m.thenAcceptBoth(y, v42, new SubtractAction(m)));
+        funs.add((y) -> m.thenAcceptBoth(v42, y, new SubtractAction(m)));
         funs.add((y) -> m.thenCombine(y, v42, new SubtractFunction(m)));
+        funs.add((y) -> m.thenCombine(v42, y, new SubtractFunction(m)));
 
         funs.add((y) -> m.whenComplete(y, (Integer r, Throwable t) -> {}));
 
         funs.add((y) -> m.thenCompose(y, new CompletableFutureInc(m)));
 
+        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y}));
         funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {y, v42}));
+        funs.add((y) -> CompletableFuture.allOf(new CompletableFuture<?>[] {v42, y}));
+        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y}));
         funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {y, incomplete}));
+        funs.add((y) -> CompletableFuture.anyOf(new CompletableFuture<?>[] {incomplete, y}));
 
         for (Function<CompletableFuture<Integer>, CompletableFuture<?>>
                  fun : funs) {