| 39 |
|
} |
| 40 |
|
|
| 41 |
|
public static Test suite() { |
| 42 |
+ |
class Implementation implements CollectionImplementation { |
| 43 |
+ |
public Class<?> klazz() { return DelayQueue.class; } |
| 44 |
+ |
public Collection emptyCollection() { return new DelayQueue(); } |
| 45 |
+ |
public Object makeElement(int i) { return new PDelay(i); } |
| 46 |
+ |
public boolean isConcurrent() { return true; } |
| 47 |
+ |
public boolean permitsNulls() { return false; } |
| 48 |
+ |
} |
| 49 |
|
return newTestSuite(DelayQueueTest.class, |
| 50 |
< |
new Generic().testSuite()); |
| 50 |
> |
new Generic().testSuite(), |
| 51 |
> |
CollectionTest.testSuite(new Implementation())); |
| 52 |
|
} |
| 53 |
|
|
| 54 |
|
/** |
| 55 |
< |
* A delayed implementation for testing. |
| 56 |
< |
* Most tests use Pseudodelays, where delays are all elapsed |
| 55 |
> |
* A fake Delayed implementation for testing. |
| 56 |
> |
* Most tests use PDelays, where delays are all elapsed |
| 57 |
|
* (so, no blocking solely for delays) but are still ordered |
| 58 |
|
*/ |
| 59 |
|
static class PDelay implements Delayed { |
| 60 |
< |
int pseudodelay; |
| 61 |
< |
PDelay(int i) { pseudodelay = i; } |
| 54 |
< |
public int compareTo(PDelay other) { |
| 55 |
< |
int a = this.pseudodelay; |
| 56 |
< |
int b = other.pseudodelay; |
| 57 |
< |
return (a < b) ? -1 : (a > b) ? 1 : 0; |
| 58 |
< |
} |
| 60 |
> |
final int pseudodelay; |
| 61 |
> |
PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; } |
| 62 |
|
public int compareTo(Delayed y) { |
| 63 |
< |
return compareTo((PDelay)y); |
| 63 |
> |
return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay); |
| 64 |
|
} |
| 65 |
|
public boolean equals(Object other) { |
| 66 |
|
return (other instanceof PDelay) && |
| 80 |
|
* Delayed implementation that actually delays |
| 81 |
|
*/ |
| 82 |
|
static class NanoDelay implements Delayed { |
| 83 |
< |
long trigger; |
| 83 |
> |
final long trigger; |
| 84 |
|
NanoDelay(long i) { |
| 85 |
|
trigger = System.nanoTime() + i; |
| 86 |
|
} |
| 84 |
– |
public int compareTo(NanoDelay y) { |
| 85 |
– |
long i = trigger; |
| 86 |
– |
long j = y.trigger; |
| 87 |
– |
if (i < j) return -1; |
| 88 |
– |
if (i > j) return 1; |
| 89 |
– |
return 0; |
| 90 |
– |
} |
| 87 |
|
|
| 88 |
|
public int compareTo(Delayed y) { |
| 89 |
< |
return compareTo((NanoDelay)y); |
| 89 |
> |
return Long.compare(trigger, ((NanoDelay)y).trigger); |
| 90 |
|
} |
| 91 |
|
|
| 92 |
|
public boolean equals(Object other) { |
| 93 |
< |
return equals((NanoDelay)other); |
| 94 |
< |
} |
| 99 |
< |
public boolean equals(NanoDelay other) { |
| 100 |
< |
return other.trigger == trigger; |
| 93 |
> |
return (other instanceof NanoDelay) && |
| 94 |
> |
this.trigger == ((NanoDelay)other).trigger; |
| 95 |
|
} |
| 96 |
|
|
| 97 |
|
// suppress [overrides] javac warning |
| 113 |
|
|
| 114 |
|
/** |
| 115 |
|
* Returns a new queue of given size containing consecutive |
| 116 |
< |
* PDelays 0 ... n. |
| 116 |
> |
* PDelays 0 ... n - 1. |
| 117 |
|
*/ |
| 118 |
< |
private DelayQueue<PDelay> populatedQueue(int n) { |
| 119 |
< |
DelayQueue<PDelay> q = new DelayQueue<PDelay>(); |
| 118 |
> |
private static DelayQueue<PDelay> populatedQueue(int n) { |
| 119 |
> |
DelayQueue<PDelay> q = new DelayQueue<>(); |
| 120 |
|
assertTrue(q.isEmpty()); |
| 121 |
|
for (int i = n - 1; i >= 0; i -= 2) |
| 122 |
|
assertTrue(q.offer(new PDelay(i))); |
| 125 |
|
assertFalse(q.isEmpty()); |
| 126 |
|
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
| 127 |
|
assertEquals(n, q.size()); |
| 128 |
+ |
assertEquals(new PDelay(0), q.peek()); |
| 129 |
|
return q; |
| 130 |
|
} |
| 131 |
|
|
| 674 |
|
* Delayed actions do not occur until their delay elapses |
| 675 |
|
*/ |
| 676 |
|
public void testDelay() throws InterruptedException { |
| 677 |
< |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
| 677 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<>(); |
| 678 |
|
for (int i = 0; i < SIZE; ++i) |
| 679 |
|
q.add(new NanoDelay(1000000L * (SIZE - i))); |
| 680 |
|
|
