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.38 by jsr166, Fri May 15 18:21:19 2015 UTC

# Line 17 | Line 17 | import junit.framework.TestSuite;
17  
18   public class LinkedListTest extends JSR166TestCase {
19      public static void main(String[] args) {
20 <        junit.textui.TestRunner.run(suite());
20 >        main(suite(), args);
21      }
22  
23      public static Test suite() {
# Line 50 | Line 50 | public class LinkedListTest extends JSR1
50       */
51      public void testConstructor3() {
52          try {
53 <            LinkedList q = new LinkedList((Collection)null);
53 >            new LinkedList((Collection)null);
54              shouldThrow();
55          } catch (NullPointerException success) {}
56      }
# Line 102 | Line 102 | public class LinkedListTest extends JSR1
102      public void testOfferNull() {
103          LinkedList q = new LinkedList();
104          q.offer(null);
105 +        assertNull(q.get(0));
106 +        assertTrue(q.contains(null));
107      }
108  
109      /**
# Line 128 | Line 130 | public class LinkedListTest extends JSR1
130       * addAll(null) throws NPE
131       */
132      public void testAddAll1() {
133 +        LinkedList q = new LinkedList();
134          try {
132            LinkedList q = new LinkedList();
135              q.addAll(null);
136              shouldThrow();
137          } catch (NullPointerException success) {}
# Line 237 | Line 239 | public class LinkedListTest extends JSR1
239       */
240      public void testRemoveElement() {
241          LinkedList q = populatedQueue(SIZE);
242 <        for (int i = 1; i < SIZE; i+=2) {
242 >        for (int i = 1; i < SIZE; i += 2) {
243              assertTrue(q.contains(i));
244              assertTrue(q.remove((Integer)i));
245              assertFalse(q.contains(i));
246              assertTrue(q.contains(i-1));
247          }
248 <        for (int i = 0; i < SIZE; i+=2) {
248 >        for (int i = 0; i < SIZE; i += 2) {
249              assertTrue(q.contains(i));
250              assertTrue(q.remove((Integer)i));
251              assertFalse(q.contains(i));
# Line 322 | Line 324 | public class LinkedListTest extends JSR1
324              assertTrue(q.removeAll(p));
325              assertEquals(SIZE-i, q.size());
326              for (int j = 0; j < i; ++j) {
327 <                Integer I = (Integer)(p.remove());
328 <                assertFalse(q.contains(I));
327 >                Integer x = (Integer)(p.remove());
328 >                assertFalse(q.contains(x));
329              }
330          }
331      }
# Line 379 | Line 381 | public class LinkedListTest extends JSR1
381       */
382      public void testIterator() {
383          LinkedList q = populatedQueue(SIZE);
382        int i = 0;
384          Iterator it = q.iterator();
385 <        while (it.hasNext()) {
385 >        int i;
386 >        for (i = 0; it.hasNext(); i++)
387              assertTrue(q.contains(it.next()));
386            ++i;
387        }
388          assertEquals(i, SIZE);
389 +        assertIteratorExhausted(it);
390 +    }
391 +
392 +    /**
393 +     * iterator of empty collection has no elements
394 +     */
395 +    public void testEmptyIterator() {
396 +        assertIteratorExhausted(new LinkedList().iterator());
397      }
398  
399      /**
# Line 606 | Line 614 | public class LinkedListTest extends JSR1
614       */
615      public void testRemoveFirstOccurrence() {
616          LinkedList q = populatedQueue(SIZE);
617 <        for (int i = 1; i < SIZE; i+=2) {
617 >        for (int i = 1; i < SIZE; i += 2) {
618              assertTrue(q.removeFirstOccurrence(new Integer(i)));
619          }
620 <        for (int i = 0; i < SIZE; i+=2) {
620 >        for (int i = 0; i < SIZE; i += 2) {
621              assertTrue(q.removeFirstOccurrence(new Integer(i)));
622              assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
623          }
# Line 621 | Line 629 | public class LinkedListTest extends JSR1
629       */
630      public void testRemoveLastOccurrence() {
631          LinkedList q = populatedQueue(SIZE);
632 <        for (int i = 1; i < SIZE; i+=2) {
632 >        for (int i = 1; i < SIZE; i += 2) {
633              assertTrue(q.removeLastOccurrence(new Integer(i)));
634          }
635 <        for (int i = 0; i < SIZE; i+=2) {
635 >        for (int i = 0; i < SIZE; i += 2) {
636              assertTrue(q.removeLastOccurrence(new Integer(i)));
637              assertFalse(q.removeLastOccurrence(new Integer(i+1)));
638          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines