--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2009/12/01 06:03:49	1.24
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2010/10/19 00:43:49	1.31
@@ -14,12 +14,26 @@ import java.io.*;
 
 public class LinkedBlockingQueueTest extends JSR166TestCase {
 
+    public static class Unbounded extends BlockingQueueTest {
+        protected BlockingQueue emptyCollection() {
+            return new LinkedBlockingQueue();
+        }
+    }
+
+    public static class Bounded extends BlockingQueueTest {
+        protected BlockingQueue emptyCollection() {
+            return new LinkedBlockingQueue(20);
+        }
+    }
+
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
 
     public static Test suite() {
-        return new TestSuite(LinkedBlockingQueueTest.class);
+        return newTestSuite(LinkedBlockingQueueTest.class,
+                            new Unbounded().testSuite(),
+                            new Bounded().testSuite());
     }
 
 
@@ -214,6 +228,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -228,6 +243,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll throws ISE if not enough room
      */
@@ -241,6 +257,7 @@ public class LinkedBlockingQueueTest ext
             shouldThrow();
         } catch (IllegalStateException success) {}
     }
+
     /**
      * Queue contains all elements, in traversal order, of successful addAll
      */
@@ -458,29 +475,6 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     *  timed poll before a delayed offer fails; after offer succeeds;
-     *  on interruption throws
-     */
-    public void testTimedPollWithOffer() throws InterruptedException {
-        final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
-        Thread t = new Thread(new CheckedRunnable() {
-            public void realRun() throws InterruptedException {
-                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
-                try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
-                    shouldThrow();
-                } catch (InterruptedException success) {}
-            }});
-
-        t.start();
-        Thread.sleep(SMALL_DELAY_MS);
-        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
-        t.interrupt();
-        t.join();
-    }
-
-    /**
      * peek returns next element, or null if empty
      */
     public void testPeek() {
@@ -686,7 +680,7 @@ public class LinkedBlockingQueueTest ext
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
         q.add(two);
         q.add(one);
@@ -697,8 +691,8 @@ public class LinkedBlockingQueueTest ext
         it.remove();
 
         it = q.iterator();
-        assertEquals(it.next(), one);
-        assertEquals(it.next(), three);
+        assertSame(it.next(), one);
+        assertSame(it.next(), three);
         assertFalse(it.hasNext());
     }
 
@@ -722,7 +716,7 @@ public class LinkedBlockingQueueTest ext
     /**
      * Modifications do not cause iterators to fail
      */
-    public void testWeaklyConsistentIteration () {
+    public void testWeaklyConsistentIteration() {
         final LinkedBlockingQueue q = new LinkedBlockingQueue(3);
         q.add(one);
         q.add(two);
@@ -901,7 +895,7 @@ public class LinkedBlockingQueueTest ext
     }
 
     /**
-     * drainTo(c, n) empties first max {n, size} elements of queue into c
+     * drainTo(c, n) empties first min(n, size) elements of queue into c
      */
     public void testDrainToN() {
         LinkedBlockingQueue q = new LinkedBlockingQueue();
@@ -910,7 +904,7 @@ public class LinkedBlockingQueueTest ext
                 assertTrue(q.offer(new Integer(j)));
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
-            int k = (i < SIZE)? i : SIZE;
+            int k = (i < SIZE) ? i : SIZE;
             assertEquals(l.size(), k);
             assertEquals(q.size(), SIZE-k);
             for (int j = 0; j < k; ++j)