--- jsr166/src/test/tck/PriorityBlockingQueueTest.java	2017/03/11 18:20:47	1.71
+++ jsr166/src/test/tck/PriorityBlockingQueueTest.java	2017/05/13 21:43:51	1.73
@@ -333,9 +333,7 @@ public class PriorityBlockingQueueTest e
         final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                for (int i = 0; i < SIZE; ++i) {
-                    assertEquals(i, q.take());
-                }
+                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
 
                 Thread.currentThread().interrupt();
                 try {
@@ -353,7 +351,7 @@ public class PriorityBlockingQueueTest e
             }});
 
         await(pleaseInterrupt);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.WAITING);
         t.interrupt();
         awaitTermination(t);
     }
@@ -418,7 +416,7 @@ public class PriorityBlockingQueueTest e
                 }
             }});
 
-        aboutToWait.await();
+        await(aboutToWait);
         waitForThreadToEnterWaitState(t);
         t.interrupt();
         awaitTermination(t);