--- jsr166/src/test/tck/DelayQueueTest.java 2009/11/21 22:00:46 1.24 +++ jsr166/src/test/tck/DelayQueueTest.java 2010/09/29 12:33:48 1.34 @@ -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 @@ -415,14 +408,17 @@ public class DelayQueueTest extends JSR1 * Take removes existing elements until empty, then blocks interruptibly */ public void testBlockingTake() throws InterruptedException { - Thread t = new ThreadShouldThrow(InterruptedException.class) { + final DelayQueue q = populatedQueue(SIZE); + Thread t = new Thread(new CheckedRunnable() { public void realRun() throws InterruptedException { - DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { - threadAssertEquals(new PDelay(i), ((PDelay)q.take())); + assertEquals(new PDelay(i), ((PDelay)q.take())); } - q.take(); - }}; + try { + q.take(); + shouldThrow(); + } catch (InterruptedException success) {} + }}); t.start(); Thread.sleep(SHORT_DELAY_MS); @@ -496,9 +492,9 @@ public class DelayQueueTest extends JSR1 final PDelay pdelay = new PDelay(0); 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)); try { + assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); + assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS)); q.poll(LONG_DELAY_MS, MILLISECONDS); shouldThrow(); } catch (InterruptedException success) {} @@ -519,11 +515,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()); } @@ -678,8 +674,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) {} @@ -689,9 +685,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) {} } @@ -713,7 +709,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)); @@ -747,9 +743,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() { @@ -759,7 +755,6 @@ public class DelayQueueTest extends JSR1 }}); joinPool(executor); - } @@ -793,7 +788,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()); }