--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2011/11/26 05:19:17	1.48
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2014/12/31 20:17:39	1.56
@@ -6,19 +6,21 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
-import java.util.Arrays;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import junit.framework.Test;
 
 public class LinkedBlockingQueueTest extends JSR166TestCase {
 
@@ -45,7 +47,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * Create a queue of given size containing consecutive
+     * Returns a new queue of given size containing consecutive
      * Integers 0 ... n.
      */
     private LinkedBlockingQueue<Integer> populatedQueue(int n) {
@@ -245,9 +247,9 @@ public class LinkedBlockingQueueTest ext
     public void testPut() throws InterruptedException {
         LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            Integer I = new Integer(i);
-            q.put(I);
-            assertTrue(q.contains(I));
+            Integer x = new Integer(i);
+            q.put(x);
+            assertTrue(q.contains(x));
         }
         assertEquals(0, q.remainingCapacity());
     }
@@ -513,7 +515,7 @@ public class LinkedBlockingQueueTest ext
         assertTrue(q.remove(new Integer(1)));
         assertTrue(q.remove(new Integer(2)));
         assertTrue(q.add(new Integer(3)));
-        assertTrue(q.take() != null);
+        assertNotNull(q.take());
     }
 
     /**
@@ -587,8 +589,8 @@ public class LinkedBlockingQueueTest ext
             assertTrue(q.removeAll(p));
             assertEquals(SIZE-i, q.size());
             for (int j = 0; j < i; ++j) {
-                Integer I = (Integer)(p.remove());
-                assertFalse(q.contains(I));
+                Integer x = (Integer)(p.remove());
+                assertFalse(q.contains(x));
             }
         }
     }
@@ -755,7 +757,7 @@ public class LinkedBlockingQueueTest ext
         Queue x = populatedQueue(SIZE);
         Queue y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(x, y);
         assertEquals(x.size(), y.size());
         assertEquals(x.toString(), y.toString());
         assertTrue(Arrays.equals(x.toArray(), y.toArray()));
@@ -821,11 +823,26 @@ public class LinkedBlockingQueueTest ext
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
             int k = (i < SIZE) ? i : SIZE;
-            assertEquals(l.size(), k);
-            assertEquals(q.size(), SIZE-k);
+            assertEquals(k, l.size());
+            assertEquals(SIZE-k, q.size());
             for (int j = 0; j < k; ++j)
                 assertEquals(l.get(j), new Integer(j));
-            while (q.poll() != null) ;
+            do {} while (q.poll() != null);
+        }
+    }
+
+    /**
+     * remove(null), contains(null) always return false
+     */
+    public void testNeverContainsNull() {
+        Collection<?>[] qs = {
+            new LinkedBlockingQueue<Object>(),
+            populatedQueue(2),
+        };
+
+        for (Collection<?> q : qs) {
+            assertFalse(q.contains(null));
+            assertFalse(q.remove(null));
         }
     }