--- jsr166/src/test/tck/DelayQueueTest.java	2013/04/05 19:27:23	1.61
+++ jsr166/src/test/tck/DelayQueueTest.java	2015/02/22 04:34:44	1.69
@@ -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 {
 
@@ -123,9 +126,9 @@ public class DelayQueueTest extends JSR1
     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());
@@ -145,7 +148,7 @@ public class DelayQueueTest extends JSR1
      */
     public void testConstructor3() {
         try {
-            DelayQueue q = new DelayQueue(null);
+            new DelayQueue(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -156,7 +159,7 @@ public class DelayQueueTest extends JSR1
     public void testConstructor4() {
         try {
             PDelay[] ints = new PDelay[SIZE];
-            DelayQueue q = new DelayQueue(Arrays.asList(ints));
+            new DelayQueue(Arrays.asList(ints));
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -169,7 +172,7 @@ public class DelayQueueTest extends JSR1
             PDelay[] ints = new PDelay[SIZE];
             for (int i = 0; i < SIZE-1; ++i)
                 ints[i] = new PDelay(i);
-            DelayQueue q = new DelayQueue(Arrays.asList(ints));
+            new DelayQueue(Arrays.asList(ints));
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -286,9 +289,9 @@ public class DelayQueueTest extends JSR1
     public void testPut() {
         DelayQueue q = new DelayQueue();
         for (int i = 0; i < SIZE; ++i) {
-            PDelay I = new PDelay(i);
-            q.put(I);
-            assertTrue(q.contains(I));
+            PDelay x = new PDelay(i);
+            q.put(x);
+            assertTrue(q.contains(x));
         }
         assertEquals(SIZE, q.size());
     }
@@ -332,7 +335,7 @@ public class DelayQueueTest extends JSR1
     public void testTake() throws InterruptedException {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.take()));
+            assertEquals(new PDelay(i), q.take());
         }
     }
 
@@ -375,7 +378,7 @@ public class DelayQueueTest extends JSR1
     public void testPoll() {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.poll()));
+            assertEquals(new PDelay(i), q.poll());
         }
         assertNull(q.poll());
     }
@@ -386,7 +389,7 @@ public class DelayQueueTest extends JSR1
     public void testTimedPoll0() throws InterruptedException {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
+            assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
         }
         assertNull(q.poll(0, MILLISECONDS));
     }
@@ -398,7 +401,7 @@ public class DelayQueueTest extends JSR1
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             long startTime = System.nanoTime();
-            assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
+            assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
             assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
         }
         long startTime = System.nanoTime();
@@ -447,8 +450,8 @@ public class DelayQueueTest extends JSR1
     public void testPeek() {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.peek()));
-            assertEquals(new PDelay(i), ((PDelay)q.poll()));
+            assertEquals(new PDelay(i), q.peek());
+            assertEquals(new PDelay(i), q.poll());
             if (q.isEmpty())
                 assertNull(q.peek());
             else
@@ -463,7 +466,7 @@ public class DelayQueueTest extends JSR1
     public void testElement() {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.element()));
+            assertEquals(new PDelay(i), q.element());
             q.poll();
         }
         try {
@@ -478,7 +481,7 @@ public class DelayQueueTest extends JSR1
     public void testRemove() {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.remove()));
+            assertEquals(new PDelay(i), q.remove());
         }
         try {
             q.remove();
@@ -558,8 +561,8 @@ public class DelayQueueTest extends JSR1
             assertTrue(q.removeAll(p));
             assertEquals(SIZE-i, q.size());
             for (int j = 0; j < i; ++j) {
-                PDelay I = (PDelay)(p.remove());
-                assertFalse(q.contains(I));
+                PDelay x = (PDelay)(p.remove());
+                assertFalse(q.contains(x));
             }
         }
     }
@@ -611,6 +614,14 @@ public class DelayQueueTest extends JSR1
             ++i;
         }
         assertEquals(i, SIZE);
+        assertIteratorExhausted(it);
+    }
+
+    /**
+     * iterator of empty collection has no elements
+     */
+    public void testEmptyIterator() {
+        assertIteratorExhausted(new DelayQueue().iterator());
     }
 
     /**
@@ -651,7 +662,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);
             }});
 
@@ -771,4 +782,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));
+    }
 }