--- jsr166/src/test/tck/DelayQueueTest.java	2003/10/05 23:00:40	1.6
+++ jsr166/src/test/tck/DelayQueueTest.java	2005/06/10 18:13:27	1.12
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * Written by Doug Lea with assistance from members of JCP JSR-166
+ * Expert Group and released to the public domain, as explained at
+ * http://creativecommons.org/licenses/publicdomain
+ * Other contributors include Andrew Wright, Jeffrey Hayes, 
+ * Pat Fisher, Mike Judd. 
  */
 
 import junit.framework.*;
@@ -21,14 +22,14 @@ public class DelayQueueTest extends JSR1
     private static final int NOCAP = Integer.MAX_VALUE;
 
     /**
-     * A delayed implmentation for testing.
+     * A delayed implementation for testing.
      * Most  tests use Pseudodelays, where delays are all elapsed
      * (so, no blocking solely for delays) but are still ordered
      */ 
     static class PDelay implements Delayed { 
         int pseudodelay;
         PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
-        public int compareTo(Object y) {
+        public int compareTo(PDelay y) {
             int i = pseudodelay;
             int j = ((PDelay)y).pseudodelay;
             if (i < j) return -1;
@@ -36,7 +37,7 @@ public class DelayQueueTest extends JSR1
             return 0;
         }
 
-        public int compareTo(PDelay y) {
+        public int compareTo(Delayed y) {
             int i = pseudodelay;
             int j = ((PDelay)y).pseudodelay;
             if (i < j) return -1;
@@ -73,7 +74,7 @@ public class DelayQueueTest extends JSR1
         NanoDelay(long i) { 
             trigger = System.nanoTime() + i;
         }
-        public int compareTo(Object y) {
+        public int compareTo(NanoDelay y) {
             long i = trigger;
             long j = ((NanoDelay)y).trigger;
             if (i < j) return -1;
@@ -81,7 +82,7 @@ public class DelayQueueTest extends JSR1
             return 0;
         }
 
-        public int compareTo(NanoDelay y) {
+        public int compareTo(Delayed y) {
             long i = trigger;
             long j = ((NanoDelay)y).trigger;
             if (i < j) return -1;
@@ -591,8 +592,10 @@ public class DelayQueueTest extends JSR1
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(new PDelay(i), ((PDelay)q.peek()));
             q.poll();
-            assertTrue(q.peek() == null ||
-                       i != ((PDelay)q.peek()).intValue());
+            if (q.isEmpty())
+                assertNull(q.peek());
+            else
+                assertTrue(i != ((PDelay)q.peek()).intValue());
         }
 	assertNull(q.peek());
     }
@@ -664,8 +667,10 @@ public class DelayQueueTest extends JSR1
         assertTrue(q.isEmpty());
         assertEquals(0, q.size());
         assertEquals(NOCAP, q.remainingCapacity());
-        q.add(new PDelay(1));
+        PDelay x = new PDelay(1);
+        q.add(x);
         assertFalse(q.isEmpty());
+        assertTrue(q.contains(x));
         q.clear();
         assertTrue(q.isEmpty());
     }
@@ -763,7 +768,7 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * toArray with incompatable array type throws CCE
+     * toArray with incompatible array type throws CCE
      */
     public void testToArray1_BadArg() {
 	try {
@@ -852,7 +857,7 @@ public class DelayQueueTest extends JSR1
 
 
     /**
-     * Dekayed actions do not occur until their delay elapses
+     * Delayed actions do not occur until their delay elapses
      */
     public void testDelay() {
         DelayQueue q = new DelayQueue();
@@ -880,6 +885,23 @@ public class DelayQueueTest extends JSR1
         }
     }
 
+    /**
+     * peek of a non-empty queue returns non-null even if not expired
+     */
+    public void testPeekDelayed() {
+        DelayQueue q = new DelayQueue();
+        q.add(new NanoDelay(Long.MAX_VALUE));
+        assert(q.peek() != null);
+    }
+
+    /**
+     * poll of a non-empty queue returns null if no expired elements.
+     */
+    public void testPollDelayed() {
+        DelayQueue q = new DelayQueue();
+        q.add(new NanoDelay(Long.MAX_VALUE));
+        assertNull(q.poll());
+    }
 
     /**
      * drainTo(null) throws NPE
@@ -909,11 +931,28 @@ public class DelayQueueTest extends JSR1
      * drainTo(c) empties queue into another collection c
      */ 
     public void testDrainTo() {
-        DelayQueue q = populatedQueue(SIZE);
+        DelayQueue q = new DelayQueue();
+        PDelay[] elems = new PDelay[SIZE];
+        for (int i = 0; i < SIZE; ++i) {
+            elems[i] = new PDelay(i);
+            q.add(elems[i]);
+        }
         ArrayList l = new ArrayList();
         q.drainTo(l);
         assertEquals(q.size(), 0);
-        assertEquals(l.size(), SIZE);
+        for (int i = 0; i < SIZE; ++i) 
+            assertEquals(l.get(i), elems[i]);
+        q.add(elems[0]);
+        q.add(elems[1]);
+        assertFalse(q.isEmpty());
+        assertTrue(q.contains(elems[0]));
+        assertTrue(q.contains(elems[1]));
+        l.clear();
+        q.drainTo(l);
+        assertEquals(q.size(), 0);
+        assertEquals(l.size(), 2);
+        for (int i = 0; i < 2; ++i) 
+            assertEquals(l.get(i), elems[i]);
     }
 
     /**
@@ -932,7 +971,7 @@ public class DelayQueueTest extends JSR1
             q.drainTo(l);
             assertTrue(l.size() >= SIZE);
             t.join();
-            assertTrue(q.size() + l.size() == SIZE+1);
+            assertTrue(q.size() + l.size() >= SIZE);
         } catch(Exception e){
             unexpectedException();
         }