--- jsr166/src/test/tck/CompletableFutureTest.java	2016/04/03 17:09:46	1.143
+++ jsr166/src/test/tck/CompletableFutureTest.java	2016/06/26 16:01:17	1.149
@@ -640,12 +640,8 @@ public class CompletableFutureTest exten
 
         ASYNC {
             public void checkExecutionMode() {
-                // If tests are added that may run across different
-                // pools, this needs to be weakened to no-op.
-                ForkJoinPool p = ForkJoinTask.getPool();
-                assertTrue(p == null ||
-                           (defaultExecutorIsCommonPool &&
-                            p == ForkJoinPool.commonPool()));
+                assertEquals(defaultExecutorIsCommonPool,
+                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
             }
             public CompletableFuture<Void> runAsync(Runnable a) {
                 return CompletableFuture.runAsync(a);
@@ -3529,7 +3525,7 @@ public class CompletableFutureTest exten
         long timeoutMillis = timeoutMillis();
         CompletableFuture<Integer> f = new CompletableFuture<>();
         long startTime = System.nanoTime();
-        f.orTimeout(timeoutMillis, MILLISECONDS);
+        assertSame(f, f.orTimeout(timeoutMillis, MILLISECONDS));
         checkCompletedWithTimeoutException(f);
         assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
     }
@@ -3544,8 +3540,8 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> g = new CompletableFuture<>();
         long startTime = System.nanoTime();
         f.complete(v1);
-        f.orTimeout(LONG_DELAY_MS, MILLISECONDS);
-        g.orTimeout(LONG_DELAY_MS, MILLISECONDS);
+        assertSame(f, f.orTimeout(LONG_DELAY_MS, MILLISECONDS));
+        assertSame(g, g.orTimeout(LONG_DELAY_MS, MILLISECONDS));
         g.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v1);
@@ -3560,11 +3556,14 @@ 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<>();
         long startTime = System.nanoTime();
-        f.completeOnTimeout(v, timeoutMillis, MILLISECONDS);
+        assertSame(f, f.completeOnTimeout(v, timeoutMillis, MILLISECONDS));
         assertSame(v, f.join());
         assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
         f.complete(99);         // should have no effect
@@ -3581,8 +3580,8 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> g = new CompletableFuture<>();
         long startTime = System.nanoTime();
         f.complete(v1);
-        f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
-        g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS);
+        assertSame(f, f.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
+        assertSame(g, g.completeOnTimeout(-1, LONG_DELAY_MS, MILLISECONDS));
         g.complete(v1);
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v1);
@@ -3633,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() {
@@ -3661,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) {