--- jsr166/src/test/tck/ArrayBlockingQueueTest.java	2016/11/06 06:27:04	1.81
+++ jsr166/src/test/tck/ArrayBlockingQueueTest.java	2017/05/13 21:43:50	1.82
@@ -425,9 +425,7 @@ public class ArrayBlockingQueueTest exte
         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 {
@@ -445,7 +443,7 @@ public class ArrayBlockingQueueTest exte
             }});
 
         await(pleaseInterrupt);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.WAITING);
         t.interrupt();
         awaitTermination(t);
     }