--- jsr166/src/test/tck/BlockingQueueTest.java	2019/09/05 21:30:59	1.24
+++ jsr166/src/test/tck/BlockingQueueTest.java	2021/01/26 13:33:05	1.25
@@ -52,7 +52,7 @@ public abstract class BlockingQueueTest
      * Override for collections with unusual element types.
      */
     protected Object makeElement(int i) {
-        return Integer.valueOf(i);
+        return JSR166TestCase.itemFor(i);
     }
 
     //----------------------------------------------------------------
@@ -121,7 +121,7 @@ public abstract class BlockingQueueTest
      */
     public void testAddAllNullElements() {
         final Collection q = emptyCollection();
-        final Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
+        final Collection elements = Arrays.asList(new Item[SIZE]);
         try {
             q.addAll(elements);
             shouldThrow();
@@ -196,13 +196,14 @@ public abstract class BlockingQueueTest
         }
         if (q.remainingCapacity() > 0) {
             // Not SynchronousQueue, that is
-            Object one = makeElement(1);
-            q.add(one);
-            for (int n : ns)
-                assertEquals(0, q.drainTo(sink, n));
-            assertEquals(1, q.size());
-            assertSame(one, q.poll());
-            assertTrue(sink.isEmpty());
+            Object e = makeElement(1);
+            if (q.add(e)) {
+                for (int n : ns)
+                    assertEquals(0, q.drainTo(sink, n));
+                assertEquals(1, q.size());
+                assertEquals(e, q.poll());
+                assertTrue(sink.isEmpty());
+            }
         }
     }
 
@@ -349,8 +350,8 @@ public abstract class BlockingQueueTest
             q.add(elts[i] = makeElement(i));
         for (int i = 1; i < size; i += 2) {
             for (int pass = 0; pass < 2; pass++) {
-                assertEquals((pass == 0), q.contains(elts[i]));
-                assertEquals((pass == 0), q.remove(elts[i]));
+                mustEqual((pass == 0), q.contains(elts[i]));
+                mustEqual((pass == 0), q.remove(elts[i]));
                 assertFalse(q.contains(elts[i]));
                 assertTrue(q.contains(elts[i - 1]));
                 if (i < size - 1)