--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2015/01/17 22:55:06	1.57
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2015/02/28 19:59:23	1.58
@@ -148,16 +148,16 @@ public class LinkedBlockingQueueTest ext
      * remainingCapacity decreases on add, increases on remove
      */
     public void testRemainingCapacity() {
-        LinkedBlockingQueue q = populatedQueue(SIZE);
+        BlockingQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(i, q.remainingCapacity());
-            assertEquals(SIZE-i, q.size());
-            q.remove();
+            assertEquals(SIZE, q.size() + q.remainingCapacity());
+            assertEquals(i, q.remove());
         }
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(SIZE-i, q.remainingCapacity());
-            assertEquals(i, q.size());
-            q.add(new Integer(i));
+            assertEquals(SIZE, q.size() + q.remainingCapacity());
+            assertTrue(q.add(i));
         }
     }