--- jsr166/src/test/tck/LinkedListTest.java 2010/11/03 07:54:52 1.21 +++ jsr166/src/test/tck/LinkedListTest.java 2017/03/11 18:20:47 1.46 @@ -1,35 +1,56 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * http://creativecommons.org/publicdomain/zero/1.0/ * Other contributors include Andrew Wright, Jeffrey Hayes, * Pat Fisher, Mike Judd. */ -import junit.framework.*; -import java.util.*; -import java.util.concurrent.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.NoSuchElementException; + +import junit.framework.Test; public class LinkedListTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); + main(suite(), args); } public static Test suite() { - return new TestSuite(LinkedListTest.class); + class Implementation implements CollectionImplementation { + public Class klazz() { return LinkedList.class; } + public Collection emptyCollection() { return new LinkedList(); } + public Object makeElement(int i) { return i; } + public boolean isConcurrent() { return false; } + public boolean permitsNulls() { return true; } + } + class SubListImplementation extends Implementation { + public Collection emptyCollection() { + return new LinkedList().subList(0, 0); + } + } + return newTestSuite( + LinkedListTest.class, + CollectionTest.testSuite(new Implementation()), + CollectionTest.testSuite(new SubListImplementation())); } /** - * Create a queue of given size containing consecutive - * Integers 0 ... n. + * Returns a new queue of given size containing consecutive + * Integers 0 ... n - 1. */ - private LinkedList populatedQueue(int n) { - LinkedList q = new LinkedList(); + private static LinkedList populatedQueue(int n) { + LinkedList q = new LinkedList<>(); assertTrue(q.isEmpty()); for (int i = 0; i < n; ++i) assertTrue(q.offer(new Integer(i))); assertFalse(q.isEmpty()); assertEquals(n, q.size()); + assertEquals((Integer) 0, q.peekFirst()); + assertEquals((Integer) (n - 1), q.peekLast()); return q; } @@ -45,7 +66,7 @@ public class LinkedListTest extends JSR1 */ public void testConstructor3() { try { - LinkedList q = new LinkedList((Collection)null); + new LinkedList((Collection)null); shouldThrow(); } catch (NullPointerException success) {} } @@ -82,7 +103,7 @@ public class LinkedListTest extends JSR1 public void testSize() { LinkedList q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); q.remove(); } for (int i = 0; i < SIZE; ++i) { @@ -97,6 +118,8 @@ public class LinkedListTest extends JSR1 public void testOfferNull() { LinkedList q = new LinkedList(); q.offer(null); + assertNull(q.get(0)); + assertTrue(q.contains(null)); } /** @@ -123,8 +146,8 @@ public class LinkedListTest extends JSR1 * addAll(null) throws NPE */ public void testAddAll1() { + LinkedList q = new LinkedList(); try { - LinkedList q = new LinkedList(); q.addAll(null); shouldThrow(); } catch (NullPointerException success) {} @@ -232,12 +255,18 @@ public class LinkedListTest extends JSR1 */ public void testRemoveElement() { LinkedList q = populatedQueue(SIZE); - for (int i = 1; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - } - for (int i = 0; i < SIZE; i+=2) { - assertTrue(q.remove(new Integer(i))); - assertFalse(q.remove(new Integer(i+1))); + for (int i = 1; i < SIZE; i += 2) { + assertTrue(q.contains(i)); + assertTrue(q.remove((Integer)i)); + assertFalse(q.contains(i)); + assertTrue(q.contains(i - 1)); + } + for (int i = 0; i < SIZE; i += 2) { + assertTrue(q.contains(i)); + assertTrue(q.remove((Integer)i)); + assertFalse(q.contains(i)); + assertFalse(q.remove((Integer)(i + 1))); + assertFalse(q.contains(i + 1)); } assertTrue(q.isEmpty()); } @@ -296,7 +325,7 @@ public class LinkedListTest extends JSR1 assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); p.remove(); } } @@ -309,45 +338,44 @@ public class LinkedListTest extends JSR1 LinkedList q = populatedQueue(SIZE); LinkedList p = populatedQueue(i); assertTrue(q.removeAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); for (int j = 0; j < i; ++j) { - Integer I = (Integer)(p.remove()); - assertFalse(q.contains(I)); + Integer x = (Integer)(p.remove()); + assertFalse(q.contains(x)); } } } /** - * toArray contains all elements + * toArray contains all elements in FIFO order */ public void testToArray() { LinkedList q = populatedQueue(SIZE); Object[] o = q.toArray(); - Arrays.sort(o); for (int i = 0; i < o.length; i++) - assertEquals(o[i], q.poll()); + assertSame(o[i], q.poll()); } /** - * toArray(a) contains all elements + * toArray(a) contains all elements in FIFO order */ public void testToArray2() { - LinkedList q = populatedQueue(SIZE); + LinkedList q = populatedQueue(SIZE); Integer[] ints = new Integer[SIZE]; - ints = (Integer[])q.toArray(ints); - Arrays.sort(ints); + Integer[] array = q.toArray(ints); + assertSame(ints, array); for (int i = 0; i < ints.length; i++) - assertEquals(ints[i], q.poll()); + assertSame(ints[i], q.poll()); } /** - * toArray(null) throws NPE + * toArray(null) throws NullPointerException */ - public void testToArray_BadArg() { + public void testToArray_NullArg() { LinkedList l = new LinkedList(); l.add(new Object()); try { - Object o[] = l.toArray(null); + l.toArray(null); shouldThrow(); } catch (NullPointerException success) {} } @@ -369,13 +397,19 @@ public class LinkedListTest extends JSR1 */ public void testIterator() { LinkedList q = populatedQueue(SIZE); - int i = 0; Iterator it = q.iterator(); - while (it.hasNext()) { + int i; + for (i = 0; it.hasNext(); i++) assertTrue(q.contains(it.next())); - ++i; - } assertEquals(i, SIZE); + assertIteratorExhausted(it); + } + + /** + * iterator of empty collection has no elements + */ + public void testEmptyIterator() { + assertIteratorExhausted(new LinkedList().iterator()); } /** @@ -403,11 +437,11 @@ public class LinkedListTest extends JSR1 q.add(new Integer(2)); q.add(new Integer(3)); Iterator it = q.iterator(); - assertEquals(it.next(), 1); + assertEquals(1, it.next()); it.remove(); it = q.iterator(); - assertEquals(it.next(), 2); - assertEquals(it.next(), 3); + assertEquals(2, it.next()); + assertEquals(3, it.next()); assertFalse(it.hasNext()); } @@ -463,7 +497,6 @@ public class LinkedListTest extends JSR1 assertFalse(it.hasNext()); } - /** * toString contains toStrings of elements */ @@ -471,7 +504,7 @@ public class LinkedListTest extends JSR1 LinkedList q = populatedQueue(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { - assertTrue(s.indexOf(String.valueOf(i)) >= 0); + assertTrue(s.contains(String.valueOf(i))); } } @@ -530,7 +563,7 @@ public class LinkedListTest extends JSR1 */ public void testPollLast() { LinkedList q = populatedQueue(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.pollLast()); } assertNull(q.pollLast()); @@ -550,13 +583,12 @@ public class LinkedListTest extends JSR1 assertNull(q.peekFirst()); } - /** * peekLast returns next element, or null if empty */ public void testPeekLast() { LinkedList q = populatedQueue(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.peekLast()); assertEquals(i, q.pollLast()); assertTrue(q.peekLast() == null || @@ -582,7 +614,7 @@ public class LinkedListTest extends JSR1 */ public void testLastElement() { LinkedList q = populatedQueue(SIZE); - for (int i = SIZE-1; i >= 0; --i) { + for (int i = SIZE - 1; i >= 0; --i) { assertEquals(i, q.getLast()); assertEquals(i, q.pollLast()); } @@ -598,12 +630,12 @@ public class LinkedListTest extends JSR1 */ public void testRemoveFirstOccurrence() { LinkedList q = populatedQueue(SIZE); - for (int i = 1; i < SIZE; i+=2) { + for (int i = 1; i < SIZE; i += 2) { assertTrue(q.removeFirstOccurrence(new Integer(i))); } - for (int i = 0; i < SIZE; i+=2) { + for (int i = 0; i < SIZE; i += 2) { assertTrue(q.removeFirstOccurrence(new Integer(i))); - assertFalse(q.removeFirstOccurrence(new Integer(i+1))); + assertFalse(q.removeFirstOccurrence(new Integer(i + 1))); } assertTrue(q.isEmpty()); } @@ -613,12 +645,12 @@ public class LinkedListTest extends JSR1 */ public void testRemoveLastOccurrence() { LinkedList q = populatedQueue(SIZE); - for (int i = 1; i < SIZE; i+=2) { + for (int i = 1; i < SIZE; i += 2) { assertTrue(q.removeLastOccurrence(new Integer(i))); } - for (int i = 0; i < SIZE; i+=2) { + for (int i = 0; i < SIZE; i += 2) { assertTrue(q.removeLastOccurrence(new Integer(i))); - assertFalse(q.removeLastOccurrence(new Integer(i+1))); + assertFalse(q.removeLastOccurrence(new Integer(i + 1))); } assertTrue(q.isEmpty()); }