--- jsr166/src/test/tck/DelayQueueTest.java	2010/10/11 04:19:16	1.36
+++ jsr166/src/test/tck/DelayQueueTest.java	2010/11/05 00:17:22	1.45
@@ -109,8 +109,8 @@ public class DelayQueueTest extends JSR1
      * Create a queue of given size containing consecutive
      * PDelays 0 ... n.
      */
-    private DelayQueue populatedQueue(int n) {
-        DelayQueue q = new DelayQueue();
+    private DelayQueue<PDelay> populatedQueue(int n) {
+        DelayQueue<PDelay> q = new DelayQueue<PDelay>();
         assertTrue(q.isEmpty());
         for (int i = n-1; i >= 0; i-=2)
             assertTrue(q.offer(new PDelay(i)));
@@ -391,17 +391,26 @@ public class DelayQueueTest extends JSR1
     /**
      * take blocks interruptibly when empty
      */
-    public void testTakeFromEmpty() throws InterruptedException {
-        final DelayQueue q = new DelayQueue();
-        Thread t = new ThreadShouldThrow(InterruptedException.class) {
-            public void realRun() throws InterruptedException {
-                q.take();
-            }};
-
-        t.start();
+    public void testTakeFromEmptyBlocksInterruptibly()
+            throws InterruptedException {
+        final BlockingQueue q = new DelayQueue();
+        final CountDownLatch threadStarted = new CountDownLatch(1);
+        Thread t = newStartedThread(new CheckedRunnable() {
+            public void realRun() {
+                long t0 = System.nanoTime();
+                threadStarted.countDown();
+                try {
+                    q.take();
+                    shouldThrow();
+                } catch (InterruptedException expected) {}
+                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
+            }});
+        threadStarted.await();
         Thread.sleep(SHORT_DELAY_MS);
+        assertTrue(t.isAlive());
         t.interrupt();
-        t.join();
+        awaitTermination(t, MEDIUM_DELAY_MS);
+        assertFalse(t.isAlive());
     }
 
     /**
@@ -439,7 +448,7 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * timed pool with zero timeout succeeds when non-empty, else times out
+     * timed poll with zero timeout succeeds when non-empty, else times out
      */
     public void testTimedPoll0() throws InterruptedException {
         DelayQueue q = populatedQueue(SIZE);
@@ -450,7 +459,7 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * timed pool with nonzero timeout succeeds when non-empty, else times out
+     * timed poll with nonzero timeout succeeds when non-empty, else times out
      */
     public void testTimedPoll() throws InterruptedException {
         DelayQueue q = populatedQueue(SIZE);
@@ -667,40 +676,41 @@ public class DelayQueueTest extends JSR1
         Object[] o = q.toArray();
         Arrays.sort(o);
         for (int i = 0; i < o.length; i++)
-            assertEquals(o[i], q.take());
+            assertSame(o[i], q.take());
     }
 
     /**
      * toArray(a) contains all elements
      */
-    public void testToArray2() throws InterruptedException {
-        DelayQueue q = populatedQueue(SIZE);
+    public void testToArray2() {
+        DelayQueue<PDelay> q = populatedQueue(SIZE);
         PDelay[] ints = new PDelay[SIZE];
-        ints = (PDelay[])q.toArray(ints);
+        PDelay[] array = q.toArray(ints);
+        assertSame(ints, array);
         Arrays.sort(ints);
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.take());
+            assertSame(ints[i], q.remove());
     }
 
 
     /**
-     * toArray(null) throws NPE
+     * toArray(null) throws NullPointerException
      */
-    public void testToArray_BadArg() {
+    public void testToArray_NullArg() {
         DelayQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(null);
+            q.toArray(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
     /**
-     * toArray with incompatible array type throws CCE
+     * toArray(incompatible array type) throws ArrayStoreException
      */
     public void testToArray1_BadArg() {
         DelayQueue q = populatedQueue(SIZE);
         try {
-            Object o[] = q.toArray(new String[10]);
+            q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -775,24 +785,20 @@ public class DelayQueueTest extends JSR1
      * Delayed actions do not occur until their delay elapses
      */
     public void testDelay() throws InterruptedException {
-        DelayQueue q = new DelayQueue();
-        NanoDelay[] elements = new NanoDelay[SIZE];
-        for (int i = 0; i < SIZE; ++i) {
-            elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
-        }
-        for (int i = 0; i < SIZE; ++i) {
-            q.add(elements[i]);
-        }
+        DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
+        for (int i = 0; i < SIZE; ++i)
+            q.add(new NanoDelay(1000000L * (SIZE - i)));
 
         long last = 0;
         for (int i = 0; i < SIZE; ++i) {
-            NanoDelay e = (NanoDelay)(q.take());
+            NanoDelay e = q.take();
             long tt = e.getTriggerTime();
-            assertTrue(tt - System.nanoTime() <= 0);
+            assertTrue(System.nanoTime() - tt >= 0);
             if (i != 0)
                 assertTrue(tt >= last);
             last = tt;
         }
+        assertTrue(q.isEmpty());
     }
 
     /**
@@ -914,14 +920,14 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * 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() {
         for (int i = 0; i < SIZE + 2; ++i) {
             DelayQueue q = populatedQueue(SIZE);
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
-            int k = (i < SIZE)? i : SIZE;
+            int k = (i < SIZE) ? i : SIZE;
             assertEquals(q.size(), SIZE-k);
             assertEquals(l.size(), k);
         }