--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2011/11/26 05:19:17	1.44
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2014/12/31 19:21:20	1.52
@@ -4,10 +4,12 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-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.Deque;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Queue;
@@ -17,7 +19,8 @@ import java.util.concurrent.CountDownLat
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import junit.framework.Test;
 
 public class LinkedBlockingDequeTest extends JSR166TestCase {
 
@@ -44,7 +47,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * Create a deque of given size containing consecutive
+     * Returns a new deque of given size containing consecutive
      * Integers 0 ... n.
      */
     private LinkedBlockingDeque<Integer> populatedDeque(int n) {
@@ -1064,7 +1067,7 @@ public class LinkedBlockingDequeTest ext
 
                 pleaseInterrupt.countDown();
                 try {
-                    q.pollFirst(SMALL_DELAY_MS, MILLISECONDS);
+                    q.pollFirst(LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (InterruptedException success) {}
                 assertFalse(Thread.interrupted());
@@ -1700,7 +1703,7 @@ public class LinkedBlockingDequeTest ext
         Queue x = populatedDeque(SIZE);
         Queue y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(y, x);
         assertEquals(x.size(), y.size());
         assertEquals(x.toString(), y.toString());
         assertTrue(Arrays.equals(x.toArray(), y.toArray()));
@@ -1766,11 +1769,28 @@ public class LinkedBlockingDequeTest 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() {
+        Deque<?>[] qs = {
+            new LinkedBlockingDeque<Object>(),
+            populatedDeque(2),
+        };
+
+        for (Deque<?> q : qs) {
+            assertFalse(q.contains(null));
+            assertFalse(q.remove(null));
+            assertFalse(q.removeFirstOccurrence(null));
+            assertFalse(q.removeLastOccurrence(null));
         }
     }