--- jsr166/src/test/tck/DelayQueueTest.java	2012/02/21 01:54:04	1.59
+++ jsr166/src/test/tck/DelayQueueTest.java	2014/12/31 20:09:08	1.65
@@ -6,9 +6,11 @@
  * Pat Fisher, Mike Judd.
  */
 
-import junit.framework.*;
-import java.util.Arrays;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.concurrent.BlockingQueue;
@@ -18,7 +20,8 @@ import java.util.concurrent.DelayQueue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import junit.framework.Test;
 
 public class DelayQueueTest extends JSR166TestCase {
 
@@ -62,6 +65,8 @@ public class DelayQueueTest extends JSR1
             return (other instanceof PDelay) &&
                 this.pseudodelay == ((PDelay)other).pseudodelay;
         }
+        // suppress [overrides] javac warning
+        public int hashCode() { return pseudodelay; }
         public long getDelay(TimeUnit ignore) {
             return Integer.MIN_VALUE + pseudodelay;
         }
@@ -97,6 +102,9 @@ public class DelayQueueTest extends JSR1
             return other.trigger == trigger;
         }
 
+        // suppress [overrides] javac warning
+        public int hashCode() { return (int) trigger; }
+
         public long getDelay(TimeUnit unit) {
             long n = trigger - System.nanoTime();
             return unit.convert(n, TimeUnit.NANOSECONDS);
@@ -112,15 +120,15 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * Creates a queue of given size containing consecutive
+     * Returns a new queue of given size containing consecutive
      * PDelays 0 ... n.
      */
     private DelayQueue<PDelay> populatedQueue(int n) {
         DelayQueue<PDelay> q = new DelayQueue<PDelay>();
         assertTrue(q.isEmpty());
-        for (int i = n-1; i >= 0; i-=2)
+        for (int i = n-1; i >= 0; i -= 2)
             assertTrue(q.offer(new PDelay(i)));
-        for (int i = (n & 1); i < n; i+=2)
+        for (int i = (n & 1); i < n; i += 2)
             assertTrue(q.offer(new PDelay(i)));
         assertFalse(q.isEmpty());
         assertEquals(NOCAP, q.remainingCapacity());
@@ -646,7 +654,7 @@ public class DelayQueueTest extends JSR1
             public void realRun() throws InterruptedException {
                 assertNull(q.poll());
                 threadsStarted.await();
-                assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
+                assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
                 checkEmpty(q);
             }});
 
@@ -766,4 +774,12 @@ public class DelayQueueTest extends JSR1
         }
     }
 
+    /**
+     * remove(null), contains(null) always return false
+     */
+    public void testNeverContainsNull() {
+        Collection<?> q = populatedQueue(SIZE);
+        assertFalse(q.contains(null));
+        assertFalse(q.remove(null));
+    }
 }