--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2011/11/26 05:19:17	1.44
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2013/05/30 03:28:55	1.49
@@ -44,7 +44,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 +1064,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 +1700,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,8 +1766,8 @@ 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) ;