--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/04 13:43:25	1.111
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/09/04 19:57:19	1.113
@@ -3549,7 +3549,7 @@ public class CompletableFutureTest exten
      */
     public void testOrTimeout() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
-        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
         checkCompletedExceptionallyWithTimeout(f);
     }
 
@@ -3559,7 +3559,7 @@ public class CompletableFutureTest exten
     public void testOrTimeout2() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         f.complete(1);
-        f.orTimeout(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        f.orTimeout(SHORT_DELAY_MS, MILLISECONDS);
         checkCompletedNormally(f, 1);
     }
 
@@ -3568,7 +3568,7 @@ public class CompletableFutureTest exten
      */
     public void testCompleteOnTimeout() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
-        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
         f.join();
         checkCompletedNormally(f, -1);
     }
@@ -3579,7 +3579,7 @@ public class CompletableFutureTest exten
     public void testCompleteOnTimeout2() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         f.complete(1);
-        f.completeOnTimeout(-1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        f.completeOnTimeout(-1, SHORT_DELAY_MS, MILLISECONDS);
         checkCompletedNormally(f, 1);
     }
 
@@ -3594,7 +3594,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
         assertNull(f.getNow(null));
         try {
-            f.get(LONG_DELAY_MS, MILLISECONDS);
+            assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
         checkCompletedNormally(f, 1);
@@ -3613,7 +3613,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f = CompletableFuture.supplyAsync(() -> 1, d);
         assertNull(f.getNow(null));
         try {
-            f.get(LONG_DELAY_MS, MILLISECONDS);
+            assertEquals(1, (int) f.get(LONG_DELAY_MS, MILLISECONDS));
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(millisElapsedSince(startTime) > timeoutMillis/2);
         checkCompletedNormally(f, 1);