--- jsr166/src/test/tck/DelayQueueTest.java 2003/09/14 20:42:40 1.3 +++ jsr166/src/test/tck/DelayQueueTest.java 2003/09/20 18:20:07 1.4 @@ -20,9 +20,11 @@ public class DelayQueueTest extends JSR1 private static final int NOCAP = Integer.MAX_VALUE; - // Most Q/BQ tests use Pseudodelays, where delays are all elapsed - // (so, no blocking solely for delays) but are still ordered - + /** + * A delayed implmentation for testing. + * Most Q/BQ tests use Pseudodelays, where delays are all elapsed + * (so, no blocking solely for delays) but are still ordered + */ static class PDelay implements Delayed { int pseudodelay; PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; } @@ -63,6 +65,50 @@ public class DelayQueueTest extends JSR1 } + /** + * Delayed implementation that actually delays + */ + static class NanoDelay implements Delayed { + long trigger; + NanoDelay(long i) { + trigger = System.nanoTime() + i; + } + public int compareTo(Object y) { + long i = trigger; + long j = ((NanoDelay)y).trigger; + if (i < j) return -1; + if (i > j) return 1; + return 0; + } + + public int compareTo(NanoDelay y) { + long i = trigger; + long j = ((NanoDelay)y).trigger; + if (i < j) return -1; + if (i > j) return 1; + return 0; + } + + public boolean equals(Object other) { + return ((NanoDelay)other).trigger == trigger; + } + public boolean equals(NanoDelay other) { + return ((NanoDelay)other).trigger == trigger; + } + + public long getDelay(TimeUnit unit) { + long n = trigger - System.nanoTime(); + return unit.convert(n, TimeUnit.NANOSECONDS); + } + + public long getTriggerTime() { + return trigger; + } + + public String toString() { + return String.valueOf(trigger); + } + } /** @@ -82,40 +128,54 @@ public class DelayQueueTest extends JSR1 return q; } - public void testConstructor1(){ + /** + * + */ + public void testConstructor1() { assertEquals(NOCAP, new DelayQueue().remainingCapacity()); } - public void testConstructor3(){ - + /** + * + */ + public void testConstructor3() { try { DelayQueue q = new DelayQueue(null); - fail("Cannot make from null collection"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testConstructor4(){ + /** + * + */ + public void testConstructor4() { try { PDelay[] ints = new PDelay[SIZE]; DelayQueue q = new DelayQueue(Arrays.asList(ints)); - fail("Cannot make with null elements"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testConstructor5(){ + /** + * + */ + public void testConstructor5() { try { 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)); - fail("Cannot make with null elements"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testConstructor6(){ + /** + * + */ + public void testConstructor6() { try { PDelay[] ints = new PDelay[SIZE]; for (int i = 0; i < SIZE; ++i) @@ -127,6 +187,9 @@ public class DelayQueueTest extends JSR1 finally {} } + /** + * + */ public void testEmpty() { DelayQueue q = new DelayQueue(); assertTrue(q.isEmpty()); @@ -139,7 +202,10 @@ public class DelayQueueTest extends JSR1 assertTrue(q.isEmpty()); } - public void testRemainingCapacity(){ + /** + * + */ + public void testRemainingCapacity() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(NOCAP, q.remainingCapacity()); @@ -153,21 +219,30 @@ public class DelayQueueTest extends JSR1 } } - public void testOfferNull(){ + /** + * + */ + public void testOfferNull() { try { DelayQueue q = new DelayQueue(); q.offer(null); - fail("should throw NPE"); + shouldThrow(); } catch (NullPointerException success) { } } + /** + * + */ public void testOffer() { DelayQueue q = new DelayQueue(); assertTrue(q.offer(new PDelay(0))); assertTrue(q.offer(new PDelay(1))); } - public void testAdd(){ + /** + * + */ + public void testAdd() { DelayQueue q = new DelayQueue(); for (int i = 0; i < SIZE; ++i) { assertEquals(i, q.size()); @@ -175,36 +250,48 @@ public class DelayQueueTest extends JSR1 } } - public void testAddAll1(){ + /** + * + */ + public void testAddAll1() { try { DelayQueue q = new DelayQueue(); q.addAll(null); - fail("Cannot add null collection"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll2(){ + /** + * + */ + public void testAddAll2() { try { DelayQueue q = new DelayQueue(); PDelay[] ints = new PDelay[SIZE]; q.addAll(Arrays.asList(ints)); - fail("Cannot add null elements"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll3(){ + /** + * + */ + public void testAddAll3() { try { DelayQueue q = new DelayQueue(); PDelay[] ints = new PDelay[SIZE]; for (int i = 0; i < SIZE-1; ++i) ints[i] = new PDelay(i); q.addAll(Arrays.asList(ints)); - fail("Cannot add null elements"); + shouldThrow(); } catch (NullPointerException success) {} } - public void testAddAll5(){ + /** + * + */ + public void testAddAll5() { try { PDelay[] empty = new PDelay[0]; PDelay[] ints = new PDelay[SIZE]; @@ -219,16 +306,22 @@ public class DelayQueueTest extends JSR1 finally {} } + /** + * + */ public void testPutNull() { try { DelayQueue q = new DelayQueue(); q.put(null); - fail("put should throw NPE"); + shouldThrow(); } catch (NullPointerException success){ } } + /** + * + */ public void testPut() { try { DelayQueue q = new DelayQueue(); @@ -243,10 +336,13 @@ public class DelayQueueTest extends JSR1 } } + /** + * + */ public void testPutWithTake() { final DelayQueue q = new DelayQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { int added = 0; try { q.put(new PDelay(0)); @@ -269,14 +365,17 @@ public class DelayQueueTest extends JSR1 t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTimedOffer() { final DelayQueue q = new DelayQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { q.put(new PDelay(0)); q.put(new PDelay(0)); @@ -292,28 +391,34 @@ public class DelayQueueTest extends JSR1 t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testTake(){ + /** + * + */ + public void testTake() { try { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(new PDelay(i), ((PDelay)q.take())); } } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTakeFromEmpty() { final DelayQueue q = new DelayQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { q.take(); - threadFail("Should block"); + threadShouldThrow(); } catch (InterruptedException success){ } } }); @@ -323,11 +428,14 @@ public class DelayQueueTest extends JSR1 t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testBlockingTake(){ + /** + * + */ + public void testBlockingTake() { Thread t = new Thread(new Runnable() { public void run() { try { @@ -336,7 +444,7 @@ public class DelayQueueTest extends JSR1 threadAssertEquals(new PDelay(i), ((PDelay)q.take())); } q.take(); - threadFail("take should block"); + threadShouldThrow(); } catch (InterruptedException success){ } }}); @@ -347,12 +455,15 @@ public class DelayQueueTest extends JSR1 t.join(); } catch (InterruptedException ie) { - fail("Unexpected exception"); + unexpectedException(); } } - public void testPoll(){ + /** + * + */ + public void testPoll() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(new PDelay(i), ((PDelay)q.poll())); @@ -360,6 +471,9 @@ public class DelayQueueTest extends JSR1 assertNull(q.poll()); } + /** + * + */ public void testTimedPoll0() { try { DelayQueue q = populatedQueue(SIZE); @@ -368,10 +482,13 @@ public class DelayQueueTest extends JSR1 } assertNull(q.poll(0, TimeUnit.MILLISECONDS)); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } + /** + * + */ public void testTimedPoll() { try { DelayQueue q = populatedQueue(SIZE); @@ -380,11 +497,14 @@ public class DelayQueueTest extends JSR1 } assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testInterruptedTimedPoll(){ + /** + * + */ + public void testInterruptedTimedPoll() { Thread t = new Thread(new Runnable() { public void run() { try { @@ -403,14 +523,17 @@ public class DelayQueueTest extends JSR1 t.join(); } catch (InterruptedException ie) { - fail("Unexpected exception"); + unexpectedException(); } } - public void testTimedPollWithOffer(){ + /** + * + */ + public void testTimedPollWithOffer() { final DelayQueue q = new DelayQueue(); Thread t = new Thread(new Runnable() { - public void run(){ + public void run() { try { threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); @@ -426,12 +549,15 @@ public class DelayQueueTest extends JSR1 t.interrupt(); t.join(); } catch (Exception e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testPeek(){ + /** + * + */ + public void testPeek() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(new PDelay(i), ((PDelay)q.peek())); @@ -442,7 +568,10 @@ public class DelayQueueTest extends JSR1 assertNull(q.peek()); } - public void testElement(){ + /** + * + */ + public void testElement() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(new PDelay(i), ((PDelay)q.element())); @@ -450,24 +579,30 @@ public class DelayQueueTest extends JSR1 } try { q.element(); - fail("no such element"); + shouldThrow(); } catch (NoSuchElementException success) {} } - public void testRemove(){ + /** + * + */ + public void testRemove() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertEquals(new PDelay(i), ((PDelay)q.remove())); } try { q.remove(); - fail("remove should throw"); + shouldThrow(); } catch (NoSuchElementException success){ } } - public void testRemoveElement(){ + /** + * + */ + public void testRemoveElement() { DelayQueue q = populatedQueue(SIZE); for (int i = 1; i < SIZE; i+=2) { assertTrue(q.remove(new PDelay(i))); @@ -479,7 +614,10 @@ public class DelayQueueTest extends JSR1 assertTrue(q.isEmpty()); } - public void testContains(){ + /** + * + */ + public void testContains() { DelayQueue q = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { assertTrue(q.contains(new PDelay(i))); @@ -488,7 +626,10 @@ public class DelayQueueTest extends JSR1 } } - public void testClear(){ + /** + * + */ + public void testClear() { DelayQueue q = populatedQueue(SIZE); q.clear(); assertTrue(q.isEmpty()); @@ -500,7 +641,10 @@ public class DelayQueueTest extends JSR1 assertTrue(q.isEmpty()); } - public void testContainsAll(){ + /** + * + */ + public void testContainsAll() { DelayQueue q = populatedQueue(SIZE); DelayQueue p = new DelayQueue(); for (int i = 0; i < SIZE; ++i) { @@ -511,7 +655,10 @@ public class DelayQueueTest extends JSR1 assertTrue(p.containsAll(q)); } - public void testRetainAll(){ + /** + * + */ + public void testRetainAll() { DelayQueue q = populatedQueue(SIZE); DelayQueue p = populatedQueue(SIZE); for (int i = 0; i < SIZE; ++i) { @@ -527,7 +674,10 @@ public class DelayQueueTest extends JSR1 } } - public void testRemoveAll(){ + /** + * + */ + public void testRemoveAll() { for (int i = 1; i < SIZE; ++i) { DelayQueue q = populatedQueue(SIZE); DelayQueue p = populatedQueue(i); @@ -540,7 +690,10 @@ public class DelayQueueTest extends JSR1 } } - public void testToArray(){ + /** + * + */ + public void testToArray() { DelayQueue q = populatedQueue(SIZE); Object[] o = q.toArray(); Arrays.sort(o); @@ -548,11 +701,14 @@ public class DelayQueueTest extends JSR1 for(int i = 0; i < o.length; i++) assertEquals(o[i], q.take()); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testToArray2(){ + /** + * + */ + public void testToArray2() { DelayQueue q = populatedQueue(SIZE); PDelay[] ints = new PDelay[SIZE]; ints = (PDelay[])q.toArray(ints); @@ -561,11 +717,14 @@ public class DelayQueueTest extends JSR1 for(int i = 0; i < ints.length; i++) assertEquals(ints[i], q.take()); } catch (InterruptedException e){ - fail("Unexpected exception"); + unexpectedException(); } } - public void testIterator(){ + /** + * + */ + public void testIterator() { DelayQueue q = populatedQueue(SIZE); int i = 0; Iterator it = q.iterator(); @@ -576,6 +735,9 @@ public class DelayQueueTest extends JSR1 assertEquals(i, SIZE); } + /** + * + */ public void testIteratorRemove () { final DelayQueue q = new DelayQueue(); @@ -595,7 +757,10 @@ public class DelayQueueTest extends JSR1 } - public void testToString(){ + /** + * + */ + public void testToString() { DelayQueue q = populatedQueue(SIZE); String s = q.toString(); for (int i = 0; i < SIZE; ++i) { @@ -603,6 +768,9 @@ public class DelayQueueTest extends JSR1 } } + /** + * + */ public void testPollInExecutor() { final DelayQueue q = new DelayQueue(); @@ -617,7 +785,7 @@ public class DelayQueueTest extends JSR1 threadAssertTrue(q.isEmpty()); } catch (InterruptedException e) { - threadFail("should not be interrupted"); + threadUnexpectedException(); } } }); @@ -629,7 +797,7 @@ public class DelayQueueTest extends JSR1 q.put(new PDelay(1)); } catch (InterruptedException e) { - threadFail("should not be interrupted"); + threadUnexpectedException(); } } }); @@ -638,48 +806,10 @@ public class DelayQueueTest extends JSR1 } - static class NanoDelay implements Delayed { - long trigger; - NanoDelay(long i) { - trigger = System.nanoTime() + i; - } - public int compareTo(Object y) { - long i = trigger; - long j = ((NanoDelay)y).trigger; - if (i < j) return -1; - if (i > j) return 1; - return 0; - } - - public int compareTo(NanoDelay y) { - long i = trigger; - long j = ((NanoDelay)y).trigger; - if (i < j) return -1; - if (i > j) return 1; - return 0; - } - - public boolean equals(Object other) { - return ((NanoDelay)other).trigger == trigger; - } - public boolean equals(NanoDelay other) { - return ((NanoDelay)other).trigger == trigger; - } - - public long getDelay(TimeUnit unit) { - long n = trigger - System.nanoTime(); - return unit.convert(n, TimeUnit.NANOSECONDS); - } - - public long getTriggerTime() { - return trigger; - } - - public String toString() { - return String.valueOf(trigger); - } - } + /** + * + */ public void testDelay() { DelayQueue q = new DelayQueue(); NanoDelay[] elements = new NanoDelay[SIZE]; @@ -702,7 +832,7 @@ public class DelayQueueTest extends JSR1 } } catch(InterruptedException ie) { - fail("Unexpected Exception"); + unexpectedException(); } }