--- jsr166/src/test/tck/CompletableFutureTest.java	2015/11/15 19:39:25	1.133
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/11/15 19:55:38	1.134
@@ -1010,9 +1010,9 @@ public class CompletableFutureTest exten
     /**
      * If a whenComplete action throws an exception when triggered by
      * a source completion that also throws an exception, the source
-     * exception takes precedence.
+     * exception takes precedence (unlike handle)
      */
-    public void testWhenComplete_actionFailedSourceFailed() {
+    public void testWhenComplete_sourceFailedActionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
     {
@@ -1125,59 +1125,62 @@ public class CompletableFutureTest exten
     }}
 
     /**
-     * handle result completes exceptionally if action does
+     * If a "handle action" throws an exception when triggered by
+     * a normal completion, it completes exceptionally
      */
-    public void testHandle_sourceFailedActionFailed() {
+    public void testHandle_sourceCompletedNormallyActionFailed() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
+        for (Integer v1 : new Integer[] { 1, null })
     {
         final CompletableFuture<Integer> f = new CompletableFuture<>();
         final AtomicInteger a = new AtomicInteger(0);
-        final CFException ex1 = new CFException();
-        final CFException ex2 = new CFException();
-        if (!createIncomplete) f.completeExceptionally(ex1);
+        final CFException ex = new CFException();
+        if (!createIncomplete) assertTrue(f.complete(v1));
         final CompletableFuture<Integer> g = m.handle
             (f,
              (Integer x, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(x);
-                threadAssertSame(ex1, t);
+                threadAssertSame(x, v1);
+                threadAssertNull(t);
                 a.getAndIncrement();
-                throw ex2;
+                throw ex;
             });
-        if (createIncomplete) f.completeExceptionally(ex1);
+        if (createIncomplete) assertTrue(f.complete(v1));
 
-        checkCompletedWithWrappedException(g, ex2);
-        checkCompletedExceptionally(f, ex1);
+        checkCompletedWithWrappedException(g, ex);
+        checkCompletedNormally(f, v1);
         assertEquals(1, a.get());
     }}
 
     /**
      * If a "handle action" throws an exception when triggered by
-     * a normal completion, it completes exceptionally
+     * a source completion that also throws an exception, the action
+     * exception takes precedence (unlike whenComplete)
      */
-    public void testHandle_sourceCompletedNormallyActionFailed() {
-        for (ExecutionMode m : ExecutionMode.values())
+    public void testHandle_sourceFailedActionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
+        for (ExecutionMode m : ExecutionMode.values())
     {
-        final CompletableFuture<Integer> f = new CompletableFuture<>();
         final AtomicInteger a = new AtomicInteger(0);
-        final CFException ex = new CFException();
-        if (!createIncomplete) assertTrue(f.complete(v1));
+        final CFException ex1 = new CFException();
+        final CFException ex2 = new CFException();
+        final CompletableFuture<Integer> f = new CompletableFuture<>();
+
+        if (!createIncomplete) f.completeExceptionally(ex1);
         final CompletableFuture<Integer> g = m.handle
             (f,
              (Integer x, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(x, v1);
-                threadAssertNull(t);
+                threadAssertNull(x);
+                threadAssertSame(ex1, t);
                 a.getAndIncrement();
-                throw ex;
+                throw ex2;
             });
-        if (createIncomplete) assertTrue(f.complete(v1));
+        if (createIncomplete) f.completeExceptionally(ex1);
 
-        checkCompletedWithWrappedException(g, ex);
-        checkCompletedNormally(f, v1);
+        checkCompletedWithWrappedException(g, ex2);
+        checkCompletedExceptionally(f, ex1);
         assertEquals(1, a.get());
     }}