--- jsr166/src/test/tck/CompletableFutureTest.java	2014/06/06 19:39:50	1.69
+++ jsr166/src/test/tck/CompletableFutureTest.java	2014/06/06 20:01:16	1.71
@@ -1171,7 +1171,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
-        r.assertInvoked();
+        r.assertValue(inc(v1));
     }}
 
     /**
@@ -1356,7 +1356,7 @@ public class CompletableFutureTest exten
         checkCompletedNormally(h, subtract(v1, v2));
         checkCompletedNormally(f, v1);
         checkCompletedNormally(g, v2);
-        r.assertInvoked();
+        r.assertValue(subtract(v1, v2));
     }}
 
     /**
@@ -2531,7 +2531,7 @@ public class CompletableFutureTest exten
 
         checkCompletedNormally(g, inc(v1));
         checkCompletedNormally(f, v1);
-        r.assertInvoked();
+        r.assertValue(v1);
     }}
 
     /**
@@ -2821,6 +2821,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.whenComplete
             (f,
              (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
                 threadAssertSame(x, v1);
                 threadAssertNull(t);
                 a.getAndIncrement();
@@ -2848,6 +2849,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.whenComplete
             (f,
              (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
                 threadAssertNull(x);
                 threadAssertSame(t, ex);
                 a.getAndIncrement();
@@ -2873,13 +2875,13 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.whenComplete
             (f,
              (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
                 threadAssertNull(x);
                 threadAssertTrue(t instanceof CancellationException);
                 a.getAndIncrement();
             });
         if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
 
-        //try { g.join(); } catch (Throwable t) { throw new Error(t); }
         checkCompletedWithWrappedCancellationException(g);
         checkCancelled(f);
         assertEquals(1, a.get());
@@ -2901,6 +2903,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.whenComplete
             (f,
              (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
                 threadAssertSame(x, v1);
                 threadAssertNull(t);
                 a.getAndIncrement();
@@ -2931,6 +2934,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.whenComplete
             (f,
              (Integer x, Throwable t) -> {
+                m.checkExecutionMode();
                 threadAssertSame(t, ex1);
                 threadAssertNull(x);
                 a.getAndIncrement();