--- jsr166/src/test/tck/LinkedListTest.java	2009/11/22 18:57:17	1.16
+++ jsr166/src/test/tck/LinkedListTest.java	2010/11/03 07:54:52	1.21
@@ -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() {
@@ -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);
@@ -318,7 +318,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  toArray contains all elements
+     * toArray contains all elements
      */
     public void testToArray() {
         LinkedList q = populatedQueue(SIZE);
@@ -329,7 +329,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  toArray(a) contains all elements
+     * toArray(a) contains all elements
      */
     public void testToArray2() {
         LinkedList q = populatedQueue(SIZE);
@@ -353,19 +353,19 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     * 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 +379,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  iterator ordering is FIFO
+     * iterator ordering is FIFO
      */
     public void testIteratorOrdering() {
         final LinkedList q = new LinkedList();
@@ -397,7 +397,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 +412,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 +431,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,17 +449,17 @@ 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());
     }
 
@@ -481,7 +481,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 +489,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 +526,7 @@ public class LinkedListTest extends JSR1
     }
 
     /**
-     *  pollLast succeeds unless empty
+     * pollLast succeeds unless empty
      */
     public void testPollLast() {
         LinkedList q = populatedQueue(SIZE);
@@ -538,7 +537,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);
@@ -553,7 +552,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);
@@ -579,7 +578,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);