--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/03 17:01:22	1.106
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/09/04 19:57:19	1.113
@@ -3333,6 +3333,7 @@ public class CompletableFutureTest exten
             () -> f.exceptionally(null),
 
             () -> f.handle(null),
+
             () -> CompletableFuture.allOf((CompletableFuture<?>)null),
             () -> CompletableFuture.allOf((CompletableFuture<?>[])null),
             () -> CompletableFuture.allOf(f, null),
@@ -3384,14 +3385,16 @@ public class CompletableFutureTest exten
 
     /**
      * defaultExecutor by default returns the commonPool if
-     * it supports at least one thread.
+     * it supports more than one thread.
      */
     public void testDefaultExecutor() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         Executor e = f.defaultExecutor();
-        Executor c =  ForkJoinPool.commonPool();
+        Executor c = ForkJoinPool.commonPool();
         if (ForkJoinPool.getCommonPoolParallelism() > 1)
             assertSame(e, c);
+        else
+            assertNotSame(e, c);
     }
 
     /**
@@ -3479,7 +3482,7 @@ public class CompletableFutureTest exten
     }
 
     /**
-     * failedStage returns a Completionstage completed
+     * failedStage returns a CompletionStage completed
      * exceptionally with the given Exception
      */
     public void testFailedStage() {
@@ -3546,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);
     }
 
@@ -3556,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);
     }
 
@@ -3565,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);
     }
@@ -3576,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);
     }
 
@@ -3591,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);
@@ -3610,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);