--- jsr166/src/test/tck/LinkedListTest.java	2011/05/31 16:16:24	1.28
+++ jsr166/src/test/tck/LinkedListTest.java	2014/12/31 20:09:08	1.33
@@ -6,13 +6,15 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 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());
@@ -23,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) {
@@ -235,13 +237,13 @@ 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));
         }
-        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));
@@ -411,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());
     }
 
@@ -604,10 +606,10 @@ 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)));
         }
@@ -619,10 +621,10 @@ 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)));
         }