6 |
|
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
– |
import junit.framework.*; |
10 |
– |
import java.util.*; |
9 |
|
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
10 |
< |
import java.util.concurrent.*; |
10 |
> |
|
11 |
> |
import java.util.ArrayList; |
12 |
> |
import java.util.Arrays; |
13 |
> |
import java.util.Collection; |
14 |
> |
import java.util.Iterator; |
15 |
> |
import java.util.NoSuchElementException; |
16 |
> |
import java.util.concurrent.BlockingQueue; |
17 |
> |
import java.util.concurrent.CountDownLatch; |
18 |
> |
import java.util.concurrent.Delayed; |
19 |
> |
import java.util.concurrent.DelayQueue; |
20 |
> |
import java.util.concurrent.Executors; |
21 |
> |
import java.util.concurrent.ExecutorService; |
22 |
> |
import java.util.concurrent.TimeUnit; |
23 |
> |
|
24 |
> |
import junit.framework.Test; |
25 |
|
|
26 |
|
public class DelayQueueTest extends JSR166TestCase { |
27 |
+ |
|
28 |
+ |
public static class Generic extends BlockingQueueTest { |
29 |
+ |
protected BlockingQueue emptyCollection() { |
30 |
+ |
return new DelayQueue(); |
31 |
+ |
} |
32 |
+ |
protected PDelay makeElement(int i) { |
33 |
+ |
return new PDelay(i); |
34 |
+ |
} |
35 |
+ |
} |
36 |
+ |
|
37 |
|
public static void main(String[] args) { |
38 |
< |
junit.textui.TestRunner.run(suite()); |
38 |
> |
main(suite(), args); |
39 |
|
} |
40 |
|
|
41 |
|
public static Test suite() { |
42 |
< |
return new TestSuite(DelayQueueTest.class); |
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(), |
51 |
> |
CollectionTest.testSuite(new Implementation())); |
52 |
|
} |
53 |
|
|
23 |
– |
private static final int NOCAP = Integer.MAX_VALUE; |
24 |
– |
|
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 = Integer.MIN_VALUE + i; } |
33 |
< |
public int compareTo(PDelay y) { |
34 |
< |
int i = pseudodelay; |
35 |
< |
int j = y.pseudodelay; |
36 |
< |
if (i < j) return -1; |
37 |
< |
if (i > j) return 1; |
38 |
< |
return 0; |
39 |
< |
} |
40 |
< |
|
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 |
|
} |
44 |
– |
|
65 |
|
public boolean equals(Object other) { |
66 |
< |
return equals((PDelay)other); |
67 |
< |
} |
48 |
< |
public boolean equals(PDelay other) { |
49 |
< |
return other.pseudodelay == pseudodelay; |
66 |
> |
return (other instanceof PDelay) && |
67 |
> |
this.pseudodelay == ((PDelay)other).pseudodelay; |
68 |
|
} |
69 |
< |
|
69 |
> |
// suppress [overrides] javac warning |
70 |
> |
public int hashCode() { return pseudodelay; } |
71 |
|
public long getDelay(TimeUnit ignore) { |
72 |
< |
return pseudodelay; |
72 |
> |
return Integer.MIN_VALUE + pseudodelay; |
73 |
|
} |
55 |
– |
public int intValue() { |
56 |
– |
return pseudodelay; |
57 |
– |
} |
58 |
– |
|
74 |
|
public String toString() { |
75 |
|
return String.valueOf(pseudodelay); |
76 |
|
} |
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 |
|
} |
72 |
– |
public int compareTo(NanoDelay y) { |
73 |
– |
long i = trigger; |
74 |
– |
long j = y.trigger; |
75 |
– |
if (i < j) return -1; |
76 |
– |
if (i > j) return 1; |
77 |
– |
return 0; |
78 |
– |
} |
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 |
< |
} |
87 |
< |
public boolean equals(NanoDelay other) { |
88 |
< |
return other.trigger == trigger; |
93 |
> |
return (other instanceof NanoDelay) && |
94 |
> |
this.trigger == ((NanoDelay)other).trigger; |
95 |
|
} |
96 |
|
|
97 |
+ |
// suppress [overrides] javac warning |
98 |
+ |
public int hashCode() { return (int) trigger; } |
99 |
+ |
|
100 |
|
public long getDelay(TimeUnit unit) { |
101 |
|
long n = trigger - System.nanoTime(); |
102 |
|
return unit.convert(n, TimeUnit.NANOSECONDS); |
112 |
|
} |
113 |
|
|
114 |
|
/** |
115 |
< |
* Create a queue of given size containing consecutive |
116 |
< |
* PDelays 0 ... n. |
115 |
> |
* Returns a new queue of given size containing consecutive |
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) |
121 |
> |
for (int i = n - 1; i >= 0; i -= 2) |
122 |
|
assertTrue(q.offer(new PDelay(i))); |
123 |
< |
for (int i = (n & 1); i < n; i+=2) |
123 |
> |
for (int i = (n & 1); i < n; i += 2) |
124 |
|
assertTrue(q.offer(new PDelay(i))); |
125 |
|
assertFalse(q.isEmpty()); |
126 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
126 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
127 |
|
assertEquals(n, q.size()); |
128 |
+ |
assertEquals(new PDelay(0), q.peek()); |
129 |
|
return q; |
130 |
|
} |
131 |
|
|
133 |
|
* A new queue has unbounded capacity |
134 |
|
*/ |
135 |
|
public void testConstructor1() { |
136 |
< |
assertEquals(NOCAP, new DelayQueue().remainingCapacity()); |
136 |
> |
assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity()); |
137 |
|
} |
138 |
|
|
139 |
|
/** |
141 |
|
*/ |
142 |
|
public void testConstructor3() { |
143 |
|
try { |
144 |
< |
DelayQueue q = new DelayQueue(null); |
144 |
> |
new DelayQueue(null); |
145 |
|
shouldThrow(); |
146 |
|
} catch (NullPointerException success) {} |
147 |
|
} |
151 |
|
*/ |
152 |
|
public void testConstructor4() { |
153 |
|
try { |
154 |
< |
PDelay[] ints = new PDelay[SIZE]; |
145 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
154 |
> |
new DelayQueue(Arrays.asList(new PDelay[SIZE])); |
155 |
|
shouldThrow(); |
156 |
|
} catch (NullPointerException success) {} |
157 |
|
} |
160 |
|
* Initializing from Collection with some null elements throws NPE |
161 |
|
*/ |
162 |
|
public void testConstructor5() { |
163 |
+ |
PDelay[] a = new PDelay[SIZE]; |
164 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
165 |
+ |
a[i] = new PDelay(i); |
166 |
|
try { |
167 |
< |
PDelay[] ints = new PDelay[SIZE]; |
156 |
< |
for (int i = 0; i < SIZE-1; ++i) |
157 |
< |
ints[i] = new PDelay(i); |
158 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
167 |
> |
new DelayQueue(Arrays.asList(a)); |
168 |
|
shouldThrow(); |
169 |
|
} catch (NullPointerException success) {} |
170 |
|
} |
187 |
|
public void testEmpty() { |
188 |
|
DelayQueue q = new DelayQueue(); |
189 |
|
assertTrue(q.isEmpty()); |
190 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
190 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
191 |
|
q.add(new PDelay(1)); |
192 |
|
assertFalse(q.isEmpty()); |
193 |
|
q.add(new PDelay(2)); |
197 |
|
} |
198 |
|
|
199 |
|
/** |
200 |
< |
* remainingCapacity does not change when elements added or removed, |
192 |
< |
* but size does |
200 |
> |
* remainingCapacity() always returns Integer.MAX_VALUE |
201 |
|
*/ |
202 |
|
public void testRemainingCapacity() { |
203 |
< |
DelayQueue q = populatedQueue(SIZE); |
203 |
> |
BlockingQueue q = populatedQueue(SIZE); |
204 |
|
for (int i = 0; i < SIZE; ++i) { |
205 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
206 |
< |
assertEquals(SIZE-i, q.size()); |
207 |
< |
q.remove(); |
205 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
206 |
> |
assertEquals(SIZE - i, q.size()); |
207 |
> |
assertTrue(q.remove() instanceof PDelay); |
208 |
|
} |
209 |
|
for (int i = 0; i < SIZE; ++i) { |
210 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
210 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
211 |
|
assertEquals(i, q.size()); |
212 |
< |
q.add(new PDelay(i)); |
212 |
> |
assertTrue(q.add(new PDelay(i))); |
213 |
|
} |
214 |
|
} |
215 |
|
|
216 |
|
/** |
209 |
– |
* offer(null) throws NPE |
210 |
– |
*/ |
211 |
– |
public void testOfferNull() { |
212 |
– |
try { |
213 |
– |
DelayQueue q = new DelayQueue(); |
214 |
– |
q.offer(null); |
215 |
– |
shouldThrow(); |
216 |
– |
} catch (NullPointerException success) {} |
217 |
– |
} |
218 |
– |
|
219 |
– |
/** |
220 |
– |
* add(null) throws NPE |
221 |
– |
*/ |
222 |
– |
public void testAddNull() { |
223 |
– |
try { |
224 |
– |
DelayQueue q = new DelayQueue(); |
225 |
– |
q.add(null); |
226 |
– |
shouldThrow(); |
227 |
– |
} catch (NullPointerException success) {} |
228 |
– |
} |
229 |
– |
|
230 |
– |
/** |
217 |
|
* offer non-null succeeds |
218 |
|
*/ |
219 |
|
public void testOffer() { |
234 |
|
} |
235 |
|
|
236 |
|
/** |
251 |
– |
* addAll(null) throws NPE |
252 |
– |
*/ |
253 |
– |
public void testAddAll1() { |
254 |
– |
try { |
255 |
– |
DelayQueue q = new DelayQueue(); |
256 |
– |
q.addAll(null); |
257 |
– |
shouldThrow(); |
258 |
– |
} catch (NullPointerException success) {} |
259 |
– |
} |
260 |
– |
|
261 |
– |
/** |
237 |
|
* addAll(this) throws IAE |
238 |
|
*/ |
239 |
|
public void testAddAllSelf() { |
240 |
+ |
DelayQueue q = populatedQueue(SIZE); |
241 |
|
try { |
266 |
– |
DelayQueue q = populatedQueue(SIZE); |
242 |
|
q.addAll(q); |
243 |
|
shouldThrow(); |
244 |
|
} catch (IllegalArgumentException success) {} |
245 |
|
} |
246 |
|
|
247 |
|
/** |
273 |
– |
* addAll of a collection with null elements throws NPE |
274 |
– |
*/ |
275 |
– |
public void testAddAll2() { |
276 |
– |
try { |
277 |
– |
DelayQueue q = new DelayQueue(); |
278 |
– |
PDelay[] ints = new PDelay[SIZE]; |
279 |
– |
q.addAll(Arrays.asList(ints)); |
280 |
– |
shouldThrow(); |
281 |
– |
} catch (NullPointerException success) {} |
282 |
– |
} |
283 |
– |
|
284 |
– |
/** |
248 |
|
* addAll of a collection with any null elements throws NPE after |
249 |
|
* possibly adding some elements |
250 |
|
*/ |
251 |
|
public void testAddAll3() { |
252 |
+ |
DelayQueue q = new DelayQueue(); |
253 |
+ |
PDelay[] a = new PDelay[SIZE]; |
254 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
255 |
+ |
a[i] = new PDelay(i); |
256 |
|
try { |
257 |
< |
DelayQueue q = new DelayQueue(); |
291 |
< |
PDelay[] ints = new PDelay[SIZE]; |
292 |
< |
for (int i = 0; i < SIZE-1; ++i) |
293 |
< |
ints[i] = new PDelay(i); |
294 |
< |
q.addAll(Arrays.asList(ints)); |
257 |
> |
q.addAll(Arrays.asList(a)); |
258 |
|
shouldThrow(); |
259 |
|
} catch (NullPointerException success) {} |
260 |
|
} |
265 |
|
public void testAddAll5() { |
266 |
|
PDelay[] empty = new PDelay[0]; |
267 |
|
PDelay[] ints = new PDelay[SIZE]; |
268 |
< |
for (int i = SIZE-1; i >= 0; --i) |
268 |
> |
for (int i = SIZE - 1; i >= 0; --i) |
269 |
|
ints[i] = new PDelay(i); |
270 |
|
DelayQueue q = new DelayQueue(); |
271 |
|
assertFalse(q.addAll(Arrays.asList(empty))); |
275 |
|
} |
276 |
|
|
277 |
|
/** |
315 |
– |
* put(null) throws NPE |
316 |
– |
*/ |
317 |
– |
public void testPutNull() { |
318 |
– |
try { |
319 |
– |
DelayQueue q = new DelayQueue(); |
320 |
– |
q.put(null); |
321 |
– |
shouldThrow(); |
322 |
– |
} catch (NullPointerException success) {} |
323 |
– |
} |
324 |
– |
|
325 |
– |
/** |
278 |
|
* all elements successfully put are contained |
279 |
|
*/ |
280 |
|
public void testPut() { |
281 |
|
DelayQueue q = new DelayQueue(); |
282 |
|
for (int i = 0; i < SIZE; ++i) { |
283 |
< |
PDelay I = new PDelay(i); |
284 |
< |
q.put(I); |
285 |
< |
assertTrue(q.contains(I)); |
283 |
> |
PDelay x = new PDelay(i); |
284 |
> |
q.put(x); |
285 |
> |
assertTrue(q.contains(x)); |
286 |
|
} |
287 |
|
assertEquals(SIZE, q.size()); |
288 |
|
} |
326 |
|
public void testTake() throws InterruptedException { |
327 |
|
DelayQueue q = populatedQueue(SIZE); |
328 |
|
for (int i = 0; i < SIZE; ++i) { |
329 |
< |
assertEquals(new PDelay(i), ((PDelay)q.take())); |
329 |
> |
assertEquals(new PDelay(i), q.take()); |
330 |
|
} |
331 |
|
} |
332 |
|
|
333 |
|
/** |
382 |
– |
* take blocks interruptibly when empty |
383 |
– |
*/ |
384 |
– |
public void testTakeFromEmptyBlocksInterruptibly() |
385 |
– |
throws InterruptedException { |
386 |
– |
final BlockingQueue q = new DelayQueue(); |
387 |
– |
final CountDownLatch threadStarted = new CountDownLatch(1); |
388 |
– |
Thread t = newStartedThread(new CheckedRunnable() { |
389 |
– |
public void realRun() { |
390 |
– |
threadStarted.countDown(); |
391 |
– |
try { |
392 |
– |
q.take(); |
393 |
– |
shouldThrow(); |
394 |
– |
} catch (InterruptedException success) {} |
395 |
– |
assertFalse(Thread.interrupted()); |
396 |
– |
}}); |
397 |
– |
|
398 |
– |
await(threadStarted); |
399 |
– |
assertThreadStaysAlive(t); |
400 |
– |
t.interrupt(); |
401 |
– |
awaitTermination(t); |
402 |
– |
} |
403 |
– |
|
404 |
– |
/** |
334 |
|
* Take removes existing elements until empty, then blocks interruptibly |
335 |
|
*/ |
336 |
|
public void testBlockingTake() throws InterruptedException { |
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())); |
414 |
– |
} |
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 |
|
} |
368 |
|
public void testPoll() { |
369 |
|
DelayQueue q = populatedQueue(SIZE); |
370 |
|
for (int i = 0; i < SIZE; ++i) { |
371 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
371 |
> |
assertEquals(new PDelay(i), q.poll()); |
372 |
|
} |
373 |
|
assertNull(q.poll()); |
374 |
|
} |
379 |
|
public void testTimedPoll0() throws InterruptedException { |
380 |
|
DelayQueue q = populatedQueue(SIZE); |
381 |
|
for (int i = 0; i < SIZE; ++i) { |
382 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS))); |
382 |
> |
assertEquals(new PDelay(i), q.poll(0, MILLISECONDS)); |
383 |
|
} |
384 |
|
assertNull(q.poll(0, MILLISECONDS)); |
385 |
|
} |
391 |
|
DelayQueue q = populatedQueue(SIZE); |
392 |
|
for (int i = 0; i < SIZE; ++i) { |
393 |
|
long startTime = System.nanoTime(); |
394 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS))); |
394 |
> |
assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS)); |
395 |
|
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
396 |
|
} |
397 |
|
long startTime = System.nanoTime(); |
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()); |
501 |
– |
}}); |
430 |
|
|
431 |
< |
await(pleaseInterrupt); |
504 |
< |
assertThreadStaysAlive(t); |
505 |
< |
t.interrupt(); |
506 |
< |
awaitTermination(t); |
507 |
< |
} |
508 |
< |
|
509 |
< |
/** |
510 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
511 |
< |
* on interruption throws |
512 |
< |
*/ |
513 |
< |
public void testTimedPollWithOffer() throws InterruptedException { |
514 |
< |
final DelayQueue q = new DelayQueue(); |
515 |
< |
final PDelay pdelay = new PDelay(0); |
516 |
< |
final CheckedBarrier barrier = new CheckedBarrier(2); |
517 |
< |
Thread t = newStartedThread(new CheckedRunnable() { |
518 |
< |
public void realRun() throws InterruptedException { |
519 |
< |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
520 |
< |
|
521 |
< |
barrier.await(); |
522 |
< |
assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS)); |
523 |
< |
|
524 |
< |
Thread.currentThread().interrupt(); |
525 |
< |
try { |
526 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
527 |
< |
shouldThrow(); |
528 |
< |
} catch (InterruptedException success) {} |
529 |
< |
assertFalse(Thread.interrupted()); |
530 |
< |
|
531 |
< |
barrier.await(); |
532 |
< |
try { |
533 |
< |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
534 |
< |
shouldThrow(); |
535 |
< |
} catch (InterruptedException success) {} |
536 |
< |
assertFalse(Thread.interrupted()); |
431 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
432 |
|
}}); |
433 |
|
|
434 |
< |
barrier.await(); |
435 |
< |
long startTime = System.nanoTime(); |
541 |
< |
assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS)); |
542 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
543 |
< |
|
544 |
< |
barrier.await(); |
545 |
< |
assertThreadStaysAlive(t); |
434 |
> |
await(pleaseInterrupt); |
435 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
436 |
|
t.interrupt(); |
437 |
|
awaitTermination(t); |
438 |
+ |
checkEmpty(q); |
439 |
|
} |
440 |
|
|
441 |
|
/** |
444 |
|
public void testPeek() { |
445 |
|
DelayQueue q = populatedQueue(SIZE); |
446 |
|
for (int i = 0; i < SIZE; ++i) { |
447 |
< |
assertEquals(new PDelay(i), ((PDelay)q.peek())); |
448 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
447 |
> |
assertEquals(new PDelay(i), q.peek()); |
448 |
> |
assertEquals(new PDelay(i), q.poll()); |
449 |
|
if (q.isEmpty()) |
450 |
|
assertNull(q.peek()); |
451 |
|
else |
460 |
|
public void testElement() { |
461 |
|
DelayQueue q = populatedQueue(SIZE); |
462 |
|
for (int i = 0; i < SIZE; ++i) { |
463 |
< |
assertEquals(new PDelay(i), ((PDelay)q.element())); |
463 |
> |
assertEquals(new PDelay(i), q.element()); |
464 |
|
q.poll(); |
465 |
|
} |
466 |
|
try { |
475 |
|
public void testRemove() { |
476 |
|
DelayQueue q = populatedQueue(SIZE); |
477 |
|
for (int i = 0; i < SIZE; ++i) { |
478 |
< |
assertEquals(new PDelay(i), ((PDelay)q.remove())); |
478 |
> |
assertEquals(new PDelay(i), q.remove()); |
479 |
|
} |
480 |
|
try { |
481 |
|
q.remove(); |
484 |
|
} |
485 |
|
|
486 |
|
/** |
596 |
– |
* remove(x) removes x and returns true if present |
597 |
– |
*/ |
598 |
– |
public void testRemoveElement() { |
599 |
– |
DelayQueue q = populatedQueue(SIZE); |
600 |
– |
for (int i = 1; i < SIZE; i+=2) { |
601 |
– |
assertTrue(q.remove(new PDelay(i))); |
602 |
– |
} |
603 |
– |
for (int i = 0; i < SIZE; i+=2) { |
604 |
– |
assertTrue(q.remove(new PDelay(i))); |
605 |
– |
assertFalse(q.remove(new PDelay(i+1))); |
606 |
– |
} |
607 |
– |
assertTrue(q.isEmpty()); |
608 |
– |
} |
609 |
– |
|
610 |
– |
/** |
487 |
|
* contains(x) reports true when elements added but not yet removed |
488 |
|
*/ |
489 |
|
public void testContains() { |
503 |
|
q.clear(); |
504 |
|
assertTrue(q.isEmpty()); |
505 |
|
assertEquals(0, q.size()); |
506 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
506 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
507 |
|
PDelay x = new PDelay(1); |
508 |
|
q.add(x); |
509 |
|
assertFalse(q.isEmpty()); |
540 |
|
assertTrue(changed); |
541 |
|
|
542 |
|
assertTrue(q.containsAll(p)); |
543 |
< |
assertEquals(SIZE-i, q.size()); |
543 |
> |
assertEquals(SIZE - i, q.size()); |
544 |
|
p.remove(); |
545 |
|
} |
546 |
|
} |
553 |
|
DelayQueue q = populatedQueue(SIZE); |
554 |
|
DelayQueue p = populatedQueue(i); |
555 |
|
assertTrue(q.removeAll(p)); |
556 |
< |
assertEquals(SIZE-i, q.size()); |
556 |
> |
assertEquals(SIZE - i, q.size()); |
557 |
|
for (int j = 0; j < i; ++j) { |
558 |
< |
PDelay I = (PDelay)(p.remove()); |
559 |
< |
assertFalse(q.contains(I)); |
558 |
> |
PDelay x = (PDelay)(p.remove()); |
559 |
> |
assertFalse(q.contains(x)); |
560 |
|
} |
561 |
|
} |
562 |
|
} |
586 |
|
} |
587 |
|
|
588 |
|
/** |
713 |
– |
* toArray(null) throws NullPointerException |
714 |
– |
*/ |
715 |
– |
public void testToArray_NullArg() { |
716 |
– |
DelayQueue q = populatedQueue(SIZE); |
717 |
– |
try { |
718 |
– |
q.toArray(null); |
719 |
– |
shouldThrow(); |
720 |
– |
} catch (NullPointerException success) {} |
721 |
– |
} |
722 |
– |
|
723 |
– |
/** |
589 |
|
* toArray(incompatible array type) throws ArrayStoreException |
590 |
|
*/ |
591 |
|
public void testToArray1_BadArg() { |
608 |
|
++i; |
609 |
|
} |
610 |
|
assertEquals(i, SIZE); |
611 |
+ |
assertIteratorExhausted(it); |
612 |
+ |
} |
613 |
+ |
|
614 |
+ |
/** |
615 |
+ |
* iterator of empty collection has no elements |
616 |
+ |
*/ |
617 |
+ |
public void testEmptyIterator() { |
618 |
+ |
assertIteratorExhausted(new DelayQueue().iterator()); |
619 |
|
} |
620 |
|
|
621 |
|
/** |
630 |
|
it.next(); |
631 |
|
it.remove(); |
632 |
|
it = q.iterator(); |
633 |
< |
assertEquals(it.next(), new PDelay(2)); |
634 |
< |
assertEquals(it.next(), new PDelay(3)); |
633 |
> |
assertEquals(new PDelay(2), it.next()); |
634 |
> |
assertEquals(new PDelay(3), it.next()); |
635 |
|
assertFalse(it.hasNext()); |
636 |
|
} |
637 |
|
|
641 |
|
public void testToString() { |
642 |
|
DelayQueue q = populatedQueue(SIZE); |
643 |
|
String s = q.toString(); |
644 |
< |
for (int i = 0; i < SIZE; ++i) { |
645 |
< |
assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i))); |
773 |
< |
} |
644 |
> |
for (Object e : q) |
645 |
> |
assertTrue(s.contains(e.toString())); |
646 |
|
} |
647 |
|
|
648 |
|
/** |
651 |
|
public void testPollInExecutor() { |
652 |
|
final DelayQueue q = new DelayQueue(); |
653 |
|
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
654 |
< |
ExecutorService executor = Executors.newFixedThreadPool(2); |
655 |
< |
executor.execute(new CheckedRunnable() { |
656 |
< |
public void realRun() throws InterruptedException { |
657 |
< |
assertNull(q.poll()); |
658 |
< |
threadsStarted.await(); |
659 |
< |
assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS)); |
660 |
< |
checkEmpty(q); |
661 |
< |
}}); |
662 |
< |
|
663 |
< |
executor.execute(new CheckedRunnable() { |
664 |
< |
public void realRun() throws InterruptedException { |
665 |
< |
threadsStarted.await(); |
666 |
< |
q.put(new PDelay(1)); |
667 |
< |
}}); |
668 |
< |
|
669 |
< |
joinPool(executor); |
654 |
> |
final ExecutorService executor = Executors.newFixedThreadPool(2); |
655 |
> |
try (PoolCleaner cleaner = cleaner(executor)) { |
656 |
> |
executor.execute(new CheckedRunnable() { |
657 |
> |
public void realRun() throws InterruptedException { |
658 |
> |
assertNull(q.poll()); |
659 |
> |
threadsStarted.await(); |
660 |
> |
assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS)); |
661 |
> |
checkEmpty(q); |
662 |
> |
}}); |
663 |
> |
|
664 |
> |
executor.execute(new CheckedRunnable() { |
665 |
> |
public void realRun() throws InterruptedException { |
666 |
> |
threadsStarted.await(); |
667 |
> |
q.put(new PDelay(1)); |
668 |
> |
}}); |
669 |
> |
} |
670 |
|
} |
671 |
|
|
672 |
|
/** |
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 |
< |
} |
846 |
< |
|
847 |
< |
/** |
848 |
< |
* drainTo(null) throws NPE |
849 |
< |
*/ |
850 |
< |
public void testDrainToNull() { |
851 |
< |
DelayQueue q = populatedQueue(SIZE); |
852 |
< |
try { |
853 |
< |
q.drainTo(null); |
854 |
< |
shouldThrow(); |
855 |
< |
} catch (NullPointerException success) {} |
856 |
< |
} |
857 |
< |
|
858 |
< |
/** |
859 |
< |
* drainTo(this) throws IAE |
860 |
< |
*/ |
861 |
< |
public void testDrainToSelf() { |
862 |
< |
DelayQueue q = populatedQueue(SIZE); |
863 |
< |
try { |
864 |
< |
q.drainTo(q); |
865 |
< |
shouldThrow(); |
866 |
< |
} catch (IllegalArgumentException success) {} |
718 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
719 |
|
} |
720 |
|
|
721 |
|
/** |
730 |
|
} |
731 |
|
ArrayList l = new ArrayList(); |
732 |
|
q.drainTo(l); |
733 |
< |
assertEquals(q.size(), 0); |
733 |
> |
assertEquals(0, q.size()); |
734 |
|
for (int i = 0; i < SIZE; ++i) |
735 |
< |
assertEquals(l.get(i), elems[i]); |
735 |
> |
assertEquals(elems[i], l.get(i)); |
736 |
|
q.add(elems[0]); |
737 |
|
q.add(elems[1]); |
738 |
|
assertFalse(q.isEmpty()); |
740 |
|
assertTrue(q.contains(elems[1])); |
741 |
|
l.clear(); |
742 |
|
q.drainTo(l); |
743 |
< |
assertEquals(q.size(), 0); |
744 |
< |
assertEquals(l.size(), 2); |
743 |
> |
assertEquals(0, q.size()); |
744 |
> |
assertEquals(2, l.size()); |
745 |
|
for (int i = 0; i < 2; ++i) |
746 |
< |
assertEquals(l.get(i), elems[i]); |
746 |
> |
assertEquals(elems[i], l.get(i)); |
747 |
|
} |
748 |
|
|
749 |
|
/** |
753 |
|
final DelayQueue q = populatedQueue(SIZE); |
754 |
|
Thread t = new Thread(new CheckedRunnable() { |
755 |
|
public void realRun() { |
756 |
< |
q.put(new PDelay(SIZE+1)); |
756 |
> |
q.put(new PDelay(SIZE + 1)); |
757 |
|
}}); |
758 |
|
|
759 |
|
t.start(); |
765 |
|
} |
766 |
|
|
767 |
|
/** |
916 |
– |
* drainTo(null, n) throws NPE |
917 |
– |
*/ |
918 |
– |
public void testDrainToNullN() { |
919 |
– |
DelayQueue q = populatedQueue(SIZE); |
920 |
– |
try { |
921 |
– |
q.drainTo(null, 0); |
922 |
– |
shouldThrow(); |
923 |
– |
} catch (NullPointerException success) {} |
924 |
– |
} |
925 |
– |
|
926 |
– |
/** |
927 |
– |
* drainTo(this, n) throws IAE |
928 |
– |
*/ |
929 |
– |
public void testDrainToSelfN() { |
930 |
– |
DelayQueue q = populatedQueue(SIZE); |
931 |
– |
try { |
932 |
– |
q.drainTo(q, 0); |
933 |
– |
shouldThrow(); |
934 |
– |
} catch (IllegalArgumentException success) {} |
935 |
– |
} |
936 |
– |
|
937 |
– |
/** |
768 |
|
* drainTo(c, n) empties first min(n, size) elements of queue into c |
769 |
|
*/ |
770 |
|
public void testDrainToN() { |
773 |
|
ArrayList l = new ArrayList(); |
774 |
|
q.drainTo(l, i); |
775 |
|
int k = (i < SIZE) ? i : SIZE; |
776 |
< |
assertEquals(q.size(), SIZE-k); |
777 |
< |
assertEquals(l.size(), k); |
776 |
> |
assertEquals(SIZE - k, q.size()); |
777 |
> |
assertEquals(k, l.size()); |
778 |
|
} |
779 |
|
} |
780 |
|
|
781 |
+ |
/** |
782 |
+ |
* remove(null), contains(null) always return false |
783 |
+ |
*/ |
784 |
+ |
public void testNeverContainsNull() { |
785 |
+ |
Collection<?> q = populatedQueue(SIZE); |
786 |
+ |
assertFalse(q.contains(null)); |
787 |
+ |
assertFalse(q.remove(null)); |
788 |
+ |
} |
789 |
|
} |