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

Comparing jsr166/src/test/tck/LinkedListTest.java (file contents):
Revision 1.32 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.35 by jsr166, Sat Jan 17 22:55:06 2015 UTC

# Line 237 | Line 237 | public class LinkedListTest extends JSR1
237       */
238      public void testRemoveElement() {
239          LinkedList q = populatedQueue(SIZE);
240 <        for (int i = 1; i < SIZE; i+=2) {
240 >        for (int i = 1; i < SIZE; i += 2) {
241              assertTrue(q.contains(i));
242              assertTrue(q.remove((Integer)i));
243              assertFalse(q.contains(i));
244              assertTrue(q.contains(i-1));
245          }
246 <        for (int i = 0; i < SIZE; i+=2) {
246 >        for (int i = 0; i < SIZE; i += 2) {
247              assertTrue(q.contains(i));
248              assertTrue(q.remove((Integer)i));
249              assertFalse(q.contains(i));
# Line 322 | Line 322 | public class LinkedListTest extends JSR1
322              assertTrue(q.removeAll(p));
323              assertEquals(SIZE-i, q.size());
324              for (int j = 0; j < i; ++j) {
325 <                Integer I = (Integer)(p.remove());
326 <                assertFalse(q.contains(I));
325 >                Integer x = (Integer)(p.remove());
326 >                assertFalse(q.contains(x));
327              }
328          }
329      }
# Line 379 | Line 379 | public class LinkedListTest extends JSR1
379       */
380      public void testIterator() {
381          LinkedList q = populatedQueue(SIZE);
382 –        int i = 0;
382          Iterator it = q.iterator();
383 <        while (it.hasNext()) {
383 >        int i;
384 >        for (i = 0; it.hasNext(); i++)
385              assertTrue(q.contains(it.next()));
386 –            ++i;
387 –        }
386          assertEquals(i, SIZE);
387 +        assertIteratorExhausted(it);
388 +    }
389 +
390 +    /**
391 +     * iterator of empty collection has no elements
392 +     */
393 +    public void testEmptyIterator() {
394 +        assertIteratorExhausted(new LinkedList().iterator());
395      }
396  
397      /**
# Line 606 | Line 612 | public class LinkedListTest extends JSR1
612       */
613      public void testRemoveFirstOccurrence() {
614          LinkedList q = populatedQueue(SIZE);
615 <        for (int i = 1; i < SIZE; i+=2) {
615 >        for (int i = 1; i < SIZE; i += 2) {
616              assertTrue(q.removeFirstOccurrence(new Integer(i)));
617          }
618 <        for (int i = 0; i < SIZE; i+=2) {
618 >        for (int i = 0; i < SIZE; i += 2) {
619              assertTrue(q.removeFirstOccurrence(new Integer(i)));
620              assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
621          }
# Line 621 | Line 627 | public class LinkedListTest extends JSR1
627       */
628      public void testRemoveLastOccurrence() {
629          LinkedList q = populatedQueue(SIZE);
630 <        for (int i = 1; i < SIZE; i+=2) {
630 >        for (int i = 1; i < SIZE; i += 2) {
631              assertTrue(q.removeLastOccurrence(new Integer(i)));
632          }
633 <        for (int i = 0; i < SIZE; i+=2) {
633 >        for (int i = 0; i < SIZE; i += 2) {
634              assertTrue(q.removeLastOccurrence(new Integer(i)));
635              assertFalse(q.removeLastOccurrence(new Integer(i+1)));
636          }

Diff Legend

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