--- jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2013/05/30 03:28:55	1.30
+++ jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2014/12/31 19:05:42	1.32
@@ -6,7 +6,6 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -14,6 +13,9 @@ import java.util.NoSuchElementException;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class ConcurrentLinkedQueueTest extends JSR166TestCase {
 
     public static void main(String[] args) {
@@ -514,4 +516,18 @@ public class ConcurrentLinkedQueueTest e
         assertTrue(y.isEmpty());
     }
 
+    /**
+     * remove(null), contains(null) always return false
+     */
+    public void testNeverContainsNull() {
+        Collection<?>[] qs = {
+            new ConcurrentLinkedQueue<Object>(),
+            populatedQueue(2),
+        };
+
+        for (Collection<?> q : qs) {
+            assertFalse(q.contains(null));
+            assertFalse(q.remove(null));
+        }
+    }
 }