--- jsr166/src/test/tck/LinkedListTest.java 2011/03/15 19:47:06 1.26 +++ jsr166/src/test/tck/LinkedListTest.java 2018/04/03 05:49:43 1.47 @@ -6,30 +6,58 @@ * 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.List; +import java.util.NoSuchElementException; +import java.util.concurrent.ThreadLocalRandom; + +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 List 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 List emptyCollection() { + List list = super.emptyCollection(); + ThreadLocalRandom rnd = ThreadLocalRandom.current(); + if (rnd.nextBoolean()) + list.add(makeElement(rnd.nextInt())); + int i = rnd.nextInt(list.size() + 1); + return list.subList(i, i); + } + } + 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 +73,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 +110,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 +125,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 +153,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,18 +262,18 @@ public class LinkedListTest extends JSR1 */ public void testRemoveElement() { LinkedList q = populatedQueue(SIZE); - for (int i = 1; i < SIZE; i+=2) { + 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)); + assertTrue(q.contains(i - 1)); } - for (int i = 0; i < SIZE; i+=2) { + 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)); + assertFalse(q.remove((Integer)(i + 1))); + assertFalse(q.contains(i + 1)); } assertTrue(q.isEmpty()); } @@ -302,7 +332,7 @@ public class LinkedListTest extends JSR1 assertTrue(changed); assertTrue(q.containsAll(p)); - assertEquals(SIZE-i, q.size()); + assertEquals(SIZE - i, q.size()); p.remove(); } } @@ -315,10 +345,10 @@ 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)); } } } @@ -374,13 +404,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()); } /** @@ -408,11 +444,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()); } @@ -468,7 +504,6 @@ public class LinkedListTest extends JSR1 assertFalse(it.hasNext()); } - /** * toString contains toStrings of elements */ @@ -476,7 +511,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))); } } @@ -535,7 +570,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()); @@ -555,13 +590,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 || @@ -587,7 +621,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()); } @@ -603,12 +637,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()); } @@ -618,12 +652,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()); }