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.59 by jsr166, Wed Dec 31 19:21:20 2014 UTC vs.
Revision 1.63 by jsr166, Sat Feb 28 18:23:30 2015 UTC

# Line 108 | Line 108 | public class ArrayBlockingQueueTest exte
108              ints[i] = i;
109          Collection<Integer> elements = Arrays.asList(ints);
110          try {
111 <            new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
111 >            new ArrayBlockingQueue(SIZE, false, elements);
112              shouldThrow();
113          } catch (NullPointerException success) {}
114      }
# Line 185 | Line 185 | public class ArrayBlockingQueueTest exte
185       * add succeeds if not full; throws ISE if full
186       */
187      public void testAdd() {
188 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
189 +        for (int i = 0; i < SIZE; ++i) {
190 +            assertTrue(q.add(new Integer(i)));
191 +        }
192 +        assertEquals(0, q.remainingCapacity());
193          try {
189 –            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
190 –            for (int i = 0; i < SIZE; ++i) {
191 –                assertTrue(q.add(new Integer(i)));
192 –            }
193 –            assertEquals(0, q.remainingCapacity());
194              q.add(new Integer(SIZE));
195              shouldThrow();
196          } catch (IllegalStateException success) {}
# Line 200 | Line 200 | public class ArrayBlockingQueueTest exte
200       * addAll(this) throws IAE
201       */
202      public void testAddAllSelf() {
203 +        ArrayBlockingQueue q = populatedQueue(SIZE);
204          try {
204 –            ArrayBlockingQueue q = populatedQueue(SIZE);
205              q.addAll(q);
206              shouldThrow();
207          } catch (IllegalArgumentException success) {}
# Line 212 | Line 212 | public class ArrayBlockingQueueTest exte
212       * possibly adding some elements
213       */
214      public void testAddAll3() {
215 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
216 +        Integer[] ints = new Integer[SIZE];
217 +        for (int i = 0; i < SIZE-1; ++i)
218 +            ints[i] = new Integer(i);
219          try {
216 –            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
217 –            Integer[] ints = new Integer[SIZE];
218 –            for (int i = 0; i < SIZE-1; ++i)
219 –                ints[i] = new Integer(i);
220              q.addAll(Arrays.asList(ints));
221              shouldThrow();
222          } catch (NullPointerException success) {}
# Line 226 | Line 226 | public class ArrayBlockingQueueTest exte
226       * addAll throws ISE if not enough room
227       */
228      public void testAddAll4() {
229 +        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
230 +        Integer[] ints = new Integer[SIZE];
231 +        for (int i = 0; i < SIZE; ++i)
232 +            ints[i] = new Integer(i);
233          try {
230 –            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
231 –            Integer[] ints = new Integer[SIZE];
232 –            for (int i = 0; i < SIZE; ++i)
233 –                ints[i] = new Integer(i);
234              q.addAll(Arrays.asList(ints));
235              shouldThrow();
236          } catch (IllegalStateException success) {}
# Line 257 | Line 257 | public class ArrayBlockingQueueTest exte
257      public void testPut() throws InterruptedException {
258          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            Integer I = new Integer(i);
261 <            q.put(I);
262 <            assertTrue(q.contains(I));
260 >            Integer x = new Integer(i);
261 >            q.put(x);
262 >            assertTrue(q.contains(x));
263          }
264          assertEquals(0, q.remainingCapacity());
265      }
# Line 587 | Line 587 | public class ArrayBlockingQueueTest exte
587              assertTrue(q.removeAll(p));
588              assertEquals(SIZE-i, q.size());
589              for (int j = 0; j < i; ++j) {
590 <                Integer I = (Integer)(p.remove());
591 <                assertFalse(q.contains(I));
590 >                Integer x = (Integer)(p.remove());
591 >                assertFalse(q.contains(x));
592              }
593          }
594      }
# Line 698 | Line 698 | public class ArrayBlockingQueueTest exte
698      public void testIterator() throws InterruptedException {
699          ArrayBlockingQueue q = populatedQueue(SIZE);
700          Iterator it = q.iterator();
701 <        while (it.hasNext()) {
701 >        int i;
702 >        for (i = 0; it.hasNext(); i++)
703 >            assertTrue(q.contains(it.next()));
704 >        assertEquals(i, SIZE);
705 >        assertIteratorExhausted(it);
706 >
707 >        it = q.iterator();
708 >        for (i = 0; it.hasNext(); i++)
709              assertEquals(it.next(), q.take());
710 <        }
710 >        assertEquals(i, SIZE);
711 >        assertIteratorExhausted(it);
712 >    }
713 >
714 >    /**
715 >     * iterator of empty collection has no elements
716 >     */
717 >    public void testEmptyIterator() {
718 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
719      }
720  
721      /**

Diff Legend

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