--- jsr166/src/test/tck/ArrayBlockingQueueTest.java	2016/11/06 03:52:59	1.79
+++ jsr166/src/test/tck/ArrayBlockingQueueTest.java	2017/05/13 21:43:50	1.82
@@ -269,7 +269,7 @@ public class ArrayBlockingQueueTest exte
      * addAll throws ISE if not enough room
      */
     public void testAddAll_insufficientSpace() {
-        int size = ThreadLocalRandom.current().nextInt(SIZE);
+        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
         ArrayBlockingQueue q = populatedQueue(0, size, size, false);
         // Just fits:
         q.addAll(populatedQueue(size, size, 2 * size, false));
@@ -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);
     }
@@ -579,11 +577,13 @@ public class ArrayBlockingQueueTest exte
      * clear removes all elements
      */
     public void testClear() {
-        ArrayBlockingQueue q = populatedQueue(SIZE);
+        int size = ThreadLocalRandom.current().nextInt(1, 5);
+        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
+        int capacity = size + q.remainingCapacity();
         q.clear();
         assertTrue(q.isEmpty());
         assertEquals(0, q.size());
-        assertEquals(SIZE, q.remainingCapacity());
+        assertEquals(capacity, q.remainingCapacity());
         q.add(one);
         assertFalse(q.isEmpty());
         assertTrue(q.contains(one));
@@ -937,8 +937,8 @@ public class ArrayBlockingQueueTest exte
      */
     public void testNeverContainsNull() {
         Collection<?>[] qs = {
-            new ArrayBlockingQueue<Object>(10),
-            populatedQueue(2),
+            populatedQueue(0, 1, 10, false),
+            populatedQueue(2, 2, 10, true),
         };
 
         for (Collection<?> q : qs) {