--- jsr166/src/test/tck/CompletableFutureTest.java	2013/07/05 15:47:52	1.26
+++ jsr166/src/test/tck/CompletableFutureTest.java	2013/07/22 18:25:42	1.30
@@ -259,7 +259,6 @@ public class CompletableFutureTest exten
         assertEquals(g.getNumberOfDependents(), 0);
     }
 
-
     /**
      * toString indicates current completion state
      */
@@ -374,10 +373,9 @@ public class CompletableFutureTest exten
         }
     }
 
-
     /**
      * exceptionally action completes with function value on source
-     * exception;  otherwise with source value
+     * exception; otherwise with source value
      */
     public void testExceptionally() {
         CompletableFuture<Integer> f = new CompletableFuture<>();
@@ -663,7 +661,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
      * thenCombine result completes normally after normal completion
      * of sources
@@ -1171,7 +1168,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     /**
      * runAfterEither result completes normally after normal completion
      * of either source
@@ -1320,7 +1316,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     // asyncs
 
     /**
@@ -1353,8 +1348,7 @@ public class CompletableFutureTest exten
         try {
             g.join();
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -2088,7 +2082,6 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCancellationException(g);
     }
 
-
     // async with explicit executors
 
     /**
@@ -2121,8 +2114,7 @@ public class CompletableFutureTest exten
         try {
             g.join();
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (CompletionException success) {}
         checkCompletedWithWrappedCFException(g);
     }
 
@@ -3181,10 +3173,9 @@ public class CompletableFutureTest exten
         checkCompletedWithWrappedCFException(g);
     }
 
-
     /**
-     * handleAsync action action completes normally with function
-     * value on either normal or exceptional completion of source
+     * handleAsync action completes normally with function value on
+     * either normal or exceptional completion of source
      */
     public void testHandleAsync() {
         CompletableFuture<Integer> f, g;