--- jsr166/src/test/tck/DelayQueueTest.java	2009/11/22 00:17:37	1.25
+++ jsr166/src/test/tck/DelayQueueTest.java	2009/12/23 00:47:16	1.30
@@ -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() {
@@ -522,11 +514,11 @@ public class DelayQueueTest extends JSR1
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertEquals(new PDelay(i), ((PDelay)q.peek()));
-            q.poll();
+            assertEquals(new PDelay(i), ((PDelay)q.poll()));
             if (q.isEmpty())
                 assertNull(q.peek());
             else
-                assertTrue(i != ((PDelay)q.peek()).intValue());
+                assertFalse(new PDelay(i).equals(q.peek()));
         }
         assertNull(q.peek());
     }
@@ -681,8 +673,8 @@ public class DelayQueueTest extends JSR1
      * toArray(null) throws NPE
      */
     public void testToArray_BadArg() {
+        DelayQueue q = populatedQueue(SIZE);
         try {
-            DelayQueue q = populatedQueue(SIZE);
             Object o[] = q.toArray(null);
             shouldThrow();
         } catch (NullPointerException success) {}
@@ -692,9 +684,9 @@ public class DelayQueueTest extends JSR1
      * toArray with incompatible array type throws CCE
      */
     public void testToArray1_BadArg() {
+        DelayQueue q = populatedQueue(SIZE);
         try {
-            DelayQueue q = populatedQueue(SIZE);
-            Object o[] = q.toArray(new String[10] );
+            Object o[] = q.toArray(new String[10]);
             shouldThrow();
         } catch (ArrayStoreException success) {}
     }
@@ -750,9 +742,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 +754,6 @@ public class DelayQueueTest extends JSR1
             }});
 
         joinPool(executor);
-
     }