--- jsr166/src/test/tck/LinkedListTest.java	2011/03/15 19:47:06	1.26
+++ jsr166/src/test/tck/LinkedListTest.java	2014/12/31 19:05:43	1.32
@@ -6,9 +6,14 @@
  * 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) {
@@ -20,7 +25,7 @@ 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<Integer> populatedQueue(int n) {
@@ -408,11 +413,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 +473,6 @@ public class LinkedListTest extends JSR1
         assertFalse(it.hasNext());
     }
 
-
     /**
      * toString contains toStrings of elements
      */
@@ -476,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)));
         }
     }
 
@@ -555,7 +559,6 @@ public class LinkedListTest extends JSR1
         assertNull(q.peekFirst());
     }
 
-
     /**
      * peekLast returns next element, or null if empty
      */