--- jsr166/src/test/tck/CompletableFutureTest.java	2018/11/21 23:25:17	1.216
+++ jsr166/src/test/tck/CompletableFutureTest.java	2018/11/24 18:13:28	1.217
@@ -955,7 +955,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.exceptionally
             (f, (Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(t, ex);
+                assertSame(t, ex);
                 a.getAndIncrement();
                 return v1;
             });
@@ -981,7 +981,7 @@ public class CompletableFutureTest exten
         final CompletableFuture<Integer> g = m.exceptionally
             (f, (Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(t, ex1);
+                assertSame(t, ex1);
                 a.getAndIncrement();
                 throw ex2;
             });
@@ -1008,8 +1008,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(result, v1);
-                threadAssertNull(t);
+                assertSame(result, v1);
+                assertNull(t);
                 a.getAndIncrement();
             });
         if (createIncomplete) assertTrue(f.complete(v1));
@@ -1035,8 +1035,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(result);
-                threadAssertSame(t, ex);
+                assertNull(result);
+                assertSame(t, ex);
                 a.getAndIncrement();
             });
         if (createIncomplete) f.completeExceptionally(ex);
@@ -1062,8 +1062,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(result);
-                threadAssertTrue(t instanceof CancellationException);
+                assertNull(result);
+                assertTrue(t instanceof CancellationException);
                 a.getAndIncrement();
             });
         if (createIncomplete) assertTrue(f.cancel(mayInterruptIfRunning));
@@ -1090,8 +1090,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(result, v1);
-                threadAssertNull(t);
+                assertSame(result, v1);
+                assertNull(t);
                 a.getAndIncrement();
                 throw ex;
             });
@@ -1121,8 +1121,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(t, ex1);
-                threadAssertNull(result);
+                assertSame(t, ex1);
+                assertNull(result);
                 a.getAndIncrement();
                 throw ex2;
             });
@@ -1153,8 +1153,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(result, v1);
-                threadAssertNull(t);
+                assertSame(result, v1);
+                assertNull(t);
                 a.getAndIncrement();
                 return inc(v1);
             });
@@ -1182,8 +1182,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(result);
-                threadAssertSame(t, ex);
+                assertNull(result);
+                assertSame(t, ex);
                 a.getAndIncrement();
                 return v1;
             });
@@ -1211,8 +1211,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(result);
-                threadAssertTrue(t instanceof CancellationException);
+                assertNull(result);
+                assertTrue(t instanceof CancellationException);
                 a.getAndIncrement();
                 return v1;
             });
@@ -1240,8 +1240,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertSame(result, v1);
-                threadAssertNull(t);
+                assertSame(result, v1);
+                assertNull(t);
                 a.getAndIncrement();
                 throw ex;
             });
@@ -1271,8 +1271,8 @@ public class CompletableFutureTest exten
             (f,
              (Integer result, Throwable t) -> {
                 m.checkExecutionMode();
-                threadAssertNull(result);
-                threadAssertSame(ex1, t);
+                assertNull(result);
+                assertSame(ex1, t);
                 a.getAndIncrement();
                 throw ex2;
             });
@@ -4859,7 +4859,7 @@ public class CompletableFutureTest exten
         if (!createIncomplete) f.completeExceptionally(ex);
         final CompletionStage<Integer> g = d.exceptionallyAsync
             ((Throwable t) -> {
-                threadAssertSame(t, ex);
+                assertSame(t, ex);
                 a.getAndIncrement();
                 return v1;
             });
@@ -4886,7 +4886,7 @@ public class CompletableFutureTest exten
         if (!createIncomplete) f.completeExceptionally(ex1);
         final CompletionStage<Integer> g = d.exceptionallyAsync
             ((Throwable t) -> {
-                threadAssertSame(t, ex1);
+                assertSame(t, ex1);
                 a.getAndIncrement();
                 throw ex2;
             });