--- jsr166/src/test/tck/DelayQueueTest.java	2009/11/22 18:57:17	1.26
+++ jsr166/src/test/tck/DelayQueueTest.java	2010/10/11 04:19:16	1.36
@@ -13,7 +13,7 @@ import java.util.concurrent.*;
 
 public class DelayQueueTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());
+        junit.textui.TestRunner.run(suite());
     }
 
     public static Test suite() {
@@ -24,7 +24,7 @@ public class DelayQueueTest extends JSR1
 
     /**
      * A delayed implementation for testing.
-     * Most  tests use Pseudodelays, where delays are all elapsed
+     * Most tests use Pseudodelays, where delays are all elapsed
      * (so, no blocking solely for delays) but are still ordered
      */
     static class PDelay implements Delayed {
@@ -32,25 +32,21 @@ public class DelayQueueTest extends JSR1
         PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
         public int compareTo(PDelay y) {
             int i = pseudodelay;
-            int j = ((PDelay)y).pseudodelay;
+            int j = y.pseudodelay;
             if (i < j) return -1;
             if (i > j) return 1;
             return 0;
         }
 
         public int compareTo(Delayed y) {
-            int i = pseudodelay;
-            int j = ((PDelay)y).pseudodelay;
-            if (i < j) return -1;
-            if (i > j) return 1;
-            return 0;
+            return compareTo((PDelay)y);
         }
 
         public boolean equals(Object other) {
-            return ((PDelay)other).pseudodelay == pseudodelay;
+            return equals((PDelay)other);
         }
         public boolean equals(PDelay other) {
-            return ((PDelay)other).pseudodelay == pseudodelay;
+            return other.pseudodelay == pseudodelay;
         }
 
 
@@ -77,25 +73,21 @@ public class DelayQueueTest extends JSR1
         }
         public int compareTo(NanoDelay y) {
             long i = trigger;
-            long j = ((NanoDelay)y).trigger;
+            long j = y.trigger;
             if (i < j) return -1;
             if (i > j) return 1;
             return 0;
         }
 
         public int compareTo(Delayed y) {
-            long i = trigger;
-            long j = ((NanoDelay)y).trigger;
-            if (i < j) return -1;
-            if (i > j) return 1;
-            return 0;
+            return compareTo((NanoDelay)y);
         }
 
         public boolean equals(Object other) {
-            return ((NanoDelay)other).trigger == trigger;
+            return equals((NanoDelay)other);
         }
         public boolean equals(NanoDelay other) {
-            return ((NanoDelay)other).trigger == trigger;
+            return other.trigger == trigger;
         }
 
         public long getDelay(TimeUnit unit) {
@@ -199,7 +191,7 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * remainingCapacity does not change when elementa added or removed,
+     * remainingCapacity does not change when elements added or removed,
      * but size does
      */
     public void testRemainingCapacity() {
@@ -292,6 +284,7 @@ public class DelayQueueTest extends JSR1
             shouldThrow();
         } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -491,25 +484,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(SHORT_DELAY_MS, MILLISECONDS);
+                    shouldThrow();
+                } catch (InterruptedException success) {}
+
+                barrier.await();
                 try {
-                    q.poll(LONG_DELAY_MS, MILLISECONDS);
+                    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();
     }
@@ -716,7 +722,7 @@ public class DelayQueueTest extends JSR1
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final DelayQueue q = new DelayQueue();
         q.add(new PDelay(2));
         q.add(new PDelay(1));
@@ -750,9 +756,9 @@ public class DelayQueueTest extends JSR1
         ExecutorService executor = Executors.newFixedThreadPool(2);
         executor.execute(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                threadAssertNull(q.poll());
-                threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
-                threadAssertTrue(q.isEmpty());
+                assertNull(q.poll());
+                assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
+                assertTrue(q.isEmpty());
             }});
 
         executor.execute(new CheckedRunnable() {
@@ -762,7 +768,6 @@ public class DelayQueueTest extends JSR1
             }});
 
         joinPool(executor);
-
     }
 
 
@@ -783,7 +788,7 @@ public class DelayQueueTest extends JSR1
         for (int i = 0; i < SIZE; ++i) {
             NanoDelay e = (NanoDelay)(q.take());
             long tt = e.getTriggerTime();
-            assertTrue(tt <= System.nanoTime());
+            assertTrue(tt - System.nanoTime() <= 0);
             if (i != 0)
                 assertTrue(tt >= last);
             last = tt;
@@ -796,7 +801,7 @@ public class DelayQueueTest extends JSR1
     public void testPeekDelayed() {
         DelayQueue q = new DelayQueue();
         q.add(new NanoDelay(Long.MAX_VALUE));
-        assert(q.peek() != null);
+        assertNotNull(q.peek());
     }