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.35 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.44 by jsr166, Wed Jan 4 06:09:58 2017 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() {
24 <        return new TestSuite(LinkedListTest.class);
24 >        class Implementation implements CollectionImplementation {
25 >            public Class<?> klazz() { return LinkedList.class; }
26 >            public Collection emptyCollection() { return new LinkedList(); }
27 >            public Object makeElement(int i) { return i; }
28 >            public boolean isConcurrent() { return false; }
29 >            public boolean permitsNulls() { return true; }
30 >        }
31 >        class SubListImplementation extends Implementation {
32 >            public Collection emptyCollection() {
33 >                return new LinkedList().subList(0, 0);
34 >            }
35 >        }
36 >        return newTestSuite(
37 >                LinkedListTest.class,
38 >                CollectionTest.testSuite(new Implementation()),
39 >                CollectionTest.testSuite(new SubListImplementation()));
40      }
41  
42      /**
43       * Returns a new queue of given size containing consecutive
44 <     * Integers 0 ... n.
44 >     * Integers 0 ... n - 1.
45       */
46      private LinkedList<Integer> populatedQueue(int n) {
47 <        LinkedList<Integer> q = new LinkedList<Integer>();
47 >        LinkedList<Integer> q = new LinkedList<>();
48          assertTrue(q.isEmpty());
49          for (int i = 0; i < n; ++i)
50              assertTrue(q.offer(new Integer(i)));
51          assertFalse(q.isEmpty());
52          assertEquals(n, q.size());
53 +        assertEquals((Integer) 0, q.peekFirst());
54 +        assertEquals((Integer) (n - 1), q.peekLast());
55          return q;
56      }
57  
# Line 50 | Line 67 | public class LinkedListTest extends JSR1
67       */
68      public void testConstructor3() {
69          try {
70 <            LinkedList q = new LinkedList((Collection)null);
70 >            new LinkedList((Collection)null);
71              shouldThrow();
72          } catch (NullPointerException success) {}
73      }
# Line 87 | Line 104 | public class LinkedListTest extends JSR1
104      public void testSize() {
105          LinkedList q = populatedQueue(SIZE);
106          for (int i = 0; i < SIZE; ++i) {
107 <            assertEquals(SIZE-i, q.size());
107 >            assertEquals(SIZE - i, q.size());
108              q.remove();
109          }
110          for (int i = 0; i < SIZE; ++i) {
# Line 102 | Line 119 | public class LinkedListTest extends JSR1
119      public void testOfferNull() {
120          LinkedList q = new LinkedList();
121          q.offer(null);
122 +        assertNull(q.get(0));
123 +        assertTrue(q.contains(null));
124      }
125  
126      /**
# Line 128 | Line 147 | public class LinkedListTest extends JSR1
147       * addAll(null) throws NPE
148       */
149      public void testAddAll1() {
150 +        LinkedList q = new LinkedList();
151          try {
132 –            LinkedList q = new LinkedList();
152              q.addAll(null);
153              shouldThrow();
154          } catch (NullPointerException success) {}
# Line 241 | Line 260 | public class LinkedListTest extends JSR1
260              assertTrue(q.contains(i));
261              assertTrue(q.remove((Integer)i));
262              assertFalse(q.contains(i));
263 <            assertTrue(q.contains(i-1));
263 >            assertTrue(q.contains(i - 1));
264          }
265          for (int i = 0; i < SIZE; i += 2) {
266              assertTrue(q.contains(i));
267              assertTrue(q.remove((Integer)i));
268              assertFalse(q.contains(i));
269 <            assertFalse(q.remove((Integer)(i+1)));
270 <            assertFalse(q.contains(i+1));
269 >            assertFalse(q.remove((Integer)(i + 1)));
270 >            assertFalse(q.contains(i + 1));
271          }
272          assertTrue(q.isEmpty());
273      }
# Line 307 | Line 326 | public class LinkedListTest extends JSR1
326                  assertTrue(changed);
327  
328              assertTrue(q.containsAll(p));
329 <            assertEquals(SIZE-i, q.size());
329 >            assertEquals(SIZE - i, q.size());
330              p.remove();
331          }
332      }
# Line 320 | Line 339 | public class LinkedListTest extends JSR1
339              LinkedList q = populatedQueue(SIZE);
340              LinkedList p = populatedQueue(i);
341              assertTrue(q.removeAll(p));
342 <            assertEquals(SIZE-i, q.size());
342 >            assertEquals(SIZE - i, q.size());
343              for (int j = 0; j < i; ++j) {
344                  Integer x = (Integer)(p.remove());
345                  assertFalse(q.contains(x));
# Line 545 | Line 564 | public class LinkedListTest extends JSR1
564       */
565      public void testPollLast() {
566          LinkedList q = populatedQueue(SIZE);
567 <        for (int i = SIZE-1; i >= 0; --i) {
567 >        for (int i = SIZE - 1; i >= 0; --i) {
568              assertEquals(i, q.pollLast());
569          }
570          assertNull(q.pollLast());
# Line 570 | Line 589 | public class LinkedListTest extends JSR1
589       */
590      public void testPeekLast() {
591          LinkedList q = populatedQueue(SIZE);
592 <        for (int i = SIZE-1; i >= 0; --i) {
592 >        for (int i = SIZE - 1; i >= 0; --i) {
593              assertEquals(i, q.peekLast());
594              assertEquals(i, q.pollLast());
595              assertTrue(q.peekLast() == null ||
# Line 596 | Line 615 | public class LinkedListTest extends JSR1
615       */
616      public void testLastElement() {
617          LinkedList q = populatedQueue(SIZE);
618 <        for (int i = SIZE-1; i >= 0; --i) {
618 >        for (int i = SIZE - 1; i >= 0; --i) {
619              assertEquals(i, q.getLast());
620              assertEquals(i, q.pollLast());
621          }
# Line 617 | Line 636 | public class LinkedListTest extends JSR1
636          }
637          for (int i = 0; i < SIZE; i += 2) {
638              assertTrue(q.removeFirstOccurrence(new Integer(i)));
639 <            assertFalse(q.removeFirstOccurrence(new Integer(i+1)));
639 >            assertFalse(q.removeFirstOccurrence(new Integer(i + 1)));
640          }
641          assertTrue(q.isEmpty());
642      }
# Line 632 | Line 651 | public class LinkedListTest extends JSR1
651          }
652          for (int i = 0; i < SIZE; i += 2) {
653              assertTrue(q.removeLastOccurrence(new Integer(i)));
654 <            assertFalse(q.removeLastOccurrence(new Integer(i+1)));
654 >            assertFalse(q.removeLastOccurrence(new Integer(i + 1)));
655          }
656          assertTrue(q.isEmpty());
657      }

Diff Legend

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