--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2011/05/30 22:43:20	1.40
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2011/07/15 18:49:31	1.42
@@ -10,6 +10,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.Queue;
 import java.util.concurrent.BlockingDeque;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
@@ -17,7 +18,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingDeque;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import java.io.*;
 
 public class LinkedBlockingDequeTest extends JSR166TestCase {
 
@@ -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);
         }
     }
 
@@ -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() {
@@ -1718,19 +1697,18 @@ public class LinkedBlockingDequeTest ext
      * A deserialized serialized deque has same elements in same order
      */
     public void testSerialization() throws Exception {
-        LinkedBlockingDeque q = populatedDeque(SIZE);
+        Queue x = populatedDeque(SIZE);
+        Queue y = serialClone(x);
 
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.remove(), r.remove());
+        assertTrue(x != y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.remove(), y.remove());
+        }
+        assertTrue(y.isEmpty());
     }
 
     /**