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.41 by jsr166, Sun Oct 16 20:44:18 2016 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 26 | Line 26 | public class LinkedListTest extends JSR1
26  
27      /**
28       * Returns a new queue of given size containing consecutive
29 <     * Integers 0 ... n.
29 >     * Integers 0 ... n - 1.
30       */
31      private LinkedList<Integer> populatedQueue(int n) {
32          LinkedList<Integer> q = new LinkedList<Integer>();
# Line 35 | Line 35 | public class LinkedListTest extends JSR1
35              assertTrue(q.offer(new Integer(i)));
36          assertFalse(q.isEmpty());
37          assertEquals(n, q.size());
38 +        assertEquals((Integer) 0, q.peekFirst());
39 +        assertEquals((Integer) (n - 1), q.peekLast());
40          return q;
41      }
42  
# Line 50 | Line 52 | public class LinkedListTest extends JSR1
52       */
53      public void testConstructor3() {
54          try {
55 <            LinkedList q = new LinkedList((Collection)null);
55 >            new LinkedList((Collection)null);
56              shouldThrow();
57          } catch (NullPointerException success) {}
58      }
# Line 87 | Line 89 | public class LinkedListTest extends JSR1
89      public void testSize() {
90          LinkedList q = populatedQueue(SIZE);
91          for (int i = 0; i < SIZE; ++i) {
92 <            assertEquals(SIZE-i, q.size());
92 >            assertEquals(SIZE - i, q.size());
93              q.remove();
94          }
95          for (int i = 0; i < SIZE; ++i) {
# Line 102 | Line 104 | public class LinkedListTest extends JSR1
104      public void testOfferNull() {
105          LinkedList q = new LinkedList();
106          q.offer(null);
107 +        assertNull(q.get(0));
108 +        assertTrue(q.contains(null));
109      }
110  
111      /**
# Line 128 | Line 132 | public class LinkedListTest extends JSR1
132       * addAll(null) throws NPE
133       */
134      public void testAddAll1() {
135 +        LinkedList q = new LinkedList();
136          try {
132 –            LinkedList q = new LinkedList();
137              q.addAll(null);
138              shouldThrow();
139          } catch (NullPointerException success) {}
# Line 237 | Line 241 | public class LinkedListTest extends JSR1
241       */
242      public void testRemoveElement() {
243          LinkedList q = populatedQueue(SIZE);
244 <        for (int i = 1; i < SIZE; i+=2) {
244 >        for (int i = 1; i < SIZE; i += 2) {
245              assertTrue(q.contains(i));
246              assertTrue(q.remove((Integer)i));
247              assertFalse(q.contains(i));
248 <            assertTrue(q.contains(i-1));
248 >            assertTrue(q.contains(i - 1));
249          }
250 <        for (int i = 0; i < SIZE; i+=2) {
250 >        for (int i = 0; i < SIZE; i += 2) {
251              assertTrue(q.contains(i));
252              assertTrue(q.remove((Integer)i));
253              assertFalse(q.contains(i));
254 <            assertFalse(q.remove((Integer)(i+1)));
255 <            assertFalse(q.contains(i+1));
254 >            assertFalse(q.remove((Integer)(i + 1)));
255 >            assertFalse(q.contains(i + 1));
256          }
257          assertTrue(q.isEmpty());
258      }
# Line 307 | Line 311 | public class LinkedListTest extends JSR1
311                  assertTrue(changed);
312  
313              assertTrue(q.containsAll(p));
314 <            assertEquals(SIZE-i, q.size());
314 >            assertEquals(SIZE - i, q.size());
315              p.remove();
316          }
317      }
# Line 320 | Line 324 | public class LinkedListTest extends JSR1
324              LinkedList q = populatedQueue(SIZE);
325              LinkedList p = populatedQueue(i);
326              assertTrue(q.removeAll(p));
327 <            assertEquals(SIZE-i, q.size());
327 >            assertEquals(SIZE - i, q.size());
328              for (int j = 0; j < i; ++j) {
329 <                Integer I = (Integer)(p.remove());
330 <                assertFalse(q.contains(I));
329 >                Integer x = (Integer)(p.remove());
330 >                assertFalse(q.contains(x));
331              }
332          }
333      }
# Line 379 | Line 383 | public class LinkedListTest extends JSR1
383       */
384      public void testIterator() {
385          LinkedList q = populatedQueue(SIZE);
382 –        int i = 0;
386          Iterator it = q.iterator();
387 <        while (it.hasNext()) {
387 >        int i;
388 >        for (i = 0; it.hasNext(); i++)
389              assertTrue(q.contains(it.next()));
386 –            ++i;
387 –        }
390          assertEquals(i, SIZE);
391 +        assertIteratorExhausted(it);
392 +    }
393 +
394 +    /**
395 +     * iterator of empty collection has no elements
396 +     */
397 +    public void testEmptyIterator() {
398 +        assertIteratorExhausted(new LinkedList().iterator());
399      }
400  
401      /**
# Line 539 | Line 549 | public class LinkedListTest extends JSR1
549       */
550      public void testPollLast() {
551          LinkedList q = populatedQueue(SIZE);
552 <        for (int i = SIZE-1; i >= 0; --i) {
552 >        for (int i = SIZE - 1; i >= 0; --i) {
553              assertEquals(i, q.pollLast());
554          }
555          assertNull(q.pollLast());
# Line 564 | Line 574 | public class LinkedListTest extends JSR1
574       */
575      public void testPeekLast() {
576          LinkedList q = populatedQueue(SIZE);
577 <        for (int i = SIZE-1; i >= 0; --i) {
577 >        for (int i = SIZE - 1; i >= 0; --i) {
578              assertEquals(i, q.peekLast());
579              assertEquals(i, q.pollLast());
580              assertTrue(q.peekLast() == null ||
# Line 590 | Line 600 | public class LinkedListTest extends JSR1
600       */
601      public void testLastElement() {
602          LinkedList q = populatedQueue(SIZE);
603 <        for (int i = SIZE-1; i >= 0; --i) {
603 >        for (int i = SIZE - 1; i >= 0; --i) {
604              assertEquals(i, q.getLast());
605              assertEquals(i, q.pollLast());
606          }
# Line 606 | Line 616 | public class LinkedListTest extends JSR1
616       */
617      public void testRemoveFirstOccurrence() {
618          LinkedList q = populatedQueue(SIZE);
619 <        for (int i = 1; i < SIZE; i+=2) {
619 >        for (int i = 1; i < SIZE; i += 2) {
620              assertTrue(q.removeFirstOccurrence(new Integer(i)));
621          }
622 <        for (int i = 0; i < SIZE; i+=2) {
622 >        for (int i = 0; i < SIZE; i += 2) {
623              assertTrue(q.removeFirstOccurrence(new Integer(i)));
624 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
624 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
625          }
626          assertTrue(q.isEmpty());
627      }
# Line 621 | Line 631 | public class LinkedListTest extends JSR1
631       */
632      public void testRemoveLastOccurrence() {
633          LinkedList q = populatedQueue(SIZE);
634 <        for (int i = 1; i < SIZE; i+=2) {
634 >        for (int i = 1; i < SIZE; i += 2) {
635              assertTrue(q.removeLastOccurrence(new Integer(i)));
636          }
637 <        for (int i = 0; i < SIZE; i+=2) {
637 >        for (int i = 0; i < SIZE; i += 2) {
638              assertTrue(q.removeLastOccurrence(new Integer(i)));
639 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
639 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
640          }
641          assertTrue(q.isEmpty());
642      }

Diff Legend

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