--- jsr166/src/test/tck/LinkedListTest.java 2009/11/22 18:57:17 1.16 +++ jsr166/src/test/tck/LinkedListTest.java 2014/12/31 19:05:43 1.32 @@ -1,18 +1,23 @@ /* * 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; +import junit.framework.TestSuite; public class LinkedListTest extends JSR166TestCase { public static void main(String[] args) { - junit.textui.TestRunner.run (suite()); + junit.textui.TestRunner.run(suite()); } public static Test suite() { @@ -20,11 +25,11 @@ public class LinkedListTest extends JSR1 } /** - * Create a queue of given size containing consecutive + * Returns a new queue of given size containing consecutive * Integers 0 ... n. */ - private LinkedList populatedQueue(int n) { - LinkedList q = new LinkedList(); + private LinkedList populatedQueue(int n) { + LinkedList q = new LinkedList(); assertTrue(q.isEmpty()); for (int i = 0; i < n; ++i) assertTrue(q.offer(new Integer(i))); @@ -174,7 +179,7 @@ public class LinkedListTest extends JSR1 } /** - * poll succeeds unless empty + * poll succeeds unless empty */ public void testPoll() { LinkedList q = populatedQueue(SIZE); @@ -185,7 +190,7 @@ public class LinkedListTest extends JSR1 } /** - * peek returns next element, or null if empty + * peek returns next element, or null if empty */ public void testPeek() { LinkedList q = populatedQueue(SIZE); @@ -214,7 +219,7 @@ public class LinkedListTest extends JSR1 } /** - * remove removes next element, or throws NSEE if empty + * remove removes next element, or throws NSEE if empty */ public void testRemove() { LinkedList q = populatedQueue(SIZE); @@ -233,11 +238,17 @@ 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))); + 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.remove(new Integer(i))); - assertFalse(q.remove(new Integer(i+1))); + 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()); } @@ -318,54 +329,53 @@ public class LinkedListTest extends JSR1 } /** - * 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) {} } /** - * toArray with incompatable aray type throws CCE + * toArray(incompatible array type) throws ArrayStoreException */ public void testToArray1_BadArg() { LinkedList l = new LinkedList(); l.add(new Integer(5)); try { - Object o[] = l.toArray(new String[10]); + l.toArray(new String[10]); shouldThrow(); } catch (ArrayStoreException success) {} } /** - * iterator iterates through all elements + * iterator iterates through all elements */ public void testIterator() { LinkedList q = populatedQueue(SIZE); @@ -379,7 +389,7 @@ public class LinkedListTest extends JSR1 } /** - * iterator ordering is FIFO + * iterator ordering is FIFO */ public void testIteratorOrdering() { final LinkedList q = new LinkedList(); @@ -397,22 +407,22 @@ public class LinkedListTest extends JSR1 /** * iterator.remove removes current element */ - public void testIteratorRemove () { + public void testIteratorRemove() { final LinkedList q = new LinkedList(); q.add(new Integer(1)); 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()); } /** - * Descending iterator iterates through all elements + * Descending iterator iterates through all elements */ public void testDescendingIterator() { LinkedList q = populatedQueue(SIZE); @@ -431,7 +441,7 @@ public class LinkedListTest extends JSR1 } /** - * Descending iterator ordering is reverse FIFO + * Descending iterator ordering is reverse FIFO */ public void testDescendingIteratorOrdering() { final LinkedList q = new LinkedList(); @@ -449,21 +459,20 @@ public class LinkedListTest extends JSR1 /** * descendingIterator.remove removes current element */ - public void testDescendingIteratorRemove () { + public void testDescendingIteratorRemove() { final LinkedList q = new LinkedList(); - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); + q.add(three); + q.add(two); + q.add(one); Iterator it = q.descendingIterator(); it.next(); it.remove(); it = q.descendingIterator(); - assertEquals(it.next(), 2); - assertEquals(it.next(), 3); + assertSame(it.next(), two); + assertSame(it.next(), three); assertFalse(it.hasNext()); } - /** * toString contains toStrings of elements */ @@ -471,7 +480,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))); } } @@ -481,7 +490,7 @@ public class LinkedListTest extends JSR1 public void testAddFirst() { LinkedList q = populatedQueue(3); q.addFirst(four); - assertEquals(four,q.peek()); + assertSame(four, q.peek()); } /** @@ -489,13 +498,12 @@ public class LinkedListTest extends JSR1 */ public void testPush() { LinkedList q = populatedQueue(3); - q.pollLast(); q.push(four); - assertEquals(four,q.peekFirst()); + assertSame(four, q.peekFirst()); } /** - * pop removes next element, or throws NSEE if empty + * pop removes next element, or throws NSEE if empty */ public void testPop() { LinkedList q = populatedQueue(SIZE); @@ -527,7 +535,7 @@ public class LinkedListTest extends JSR1 } /** - * pollLast succeeds unless empty + * pollLast succeeds unless empty */ public void testPollLast() { LinkedList q = populatedQueue(SIZE); @@ -538,7 +546,7 @@ public class LinkedListTest extends JSR1 } /** - * peekFirst returns next element, or null if empty + * peekFirst returns next element, or null if empty */ public void testPeekFirst() { LinkedList q = populatedQueue(SIZE); @@ -551,9 +559,8 @@ public class LinkedListTest extends JSR1 assertNull(q.peekFirst()); } - /** - * peekLast returns next element, or null if empty + * peekLast returns next element, or null if empty */ public void testPeekLast() { LinkedList q = populatedQueue(SIZE); @@ -579,7 +586,7 @@ public class LinkedListTest extends JSR1 } /** - * getLast returns next element, or throws NSEE if empty + * getLast returns next element, or throws NSEE if empty */ public void testLastElement() { LinkedList q = populatedQueue(SIZE);