--- jsr166/src/test/tck/DelayQueueTest.java	2010/09/16 00:52:49	1.33
+++ jsr166/src/test/tck/DelayQueueTest.java	2010/10/28 17:57:26	1.40
@@ -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());
     }
 
     /**
@@ -484,25 +493,38 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     *  timed poll before a delayed offer fails; after offer succeeds;
-     *  on interruption throws
+     * timed poll before a delayed offer fails; after offer succeeds;
+     * on interruption throws
      */
     public void testTimedPollWithOffer() throws InterruptedException {
         final DelayQueue q = new DelayQueue();
         final PDelay pdelay = new PDelay(0);
+        final CheckedBarrier barrier = new CheckedBarrier(2);
         Thread t = new Thread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
-                assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
+
+                barrier.await();
+                assertSame(pdelay, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
+
+                Thread.currentThread().interrupt();
                 try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    q.poll(SHORT_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+
+                barrier.await();
+                try {
+                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (InterruptedException success) {}
             }});
 
         t.start();
-        Thread.sleep(SMALL_DELAY_MS);
+        barrier.await();
         assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
+        barrier.await();
+        sleep(SHORT_DELAY_MS);
         t.interrupt();
         t.join();
     }
@@ -762,24 +784,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());
+            assertTrue(System.nanoTime() - tt >= 0);
             if (i != 0)
                 assertTrue(tt >= last);
             last = tt;
         }
+        assertTrue(q.isEmpty());
     }
 
     /**
@@ -901,14 +919,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);
         }