--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2011/05/31 16:16:24	1.41
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2012/07/16 13:17:43	1.48
@@ -29,7 +29,7 @@ public class LinkedBlockingDequeTest ext
 
     public static class Bounded extends BlockingQueueTest {
         protected BlockingQueue emptyCollection() {
-            return new LinkedBlockingDeque(20);
+            return new LinkedBlockingDeque(SIZE);
         }
     }
 
@@ -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) {
@@ -622,14 +622,14 @@ public class LinkedBlockingDequeTest ext
             }});
 
         await(pleaseTake);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
         assertEquals(0, q.take());
 
         await(pleaseInterrupt);
         assertThreadStaysAlive(t);
         t.interrupt();
         awaitTermination(t);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
     }
 
     /**
@@ -854,14 +854,14 @@ public class LinkedBlockingDequeTest ext
             }});
 
         await(pleaseTake);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
         assertEquals(capacity - 1, q.take());
 
         await(pleaseInterrupt);
         assertThreadStaysAlive(t);
         t.interrupt();
         awaitTermination(t);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
     }
 
     /**
@@ -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());
@@ -1201,14 +1201,14 @@ public class LinkedBlockingDequeTest ext
             }});
 
         await(pleaseTake);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
         assertEquals(0, q.take());
 
         await(pleaseInterrupt);
         assertThreadStaysAlive(t);
         t.interrupt();
         awaitTermination(t);
-        assertEquals(q.remainingCapacity(), 0);
+        assertEquals(0, q.remainingCapacity());
     }
 
     /**
@@ -1400,27 +1400,6 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * remove(x) removes x and returns true if present
-     */
-    public void testRemoveElement() {
-        LinkedBlockingDeque q = populatedDeque(SIZE);
-        for (int i = 1; i < SIZE; i+=2) {
-            assertTrue(q.contains(i));
-            assertTrue(q.remove(i));
-            assertFalse(q.contains(i));
-            assertTrue(q.contains(i-1));
-        }
-        for (int i = 0; i < SIZE; i+=2) {
-            assertTrue(q.contains(i));
-            assertTrue(q.remove(i));
-            assertFalse(q.contains(i));
-            assertFalse(q.remove(i+1));
-            assertFalse(q.contains(i+1));
-        }
-        assertTrue(q.isEmpty());
-    }
-
-    /**
      * contains(x) reports true when elements added but not yet removed
      */
     public void testContains() {
@@ -1500,7 +1479,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * toArray contains all elements in FIFO order
      */
-    public void testToArray() throws InterruptedException{
+    public void testToArray() throws InterruptedException {
         LinkedBlockingDeque q = populatedDeque(SIZE);
         Object[] o = q.toArray();
         for (int i = 0; i < o.length; i++)
@@ -1739,8 +1718,8 @@ public class LinkedBlockingDequeTest ext
         LinkedBlockingDeque q = populatedDeque(SIZE);
         ArrayList l = new ArrayList();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
-        assertEquals(l.size(), SIZE);
+        assertEquals(0, q.size());
+        assertEquals(SIZE, l.size());
         for (int i = 0; i < SIZE; ++i)
             assertEquals(l.get(i), new Integer(i));
         q.add(zero);
@@ -1750,8 +1729,8 @@ public class LinkedBlockingDequeTest ext
         assertTrue(q.contains(one));
         l.clear();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
-        assertEquals(l.size(), 2);
+        assertEquals(0, q.size());
+        assertEquals(2, l.size());
         for (int i = 0; i < 2; ++i)
             assertEquals(l.get(i), new Integer(i));
     }
@@ -1787,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) ;