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.26 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.39 by jsr166, Sat May 23 00:53:08 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
9 > import java.util.Arrays;
10 > import java.util.Collection;
11 > import java.util.Iterator;
12 > import java.util.LinkedList;
13 > import java.util.NoSuchElementException;
14 >
15 > import junit.framework.Test;
16 > 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 20 | Line 25 | public class LinkedListTest extends JSR1
25      }
26  
27      /**
28 <     * Create a queue of given size containing consecutive
28 >     * Returns a new queue of given size containing consecutive
29       * Integers 0 ... n.
30       */
31      private LinkedList<Integer> populatedQueue(int n) {
# Line 45 | 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 82 | Line 87 | public class LinkedListTest extends JSR1
87      public void testSize() {
88          LinkedList q = populatedQueue(SIZE);
89          for (int i = 0; i < SIZE; ++i) {
90 <            assertEquals(SIZE-i, q.size());
90 >            assertEquals(SIZE - i, q.size());
91              q.remove();
92          }
93          for (int i = 0; i < SIZE; ++i) {
# Line 97 | 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 123 | Line 130 | public class LinkedListTest extends JSR1
130       * addAll(null) throws NPE
131       */
132      public void testAddAll1() {
133 +        LinkedList q = new LinkedList();
134          try {
127            LinkedList q = new LinkedList();
135              q.addAll(null);
136              shouldThrow();
137          } catch (NullPointerException success) {}
# Line 232 | 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 302 | Line 309 | public class LinkedListTest extends JSR1
309                  assertTrue(changed);
310  
311              assertTrue(q.containsAll(p));
312 <            assertEquals(SIZE-i, q.size());
312 >            assertEquals(SIZE - i, q.size());
313              p.remove();
314          }
315      }
# Line 315 | Line 322 | public class LinkedListTest extends JSR1
322              LinkedList q = populatedQueue(SIZE);
323              LinkedList p = populatedQueue(i);
324              assertTrue(q.removeAll(p));
325 <            assertEquals(SIZE-i, q.size());
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 374 | Line 381 | public class LinkedListTest extends JSR1
381       */
382      public void testIterator() {
383          LinkedList q = populatedQueue(SIZE);
377        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()));
381            ++i;
382        }
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 408 | Line 421 | public class LinkedListTest extends JSR1
421          q.add(new Integer(2));
422          q.add(new Integer(3));
423          Iterator it = q.iterator();
424 <        assertEquals(it.next(), 1);
424 >        assertEquals(1, it.next());
425          it.remove();
426          it = q.iterator();
427 <        assertEquals(it.next(), 2);
428 <        assertEquals(it.next(), 3);
427 >        assertEquals(2, it.next());
428 >        assertEquals(3, it.next());
429          assertFalse(it.hasNext());
430      }
431  
# Line 468 | Line 481 | public class LinkedListTest extends JSR1
481          assertFalse(it.hasNext());
482      }
483  
471
484      /**
485       * toString contains toStrings of elements
486       */
# Line 476 | Line 488 | public class LinkedListTest extends JSR1
488          LinkedList q = populatedQueue(SIZE);
489          String s = q.toString();
490          for (int i = 0; i < SIZE; ++i) {
491 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
491 >            assertTrue(s.contains(String.valueOf(i)));
492          }
493      }
494  
# Line 535 | Line 547 | public class LinkedListTest extends JSR1
547       */
548      public void testPollLast() {
549          LinkedList q = populatedQueue(SIZE);
550 <        for (int i = SIZE-1; i >= 0; --i) {
550 >        for (int i = SIZE - 1; i >= 0; --i) {
551              assertEquals(i, q.pollLast());
552          }
553          assertNull(q.pollLast());
# Line 555 | Line 567 | public class LinkedListTest extends JSR1
567          assertNull(q.peekFirst());
568      }
569  
558
570      /**
571       * peekLast returns next element, or null if empty
572       */
573      public void testPeekLast() {
574          LinkedList q = populatedQueue(SIZE);
575 <        for (int i = SIZE-1; i >= 0; --i) {
575 >        for (int i = SIZE - 1; i >= 0; --i) {
576              assertEquals(i, q.peekLast());
577              assertEquals(i, q.pollLast());
578              assertTrue(q.peekLast() == null ||
# Line 587 | Line 598 | public class LinkedListTest extends JSR1
598       */
599      public void testLastElement() {
600          LinkedList q = populatedQueue(SIZE);
601 <        for (int i = SIZE-1; i >= 0; --i) {
601 >        for (int i = SIZE - 1; i >= 0; --i) {
602              assertEquals(i, q.getLast());
603              assertEquals(i, q.pollLast());
604          }
# Line 603 | 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 618 | 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