--- jsr166/src/test/tck/LinkedBlockingDequeTest.java	2009/12/01 09:56:28	1.20
+++ jsr166/src/test/tck/LinkedBlockingDequeTest.java	2010/10/06 07:49:22	1.24
@@ -11,12 +11,27 @@ import static java.util.concurrent.TimeU
 import java.io.*;
 
 public class LinkedBlockingDequeTest extends JSR166TestCase {
+
+    public static class Unbounded extends BlockingQueueTest {
+        protected BlockingQueue emptyCollection() {
+            return new LinkedBlockingDeque();
+        }
+    }
+
+    public static class Bounded extends BlockingQueueTest {
+        protected BlockingQueue emptyCollection() {
+            return new LinkedBlockingDeque(20);
+        }
+    }
+
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
 
     public static Test suite() {
-        return new TestSuite(LinkedBlockingDequeTest.class);
+        return newTestSuite(LinkedBlockingDequeTest.class,
+                            new Unbounded().testSuite(),
+                            new Bounded().testSuite());
     }
 
     /**
@@ -157,7 +172,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     * getFirst returns next getFirst, or throws NSEE if empty
+     * getFirst() returns first element, or throws NSEE if empty
      */
     public void testFirstElement() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -173,7 +188,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  getLast returns next element, or throws NSEE if empty
+     *  getLast() returns last element, or throws NSEE if empty
      */
     public void testLastElement() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -189,7 +204,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  removeFirst removes next element, or throws NSEE if empty
+     * removeFirst() removes first element, or throws NSEE if empty
      */
     public void testRemoveFirst() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -204,7 +219,7 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  removeLast removes last element, or throws NSEE if empty
+     * removeLast() removes last element, or throws NSEE if empty
      */
     public void testRemoveLast() {
         LinkedBlockingDeque q = populatedDeque(SIZE);
@@ -513,6 +528,7 @@ public class LinkedBlockingDequeTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -527,6 +543,7 @@ public class LinkedBlockingDequeTest ext
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll throws ISE if not enough room
      */
@@ -760,30 +777,6 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  timed poll before a delayed offer fails; after offer succeeds;
-     *  on interruption throws
-     */
-    public void testTimedPollWithOffer() throws InterruptedException {
-        final LinkedBlockingDeque q = new LinkedBlockingDeque(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();
-    }
-
-
-    /**
      * putFirst(null) throws NPE
      */
      public void testPutFirstNull() throws InterruptedException {
@@ -1186,8 +1179,8 @@ public class LinkedBlockingDequeTest ext
     }
 
     /**
-     *  timed poll before a delayed offerLast fails; after offerLast succeeds;
-     *  on interruption throws
+     * timed poll before a delayed offerLast fails; after offerLast succeeds;
+     * on interruption throws
      */
     public void testTimedPollWithOfferLast() throws InterruptedException {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
@@ -1374,7 +1367,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
         q.add(two);
         q.add(one);
@@ -1410,7 +1403,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * Modifications do not cause iterators to fail
      */
-    public void testWeaklyConsistentIteration () {
+    public void testWeaklyConsistentIteration() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
         q.add(one);
         q.add(two);
@@ -1466,7 +1459,7 @@ public class LinkedBlockingDequeTest ext
     /**
      * descendingIterator.remove removes current element
      */
-    public void testDescendingIteratorRemove () {
+    public void testDescendingIteratorRemove() {
         final LinkedBlockingDeque q = new LinkedBlockingDeque();
         for (int iters = 0; iters < 100; ++iters) {
             q.add(new Integer(3));