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 |
|
|
234 |
|
} |
235 |
|
|
236 |
|
/** |
237 |
< |
* addAll(this) throws IAE |
237 |
> |
* addAll(this) throws IllegalArgumentException |
238 |
|
*/ |
239 |
|
public void testAddAllSelf() { |
240 |
|
DelayQueue q = populatedQueue(SIZE); |
338 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
339 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
340 |
|
public void realRun() throws InterruptedException { |
341 |
< |
for (int i = 0; i < SIZE; ++i) { |
341 |
> |
for (int i = 0; i < SIZE; i++) |
342 |
|
assertEquals(new PDelay(i), ((PDelay)q.take())); |
348 |
– |
} |
343 |
|
|
344 |
|
Thread.currentThread().interrupt(); |
345 |
|
try { |
357 |
|
}}); |
358 |
|
|
359 |
|
await(pleaseInterrupt); |
360 |
< |
assertThreadStaysAlive(t); |
360 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
361 |
|
t.interrupt(); |
362 |
|
awaitTermination(t); |
363 |
|
} |
406 |
|
*/ |
407 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
408 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
409 |
+ |
final DelayQueue q = populatedQueue(SIZE); |
410 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
411 |
|
public void realRun() throws InterruptedException { |
412 |
< |
DelayQueue q = populatedQueue(SIZE); |
413 |
< |
for (int i = 0; i < SIZE; ++i) { |
414 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
415 |
< |
} |
412 |
> |
long startTime = System.nanoTime(); |
413 |
> |
for (int i = 0; i < SIZE; i++) |
414 |
> |
assertEquals(new PDelay(i), |
415 |
> |
((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS))); |
416 |
|
|
417 |
|
Thread.currentThread().interrupt(); |
418 |
|
try { |
427 |
|
shouldThrow(); |
428 |
|
} catch (InterruptedException success) {} |
429 |
|
assertFalse(Thread.interrupted()); |
430 |
+ |
|
431 |
+ |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
432 |
|
}}); |
433 |
|
|
434 |
|
await(pleaseInterrupt); |
435 |
< |
assertThreadStaysAlive(t); |
435 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
436 |
|
t.interrupt(); |
437 |
|
awaitTermination(t); |
438 |
+ |
checkEmpty(q); |
439 |
|
} |
440 |
|
|
441 |
|
/** |
673 |
|
* Delayed actions do not occur until their delay elapses |
674 |
|
*/ |
675 |
|
public void testDelay() throws InterruptedException { |
676 |
< |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
676 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<>(); |
677 |
|
for (int i = 0; i < SIZE; ++i) |
678 |
|
q.add(new NanoDelay(1000000L * (SIZE - i))); |
679 |
|
|
713 |
|
public void testTimedPollDelayed() throws InterruptedException { |
714 |
|
DelayQueue q = new DelayQueue(); |
715 |
|
q.add(new NanoDelay(LONG_DELAY_MS * 1000000L)); |
716 |
+ |
long startTime = System.nanoTime(); |
717 |
|
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
718 |
+ |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
719 |
|
} |
720 |
|
|
721 |
|
/** |