--- jsr166/src/test/tck/LinkedListTest.java	2009/12/01 09:56:28	1.17
+++ jsr166/src/test/tck/LinkedListTest.java	2010/11/18 20:21:53	1.25
@@ -12,7 +12,7 @@ import java.util.concurrent.*;
 
 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() {
@@ -23,8 +23,8 @@ public class LinkedListTest extends JSR1
      * Create a queue of given size containing consecutive
      * Integers 0 ... n.
      */
-    private LinkedList populatedQueue(int n) {
-        LinkedList q = new LinkedList();
+    private LinkedList<Integer> populatedQueue(int n) {
+        LinkedList<Integer> q = new LinkedList<Integer>();
         assertTrue(q.isEmpty());
         for (int i = 0; i < n; ++i)
             assertTrue(q.offer(new Integer(i)));
@@ -174,7 +174,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  poll succeeds unless empty
+     * poll succeeds unless empty
      */
     public void testPoll() {
         LinkedList q = populatedQueue(SIZE);
@@ -185,7 +185,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 +214,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 +233,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 +324,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<Integer> 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 +384,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  iterator ordering is FIFO
+     * iterator ordering is FIFO
      */
     public void testIteratorOrdering() {
         final LinkedList q = new LinkedList();
@@ -397,7 +402,7 @@ 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));
@@ -412,7 +417,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  Descending iterator iterates through all elements
+     * Descending iterator iterates through all elements
      */
     public void testDescendingIterator() {
         LinkedList q = populatedQueue(SIZE);
@@ -431,7 +436,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,7 +454,7 @@ public class LinkedListTest extends JSR1
     /**
      * descendingIterator.remove removes current element
      */
-    public void testDescendingIteratorRemove () {
+    public void testDescendingIteratorRemove() {
         final LinkedList q = new LinkedList();
         q.add(three);
         q.add(two);
@@ -494,7 +499,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  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);
@@ -526,7 +531,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  pollLast succeeds unless empty
+     * pollLast succeeds unless empty
      */
     public void testPollLast() {
         LinkedList q = populatedQueue(SIZE);
@@ -537,7 +542,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);
@@ -552,7 +557,7 @@ public class LinkedListTest extends JSR1
 
 
     /**
-     *  peekLast returns next element, or null if empty
+     * peekLast returns next element, or null if empty
      */
     public void testPeekLast() {
         LinkedList q = populatedQueue(SIZE);
@@ -578,7 +583,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);