ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/BlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/BlockingQueueTest.java (file contents):
Revision 1.24 by jsr166, Thu Sep 5 21:30:59 2019 UTC vs.
Revision 1.25 by dl, Tue Jan 26 13:33:05 2021 UTC

# Line 52 | Line 52 | public abstract class BlockingQueueTest
52       * Override for collections with unusual element types.
53       */
54      protected Object makeElement(int i) {
55 <        return Integer.valueOf(i);
55 >        return JSR166TestCase.itemFor(i);
56      }
57  
58      //----------------------------------------------------------------
# Line 121 | Line 121 | public abstract class BlockingQueueTest
121       */
122      public void testAddAllNullElements() {
123          final Collection q = emptyCollection();
124 <        final Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
124 >        final Collection elements = Arrays.asList(new Item[SIZE]);
125          try {
126              q.addAll(elements);
127              shouldThrow();
# Line 196 | Line 196 | public abstract class BlockingQueueTest
196          }
197          if (q.remainingCapacity() > 0) {
198              // Not SynchronousQueue, that is
199 <            Object one = makeElement(1);
200 <            q.add(one);
201 <            for (int n : ns)
202 <                assertEquals(0, q.drainTo(sink, n));
203 <            assertEquals(1, q.size());
204 <            assertSame(one, q.poll());
205 <            assertTrue(sink.isEmpty());
199 >            Object e = makeElement(1);
200 >            if (q.add(e)) {
201 >                for (int n : ns)
202 >                    assertEquals(0, q.drainTo(sink, n));
203 >                assertEquals(1, q.size());
204 >                assertEquals(e, q.poll());
205 >                assertTrue(sink.isEmpty());
206 >            }
207          }
208      }
209  
# Line 349 | Line 350 | public abstract class BlockingQueueTest
350              q.add(elts[i] = makeElement(i));
351          for (int i = 1; i < size; i += 2) {
352              for (int pass = 0; pass < 2; pass++) {
353 <                assertEquals((pass == 0), q.contains(elts[i]));
354 <                assertEquals((pass == 0), q.remove(elts[i]));
353 >                mustEqual((pass == 0), q.contains(elts[i]));
354 >                mustEqual((pass == 0), q.remove(elts[i]));
355                  assertFalse(q.contains(elts[i]));
356                  assertTrue(q.contains(elts[i - 1]));
357                  if (i < size - 1)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines