--- jsr166/src/test/tck/DelayQueueTest.java	2005/06/10 18:13:27	1.12
+++ jsr166/src/test/tck/DelayQueueTest.java	2005/09/22 00:32:09	1.13
@@ -894,6 +894,7 @@ public class DelayQueueTest extends JSR1
         assert(q.peek() != null);
     }
 
+
     /**
      * poll of a non-empty queue returns null if no expired elements.
      */
@@ -904,6 +905,19 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
+     * timed poll of a non-empty queue returns null if no expired elements.
+     */
+    public void testTimedPollDelayed() {
+        DelayQueue q = new DelayQueue();
+        q.add(new NanoDelay(Long.MAX_VALUE));
+        try {
+            assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
+        } catch (Exception ex) {
+            unexpectedException();
+        }
+    }
+
+    /**
      * drainTo(null) throws NPE
      */ 
     public void testDrainToNull() {