--- jsr166/src/test/tck/DelayQueueTest.java	2011/05/30 22:43:20	1.53
+++ jsr166/src/test/tck/DelayQueueTest.java	2014/12/31 19:05:42	1.64
@@ -6,9 +6,10 @@
  * 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;
@@ -19,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 {
 
@@ -50,33 +52,24 @@ public class DelayQueueTest extends JSR1
      */
     static class PDelay implements Delayed {
         int pseudodelay;
-        PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
-        public int compareTo(PDelay y) {
-            int i = pseudodelay;
-            int j = y.pseudodelay;
-            if (i < j) return -1;
-            if (i > j) return 1;
-            return 0;
+        PDelay(int i) { pseudodelay = i; }
+        public int compareTo(PDelay other) {
+            int a = this.pseudodelay;
+            int b = other.pseudodelay;
+            return (a < b) ? -1 : (a > b) ? 1 : 0;
         }
-
         public int compareTo(Delayed y) {
             return compareTo((PDelay)y);
         }
-
         public boolean equals(Object other) {
-            return equals((PDelay)other);
-        }
-        public boolean equals(PDelay other) {
-            return other.pseudodelay == pseudodelay;
+            return (other instanceof PDelay) &&
+                this.pseudodelay == ((PDelay)other).pseudodelay;
         }
-
+        // suppress [overrides] javac warning
+        public int hashCode() { return pseudodelay; }
         public long getDelay(TimeUnit ignore) {
-            return pseudodelay;
-        }
-        public int intValue() {
-            return pseudodelay;
+            return Integer.MIN_VALUE + pseudodelay;
         }
-
         public String toString() {
             return String.valueOf(pseudodelay);
         }
@@ -109,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);
@@ -124,7 +120,7 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * Create 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) {
@@ -494,21 +490,6 @@ public class DelayQueueTest extends JSR1
     }
 
     /**
-     * remove(x) removes x and returns true if present
-     */
-    public void testRemoveElement() {
-        DelayQueue q = populatedQueue(SIZE);
-        for (int i = 1; i < SIZE; i+=2) {
-            assertTrue(q.remove(new PDelay(i)));
-        }
-        for (int i = 0; i < SIZE; i+=2) {
-            assertTrue(q.remove(new PDelay(i)));
-            assertFalse(q.remove(new PDelay(i+1)));
-        }
-        assertTrue(q.isEmpty());
-    }
-
-    /**
      * contains(x) reports true when elements added but not yet removed
      */
     public void testContains() {
@@ -647,8 +628,8 @@ public class DelayQueueTest extends JSR1
         it.next();
         it.remove();
         it = q.iterator();
-        assertEquals(it.next(), new PDelay(2));
-        assertEquals(it.next(), new PDelay(3));
+        assertEquals(new PDelay(2), it.next());
+        assertEquals(new PDelay(3), it.next());
         assertFalse(it.hasNext());
     }
 
@@ -658,9 +639,8 @@ public class DelayQueueTest extends JSR1
     public void testToString() {
         DelayQueue q = populatedQueue(SIZE);
         String s = q.toString();
-        for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
-        }
+        for (Object e : q)
+            assertTrue(s.contains(e.toString()));
     }
 
     /**
@@ -674,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);
             }});
 
@@ -746,9 +726,9 @@ public class DelayQueueTest extends JSR1
         }
         ArrayList l = new ArrayList();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
+        assertEquals(0, q.size());
         for (int i = 0; i < SIZE; ++i)
-            assertEquals(l.get(i), elems[i]);
+            assertEquals(elems[i], l.get(i));
         q.add(elems[0]);
         q.add(elems[1]);
         assertFalse(q.isEmpty());
@@ -756,10 +736,10 @@ public class DelayQueueTest extends JSR1
         assertTrue(q.contains(elems[1]));
         l.clear();
         q.drainTo(l);
-        assertEquals(q.size(), 0);
-        assertEquals(l.size(), 2);
+        assertEquals(0, q.size());
+        assertEquals(2, l.size());
         for (int i = 0; i < 2; ++i)
-            assertEquals(l.get(i), elems[i]);
+            assertEquals(elems[i], l.get(i));
     }
 
     /**
@@ -789,9 +769,17 @@ public class DelayQueueTest extends JSR1
             ArrayList l = new ArrayList();
             q.drainTo(l, i);
             int k = (i < SIZE) ? i : SIZE;
-            assertEquals(q.size(), SIZE-k);
-            assertEquals(l.size(), k);
+            assertEquals(SIZE-k, q.size());
+            assertEquals(k, l.size());
         }
     }
 
+    /**
+     * remove(null), contains(null) always return false
+     */
+    public void testNeverContainsNull() {
+        Collection<?> q = populatedQueue(SIZE);
+        assertFalse(q.contains(null));
+        assertFalse(q.remove(null));
+    }
 }