--- jsr166/src/test/tck/PriorityBlockingQueueTest.java	2014/12/31 20:17:39	1.57
+++ jsr166/src/test/tck/PriorityBlockingQueueTest.java	2015/02/28 20:13:46	1.60
@@ -47,8 +47,6 @@ public class PriorityBlockingQueueTest e
                             new InitialCapacity().testSuite());
     }
 
-    private static final int NOCAP = Integer.MAX_VALUE;
-
     /** Sample Comparator */
     static class MyReverseComparator implements Comparator {
         public int compare(Object x, Object y) {
@@ -69,7 +67,7 @@ public class PriorityBlockingQueueTest e
         for (int i = (n & 1); i < n; i += 2)
             assertTrue(q.offer(new Integer(i)));
         assertFalse(q.isEmpty());
-        assertEquals(NOCAP, q.remainingCapacity());
+        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
         assertEquals(n, q.size());
         return q;
     }
@@ -78,7 +76,8 @@ public class PriorityBlockingQueueTest e
      * A new queue has unbounded capacity
      */
     public void testConstructor1() {
-        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
+        assertEquals(Integer.MAX_VALUE,
+                     new PriorityBlockingQueue(SIZE).remainingCapacity());
     }
 
     /**
@@ -159,7 +158,7 @@ public class PriorityBlockingQueueTest e
     public void testEmpty() {
         PriorityBlockingQueue q = new PriorityBlockingQueue(2);
         assertTrue(q.isEmpty());
-        assertEquals(NOCAP, q.remainingCapacity());
+        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
         q.add(one);
         assertFalse(q.isEmpty());
         q.add(two);
@@ -169,20 +168,19 @@ public class PriorityBlockingQueueTest e
     }
 
     /**
-     * remainingCapacity does not change when elements added or removed,
-     * but size does
+     * remainingCapacity() always returns Integer.MAX_VALUE
      */
     public void testRemainingCapacity() {
-        PriorityBlockingQueue q = populatedQueue(SIZE);
+        BlockingQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(NOCAP, q.remainingCapacity());
-            assertEquals(SIZE-i, q.size());
-            q.remove();
+            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
+            assertEquals(SIZE - i, q.size());
+            assertEquals(i, q.remove());
         }
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(NOCAP, q.remainingCapacity());
+            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
             assertEquals(i, q.size());
-            q.add(new Integer(i));
+            assertTrue(q.add(i));
         }
     }
 
@@ -199,9 +197,8 @@ public class PriorityBlockingQueueTest e
      * Offer of non-Comparable throws CCE
      */
     public void testOfferNonComparable() {
+        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
         try {
-            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
-            q.offer(new Object());
             q.offer(new Object());
             q.offer(new Object());
             shouldThrow();
@@ -576,13 +573,19 @@ public class PriorityBlockingQueueTest e
      */
     public void testIterator() {
         PriorityBlockingQueue q = populatedQueue(SIZE);
-        int i = 0;
         Iterator it = q.iterator();
-        while (it.hasNext()) {
+        int i;
+        for (i = 0; it.hasNext(); i++)
             assertTrue(q.contains(it.next()));
-            ++i;
-        }
         assertEquals(i, SIZE);
+        assertIteratorExhausted(it);
+    }
+
+    /**
+     * iterator of empty collection has no elements
+     */
+    public void testEmptyIterator() {
+        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
     }
 
     /**