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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.77 by jsr166, Sun Nov 6 03:11:15 2016 UTC vs.
Revision 1.80 by jsr166, Sun Nov 6 04:16:52 2016 UTC

# Line 231 | Line 231 | public class ArrayBlockingQueueTest exte
231       */
232      public void testAdd() {
233          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234 <        for (int i = 0; i < SIZE; ++i) {
235 <            assertTrue(q.add(new Integer(i)));
236 <        }
234 >        for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i));
235          assertEquals(0, q.remainingCapacity());
236          try {
237 <            q.add(new Integer(SIZE));
237 >            q.add((Integer) SIZE);
238              shouldThrow();
239          } catch (IllegalStateException success) {}
240      }
# Line 270 | Line 268 | public class ArrayBlockingQueueTest exte
268      /**
269       * addAll throws ISE if not enough room
270       */
271 <    public void testAddAll4() {
272 <        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
273 <        Integer[] ints = new Integer[SIZE];
274 <        for (int i = 0; i < SIZE; ++i)
275 <            ints[i] = new Integer(i);
271 >    public void testAddAll_insufficientSpace() {
272 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
273 >        ArrayBlockingQueue q = populatedQueue(0, size, size, false);
274 >        // Just fits:
275 >        q.addAll(populatedQueue(size, size, 2 * size, false));
276 >        assertEquals(0, q.remainingCapacity());
277 >        assertEquals(size, q.size());
278 >        assertEquals(0, q.peek());
279          try {
280 <            q.addAll(Arrays.asList(ints));
280 >            q = populatedQueue(0, size, size, false);
281 >            q.addAll(Collections.nCopies(size + 1, 42));
282              shouldThrow();
283          } catch (IllegalStateException success) {}
284      }
# Line 563 | Line 565 | public class ArrayBlockingQueueTest exte
565       * contains(x) reports true when elements added but not yet removed
566       */
567      public void testContains() {
568 <        ArrayBlockingQueue q = populatedQueue(SIZE);
569 <        for (int i = 0; i < SIZE; ++i) {
568 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
569 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
570 >        assertFalse(q.contains(null));
571 >        for (int i = 0; i < size; ++i) {
572              assertTrue(q.contains(new Integer(i)));
573              assertEquals(i, q.poll());
574              assertFalse(q.contains(new Integer(i)));
# Line 933 | Line 937 | public class ArrayBlockingQueueTest exte
937       */
938      public void testNeverContainsNull() {
939          Collection<?>[] qs = {
940 <            new ArrayBlockingQueue<Object>(10),
941 <            populatedQueue(2),
940 >            populatedQueue(0, 1, 10, false),
941 >            populatedQueue(2, 2, 10, true),
942          };
943  
944          for (Collection<?> q : qs) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines