--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2011/05/30 22:43:20	1.45
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2013/05/30 03:28:55	1.52
@@ -12,13 +12,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import java.io.*;
 
 public class LinkedBlockingQueueTest extends JSR166TestCase {
 
@@ -30,7 +30,7 @@ public class LinkedBlockingQueueTest ext
 
     public static class Bounded extends BlockingQueueTest {
         protected BlockingQueue emptyCollection() {
-            return new LinkedBlockingQueue(20);
+            return new LinkedBlockingQueue(SIZE);
         }
     }
 
@@ -45,7 +45,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * Create a queue of given size containing consecutive
+     * Returns a new queue of given size containing consecutive
      * Integers 0 ... n.
      */
     private LinkedBlockingQueue<Integer> populatedQueue(int n) {
@@ -312,14 +312,14 @@ public class LinkedBlockingQueueTest 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());
     }
 
     /**
@@ -504,27 +504,6 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * remove(x) removes x and returns true if present
-     */
-    public void testRemoveElement() {
-        LinkedBlockingQueue q = populatedQueue(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());
-    }
-
-    /**
      * An add following remove(x) succeeds
      */
     public void testRemoveElementAndAdd() throws InterruptedException {
@@ -534,7 +513,7 @@ public class LinkedBlockingQueueTest ext
         assertTrue(q.remove(new Integer(1)));
         assertTrue(q.remove(new Integer(2)));
         assertTrue(q.add(new Integer(3)));
-        assertTrue(q.take() != null);
+        assertNotNull(q.take());
     }
 
     /**
@@ -773,19 +752,18 @@ public class LinkedBlockingQueueTest ext
      * A deserialized serialized queue has same elements in same order
      */
     public void testSerialization() throws Exception {
-        LinkedBlockingQueue q = populatedQueue(SIZE);
+        Queue x = populatedQueue(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));
-        LinkedBlockingQueue r = (LinkedBlockingQueue)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.remove(), r.remove());
+        assertNotSame(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());
     }
 
     /**
@@ -795,8 +773,8 @@ public class LinkedBlockingQueueTest ext
         LinkedBlockingQueue q = populatedQueue(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);
@@ -806,8 +784,8 @@ public class LinkedBlockingQueueTest 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));
     }
@@ -843,8 +821,8 @@ public class LinkedBlockingQueueTest 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) ;