1 |
|
/* |
2 |
|
* Written by Doug Lea with assistance from members of JCP JSR-166 |
3 |
|
* Expert Group and released to the public domain, as explained at |
4 |
< |
* http://creativecommons.org/licenses/publicdomain |
4 |
> |
* http://creativecommons.org/publicdomain/zero/1.0/ |
5 |
|
* Other contributors include Andrew Wright, Jeffrey Hayes, |
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 |
> |
return newTestSuite(DelayQueueTest.class, |
43 |
> |
new Generic().testSuite()); |
44 |
|
} |
45 |
|
|
23 |
– |
private static final int NOCAP = Integer.MAX_VALUE; |
24 |
– |
|
46 |
|
/** |
47 |
|
* A delayed implementation for testing. |
48 |
|
* Most tests use Pseudodelays, where delays are all elapsed |
50 |
|
*/ |
51 |
|
static class PDelay implements Delayed { |
52 |
|
int pseudodelay; |
53 |
< |
PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; } |
54 |
< |
public int compareTo(PDelay y) { |
55 |
< |
int i = pseudodelay; |
56 |
< |
int j = y.pseudodelay; |
57 |
< |
if (i < j) return -1; |
37 |
< |
if (i > j) return 1; |
38 |
< |
return 0; |
53 |
> |
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 |
|
} |
40 |
– |
|
59 |
|
public int compareTo(Delayed y) { |
60 |
|
return compareTo((PDelay)y); |
61 |
|
} |
44 |
– |
|
62 |
|
public boolean equals(Object other) { |
63 |
< |
return equals((PDelay)other); |
64 |
< |
} |
48 |
< |
public boolean equals(PDelay other) { |
49 |
< |
return other.pseudodelay == pseudodelay; |
63 |
> |
return (other instanceof PDelay) && |
64 |
> |
this.pseudodelay == ((PDelay)other).pseudodelay; |
65 |
|
} |
66 |
< |
|
67 |
< |
|
66 |
> |
// suppress [overrides] javac warning |
67 |
> |
public int hashCode() { return pseudodelay; } |
68 |
|
public long getDelay(TimeUnit ignore) { |
69 |
< |
return pseudodelay; |
55 |
< |
} |
56 |
< |
public int intValue() { |
57 |
< |
return pseudodelay; |
69 |
> |
return Integer.MIN_VALUE + pseudodelay; |
70 |
|
} |
59 |
– |
|
71 |
|
public String toString() { |
72 |
|
return String.valueOf(pseudodelay); |
73 |
|
} |
74 |
|
} |
75 |
|
|
65 |
– |
|
76 |
|
/** |
77 |
|
* Delayed implementation that actually delays |
78 |
|
*/ |
100 |
|
return other.trigger == trigger; |
101 |
|
} |
102 |
|
|
103 |
+ |
// suppress [overrides] javac warning |
104 |
+ |
public int hashCode() { return (int) trigger; } |
105 |
+ |
|
106 |
|
public long getDelay(TimeUnit unit) { |
107 |
|
long n = trigger - System.nanoTime(); |
108 |
|
return unit.convert(n, TimeUnit.NANOSECONDS); |
117 |
|
} |
118 |
|
} |
119 |
|
|
107 |
– |
|
120 |
|
/** |
121 |
< |
* Create a queue of given size containing consecutive |
121 |
> |
* Returns a new queue of given size containing consecutive |
122 |
|
* PDelays 0 ... n. |
123 |
|
*/ |
124 |
< |
private DelayQueue populatedQueue(int n) { |
125 |
< |
DelayQueue q = new DelayQueue(); |
124 |
> |
private DelayQueue<PDelay> populatedQueue(int n) { |
125 |
> |
DelayQueue<PDelay> q = new DelayQueue<PDelay>(); |
126 |
|
assertTrue(q.isEmpty()); |
127 |
< |
for (int i = n-1; i >= 0; i-=2) |
127 |
> |
for (int i = n-1; i >= 0; i -= 2) |
128 |
|
assertTrue(q.offer(new PDelay(i))); |
129 |
< |
for (int i = (n & 1); i < n; i+=2) |
129 |
> |
for (int i = (n & 1); i < n; i += 2) |
130 |
|
assertTrue(q.offer(new PDelay(i))); |
131 |
|
assertFalse(q.isEmpty()); |
132 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
132 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
133 |
|
assertEquals(n, q.size()); |
134 |
|
return q; |
135 |
|
} |
138 |
|
* A new queue has unbounded capacity |
139 |
|
*/ |
140 |
|
public void testConstructor1() { |
141 |
< |
assertEquals(NOCAP, new DelayQueue().remainingCapacity()); |
141 |
> |
assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity()); |
142 |
|
} |
143 |
|
|
144 |
|
/** |
146 |
|
*/ |
147 |
|
public void testConstructor3() { |
148 |
|
try { |
149 |
< |
DelayQueue q = new DelayQueue(null); |
149 |
> |
new DelayQueue(null); |
150 |
|
shouldThrow(); |
151 |
|
} catch (NullPointerException success) {} |
152 |
|
} |
157 |
|
public void testConstructor4() { |
158 |
|
try { |
159 |
|
PDelay[] ints = new PDelay[SIZE]; |
160 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
160 |
> |
new DelayQueue(Arrays.asList(ints)); |
161 |
|
shouldThrow(); |
162 |
|
} catch (NullPointerException success) {} |
163 |
|
} |
170 |
|
PDelay[] ints = new PDelay[SIZE]; |
171 |
|
for (int i = 0; i < SIZE-1; ++i) |
172 |
|
ints[i] = new PDelay(i); |
173 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
173 |
> |
new DelayQueue(Arrays.asList(ints)); |
174 |
|
shouldThrow(); |
175 |
|
} catch (NullPointerException success) {} |
176 |
|
} |
193 |
|
public void testEmpty() { |
194 |
|
DelayQueue q = new DelayQueue(); |
195 |
|
assertTrue(q.isEmpty()); |
196 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
196 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
197 |
|
q.add(new PDelay(1)); |
198 |
|
assertFalse(q.isEmpty()); |
199 |
|
q.add(new PDelay(2)); |
203 |
|
} |
204 |
|
|
205 |
|
/** |
206 |
< |
* remainingCapacity does not change when elements added or removed, |
195 |
< |
* but size does |
206 |
> |
* remainingCapacity() always returns Integer.MAX_VALUE |
207 |
|
*/ |
208 |
|
public void testRemainingCapacity() { |
209 |
< |
DelayQueue q = populatedQueue(SIZE); |
209 |
> |
BlockingQueue q = populatedQueue(SIZE); |
210 |
|
for (int i = 0; i < SIZE; ++i) { |
211 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
211 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
212 |
|
assertEquals(SIZE-i, q.size()); |
213 |
< |
q.remove(); |
213 |
> |
assertTrue(q.remove() instanceof PDelay); |
214 |
|
} |
215 |
|
for (int i = 0; i < SIZE; ++i) { |
216 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
216 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
217 |
|
assertEquals(i, q.size()); |
218 |
< |
q.add(new PDelay(i)); |
218 |
> |
assertTrue(q.add(new PDelay(i))); |
219 |
|
} |
220 |
|
} |
221 |
|
|
222 |
|
/** |
212 |
– |
* offer(null) throws NPE |
213 |
– |
*/ |
214 |
– |
public void testOfferNull() { |
215 |
– |
try { |
216 |
– |
DelayQueue q = new DelayQueue(); |
217 |
– |
q.offer(null); |
218 |
– |
shouldThrow(); |
219 |
– |
} catch (NullPointerException success) {} |
220 |
– |
} |
221 |
– |
|
222 |
– |
/** |
223 |
– |
* add(null) throws NPE |
224 |
– |
*/ |
225 |
– |
public void testAddNull() { |
226 |
– |
try { |
227 |
– |
DelayQueue q = new DelayQueue(); |
228 |
– |
q.add(null); |
229 |
– |
shouldThrow(); |
230 |
– |
} catch (NullPointerException success) {} |
231 |
– |
} |
232 |
– |
|
233 |
– |
/** |
223 |
|
* offer non-null succeeds |
224 |
|
*/ |
225 |
|
public void testOffer() { |
240 |
|
} |
241 |
|
|
242 |
|
/** |
254 |
– |
* addAll(null) throws NPE |
255 |
– |
*/ |
256 |
– |
public void testAddAll1() { |
257 |
– |
try { |
258 |
– |
DelayQueue q = new DelayQueue(); |
259 |
– |
q.addAll(null); |
260 |
– |
shouldThrow(); |
261 |
– |
} catch (NullPointerException success) {} |
262 |
– |
} |
263 |
– |
|
264 |
– |
|
265 |
– |
/** |
243 |
|
* addAll(this) throws IAE |
244 |
|
*/ |
245 |
|
public void testAddAllSelf() { |
251 |
|
} |
252 |
|
|
253 |
|
/** |
277 |
– |
* addAll of a collection with null elements throws NPE |
278 |
– |
*/ |
279 |
– |
public void testAddAll2() { |
280 |
– |
try { |
281 |
– |
DelayQueue q = new DelayQueue(); |
282 |
– |
PDelay[] ints = new PDelay[SIZE]; |
283 |
– |
q.addAll(Arrays.asList(ints)); |
284 |
– |
shouldThrow(); |
285 |
– |
} catch (NullPointerException success) {} |
286 |
– |
} |
287 |
– |
|
288 |
– |
/** |
254 |
|
* addAll of a collection with any null elements throws NPE after |
255 |
|
* possibly adding some elements |
256 |
|
*/ |
281 |
|
} |
282 |
|
|
283 |
|
/** |
319 |
– |
* put(null) throws NPE |
320 |
– |
*/ |
321 |
– |
public void testPutNull() { |
322 |
– |
try { |
323 |
– |
DelayQueue q = new DelayQueue(); |
324 |
– |
q.put(null); |
325 |
– |
shouldThrow(); |
326 |
– |
} catch (NullPointerException success) {} |
327 |
– |
} |
328 |
– |
|
329 |
– |
/** |
284 |
|
* all elements successfully put are contained |
285 |
|
*/ |
286 |
< |
public void testPut() { |
287 |
< |
DelayQueue q = new DelayQueue(); |
288 |
< |
for (int i = 0; i < SIZE; ++i) { |
289 |
< |
PDelay I = new PDelay(i); |
290 |
< |
q.put(I); |
291 |
< |
assertTrue(q.contains(I)); |
292 |
< |
} |
293 |
< |
assertEquals(SIZE, q.size()); |
286 |
> |
public void testPut() { |
287 |
> |
DelayQueue q = new DelayQueue(); |
288 |
> |
for (int i = 0; i < SIZE; ++i) { |
289 |
> |
PDelay x = new PDelay(i); |
290 |
> |
q.put(x); |
291 |
> |
assertTrue(q.contains(x)); |
292 |
> |
} |
293 |
> |
assertEquals(SIZE, q.size()); |
294 |
|
} |
295 |
|
|
296 |
|
/** |
298 |
|
*/ |
299 |
|
public void testPutWithTake() throws InterruptedException { |
300 |
|
final DelayQueue q = new DelayQueue(); |
301 |
< |
Thread t = new Thread(new CheckedRunnable() { |
301 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
302 |
|
public void realRun() { |
303 |
|
q.put(new PDelay(0)); |
304 |
|
q.put(new PDelay(0)); |
306 |
|
q.put(new PDelay(0)); |
307 |
|
}}); |
308 |
|
|
309 |
< |
t.start(); |
310 |
< |
Thread.sleep(SHORT_DELAY_MS); |
357 |
< |
q.take(); |
358 |
< |
t.interrupt(); |
359 |
< |
t.join(); |
309 |
> |
awaitTermination(t); |
310 |
> |
assertEquals(4, q.size()); |
311 |
|
} |
312 |
|
|
313 |
|
/** |
315 |
|
*/ |
316 |
|
public void testTimedOffer() throws InterruptedException { |
317 |
|
final DelayQueue q = new DelayQueue(); |
318 |
< |
Thread t = new Thread(new CheckedRunnable() { |
318 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
319 |
|
public void realRun() throws InterruptedException { |
320 |
|
q.put(new PDelay(0)); |
321 |
|
q.put(new PDelay(0)); |
323 |
|
assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
324 |
|
}}); |
325 |
|
|
326 |
< |
t.start(); |
376 |
< |
Thread.sleep(SMALL_DELAY_MS); |
377 |
< |
t.interrupt(); |
378 |
< |
t.join(); |
326 |
> |
awaitTermination(t); |
327 |
|
} |
328 |
|
|
329 |
|
/** |
332 |
|
public void testTake() throws InterruptedException { |
333 |
|
DelayQueue q = populatedQueue(SIZE); |
334 |
|
for (int i = 0; i < SIZE; ++i) { |
335 |
< |
assertEquals(new PDelay(i), ((PDelay)q.take())); |
335 |
> |
assertEquals(new PDelay(i), q.take()); |
336 |
|
} |
337 |
|
} |
338 |
|
|
339 |
|
/** |
392 |
– |
* take blocks interruptibly when empty |
393 |
– |
*/ |
394 |
– |
public void testTakeFromEmpty() throws InterruptedException { |
395 |
– |
final DelayQueue q = new DelayQueue(); |
396 |
– |
Thread t = new ThreadShouldThrow(InterruptedException.class) { |
397 |
– |
public void realRun() throws InterruptedException { |
398 |
– |
q.take(); |
399 |
– |
}}; |
400 |
– |
|
401 |
– |
t.start(); |
402 |
– |
Thread.sleep(SHORT_DELAY_MS); |
403 |
– |
t.interrupt(); |
404 |
– |
t.join(); |
405 |
– |
} |
406 |
– |
|
407 |
– |
/** |
340 |
|
* Take removes existing elements until empty, then blocks interruptibly |
341 |
|
*/ |
342 |
|
public void testBlockingTake() throws InterruptedException { |
343 |
|
final DelayQueue q = populatedQueue(SIZE); |
344 |
< |
Thread t = new Thread(new CheckedRunnable() { |
344 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
345 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
346 |
|
public void realRun() throws InterruptedException { |
347 |
|
for (int i = 0; i < SIZE; ++i) { |
348 |
|
assertEquals(new PDelay(i), ((PDelay)q.take())); |
349 |
|
} |
350 |
+ |
|
351 |
+ |
Thread.currentThread().interrupt(); |
352 |
+ |
try { |
353 |
+ |
q.take(); |
354 |
+ |
shouldThrow(); |
355 |
+ |
} catch (InterruptedException success) {} |
356 |
+ |
assertFalse(Thread.interrupted()); |
357 |
+ |
|
358 |
+ |
pleaseInterrupt.countDown(); |
359 |
|
try { |
360 |
|
q.take(); |
361 |
|
shouldThrow(); |
362 |
|
} catch (InterruptedException success) {} |
363 |
+ |
assertFalse(Thread.interrupted()); |
364 |
|
}}); |
365 |
|
|
366 |
< |
t.start(); |
367 |
< |
Thread.sleep(SHORT_DELAY_MS); |
366 |
> |
await(pleaseInterrupt); |
367 |
> |
assertThreadStaysAlive(t); |
368 |
|
t.interrupt(); |
369 |
< |
t.join(); |
369 |
> |
awaitTermination(t); |
370 |
|
} |
371 |
|
|
429 |
– |
|
372 |
|
/** |
373 |
|
* poll succeeds unless empty |
374 |
|
*/ |
375 |
|
public void testPoll() { |
376 |
|
DelayQueue q = populatedQueue(SIZE); |
377 |
|
for (int i = 0; i < SIZE; ++i) { |
378 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
378 |
> |
assertEquals(new PDelay(i), q.poll()); |
379 |
|
} |
380 |
|
assertNull(q.poll()); |
381 |
|
} |
382 |
|
|
383 |
|
/** |
384 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
384 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
385 |
|
*/ |
386 |
|
public void testTimedPoll0() throws InterruptedException { |
387 |
|
DelayQueue q = populatedQueue(SIZE); |
388 |
|
for (int i = 0; i < SIZE; ++i) { |
389 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS))); |
389 |
> |
assertEquals(new PDelay(i), q.poll(0, MILLISECONDS)); |
390 |
|
} |
391 |
|
assertNull(q.poll(0, MILLISECONDS)); |
392 |
|
} |
393 |
|
|
394 |
|
/** |
395 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
395 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
396 |
|
*/ |
397 |
|
public void testTimedPoll() throws InterruptedException { |
398 |
|
DelayQueue q = populatedQueue(SIZE); |
399 |
|
for (int i = 0; i < SIZE; ++i) { |
400 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
401 |
< |
} |
402 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
400 |
> |
long startTime = System.nanoTime(); |
401 |
> |
assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS)); |
402 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
403 |
> |
} |
404 |
> |
long startTime = System.nanoTime(); |
405 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
406 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
407 |
> |
checkEmpty(q); |
408 |
|
} |
409 |
|
|
410 |
|
/** |
412 |
|
* returning timeout status |
413 |
|
*/ |
414 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
415 |
< |
Thread t = new Thread(new CheckedRunnable() { |
415 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
416 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
417 |
|
public void realRun() throws InterruptedException { |
418 |
|
DelayQueue q = populatedQueue(SIZE); |
419 |
|
for (int i = 0; i < SIZE; ++i) { |
420 |
|
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS))); |
421 |
|
} |
422 |
+ |
|
423 |
+ |
Thread.currentThread().interrupt(); |
424 |
|
try { |
425 |
< |
q.poll(SMALL_DELAY_MS, MILLISECONDS); |
425 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
426 |
|
shouldThrow(); |
427 |
|
} catch (InterruptedException success) {} |
428 |
< |
}}); |
479 |
< |
|
480 |
< |
t.start(); |
481 |
< |
Thread.sleep(SHORT_DELAY_MS); |
482 |
< |
t.interrupt(); |
483 |
< |
t.join(); |
484 |
< |
} |
428 |
> |
assertFalse(Thread.interrupted()); |
429 |
|
|
430 |
< |
/** |
487 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
488 |
< |
* on interruption throws |
489 |
< |
*/ |
490 |
< |
public void testTimedPollWithOffer() throws InterruptedException { |
491 |
< |
final DelayQueue q = new DelayQueue(); |
492 |
< |
final PDelay pdelay = new PDelay(0); |
493 |
< |
Thread t = new Thread(new CheckedRunnable() { |
494 |
< |
public void realRun() throws InterruptedException { |
495 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
496 |
< |
assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS)); |
430 |
> |
pleaseInterrupt.countDown(); |
431 |
|
try { |
432 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
433 |
|
shouldThrow(); |
434 |
|
} catch (InterruptedException success) {} |
435 |
+ |
assertFalse(Thread.interrupted()); |
436 |
|
}}); |
437 |
|
|
438 |
< |
t.start(); |
439 |
< |
Thread.sleep(SMALL_DELAY_MS); |
505 |
< |
assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS)); |
438 |
> |
await(pleaseInterrupt); |
439 |
> |
assertThreadStaysAlive(t); |
440 |
|
t.interrupt(); |
441 |
< |
t.join(); |
441 |
> |
awaitTermination(t); |
442 |
|
} |
443 |
|
|
510 |
– |
|
444 |
|
/** |
445 |
|
* peek returns next element, or null if empty |
446 |
|
*/ |
447 |
|
public void testPeek() { |
448 |
|
DelayQueue q = populatedQueue(SIZE); |
449 |
|
for (int i = 0; i < SIZE; ++i) { |
450 |
< |
assertEquals(new PDelay(i), ((PDelay)q.peek())); |
451 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
450 |
> |
assertEquals(new PDelay(i), q.peek()); |
451 |
> |
assertEquals(new PDelay(i), q.poll()); |
452 |
|
if (q.isEmpty()) |
453 |
|
assertNull(q.peek()); |
454 |
|
else |
463 |
|
public void testElement() { |
464 |
|
DelayQueue q = populatedQueue(SIZE); |
465 |
|
for (int i = 0; i < SIZE; ++i) { |
466 |
< |
assertEquals(new PDelay(i), ((PDelay)q.element())); |
466 |
> |
assertEquals(new PDelay(i), q.element()); |
467 |
|
q.poll(); |
468 |
|
} |
469 |
|
try { |
478 |
|
public void testRemove() { |
479 |
|
DelayQueue q = populatedQueue(SIZE); |
480 |
|
for (int i = 0; i < SIZE; ++i) { |
481 |
< |
assertEquals(new PDelay(i), ((PDelay)q.remove())); |
481 |
> |
assertEquals(new PDelay(i), q.remove()); |
482 |
|
} |
483 |
|
try { |
484 |
|
q.remove(); |
487 |
|
} |
488 |
|
|
489 |
|
/** |
557 |
– |
* remove(x) removes x and returns true if present |
558 |
– |
*/ |
559 |
– |
public void testRemoveElement() { |
560 |
– |
DelayQueue q = populatedQueue(SIZE); |
561 |
– |
for (int i = 1; i < SIZE; i+=2) { |
562 |
– |
assertTrue(q.remove(new PDelay(i))); |
563 |
– |
} |
564 |
– |
for (int i = 0; i < SIZE; i+=2) { |
565 |
– |
assertTrue(q.remove(new PDelay(i))); |
566 |
– |
assertFalse(q.remove(new PDelay(i+1))); |
567 |
– |
} |
568 |
– |
assertTrue(q.isEmpty()); |
569 |
– |
} |
570 |
– |
|
571 |
– |
/** |
490 |
|
* contains(x) reports true when elements added but not yet removed |
491 |
|
*/ |
492 |
|
public void testContains() { |
506 |
|
q.clear(); |
507 |
|
assertTrue(q.isEmpty()); |
508 |
|
assertEquals(0, q.size()); |
509 |
< |
assertEquals(NOCAP, q.remainingCapacity()); |
509 |
> |
assertEquals(Integer.MAX_VALUE, q.remainingCapacity()); |
510 |
|
PDelay x = new PDelay(1); |
511 |
|
q.add(x); |
512 |
|
assertFalse(q.isEmpty()); |
558 |
|
assertTrue(q.removeAll(p)); |
559 |
|
assertEquals(SIZE-i, q.size()); |
560 |
|
for (int j = 0; j < i; ++j) { |
561 |
< |
PDelay I = (PDelay)(p.remove()); |
562 |
< |
assertFalse(q.contains(I)); |
561 |
> |
PDelay x = (PDelay)(p.remove()); |
562 |
> |
assertFalse(q.contains(x)); |
563 |
|
} |
564 |
|
} |
565 |
|
} |
572 |
|
Object[] o = q.toArray(); |
573 |
|
Arrays.sort(o); |
574 |
|
for (int i = 0; i < o.length; i++) |
575 |
< |
assertEquals(o[i], q.take()); |
575 |
> |
assertSame(o[i], q.take()); |
576 |
|
} |
577 |
|
|
578 |
|
/** |
579 |
|
* toArray(a) contains all elements |
580 |
|
*/ |
581 |
< |
public void testToArray2() throws InterruptedException { |
582 |
< |
DelayQueue q = populatedQueue(SIZE); |
581 |
> |
public void testToArray2() { |
582 |
> |
DelayQueue<PDelay> q = populatedQueue(SIZE); |
583 |
|
PDelay[] ints = new PDelay[SIZE]; |
584 |
< |
ints = (PDelay[])q.toArray(ints); |
584 |
> |
PDelay[] array = q.toArray(ints); |
585 |
> |
assertSame(ints, array); |
586 |
|
Arrays.sort(ints); |
587 |
|
for (int i = 0; i < ints.length; i++) |
588 |
< |
assertEquals(ints[i], q.take()); |
588 |
> |
assertSame(ints[i], q.remove()); |
589 |
|
} |
590 |
|
|
672 |
– |
|
591 |
|
/** |
592 |
< |
* toArray(null) throws NPE |
675 |
< |
*/ |
676 |
< |
public void testToArray_BadArg() { |
677 |
< |
DelayQueue q = populatedQueue(SIZE); |
678 |
< |
try { |
679 |
< |
Object o[] = q.toArray(null); |
680 |
< |
shouldThrow(); |
681 |
< |
} catch (NullPointerException success) {} |
682 |
< |
} |
683 |
< |
|
684 |
< |
/** |
685 |
< |
* toArray with incompatible array type throws CCE |
592 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
593 |
|
*/ |
594 |
|
public void testToArray1_BadArg() { |
595 |
|
DelayQueue q = populatedQueue(SIZE); |
596 |
|
try { |
597 |
< |
Object o[] = q.toArray(new String[10]); |
597 |
> |
q.toArray(new String[10]); |
598 |
|
shouldThrow(); |
599 |
|
} catch (ArrayStoreException success) {} |
600 |
|
} |
611 |
|
++i; |
612 |
|
} |
613 |
|
assertEquals(i, SIZE); |
614 |
+ |
assertIteratorExhausted(it); |
615 |
+ |
} |
616 |
+ |
|
617 |
+ |
/** |
618 |
+ |
* iterator of empty collection has no elements |
619 |
+ |
*/ |
620 |
+ |
public void testEmptyIterator() { |
621 |
+ |
assertIteratorExhausted(new DelayQueue().iterator()); |
622 |
|
} |
623 |
|
|
624 |
|
/** |
633 |
|
it.next(); |
634 |
|
it.remove(); |
635 |
|
it = q.iterator(); |
636 |
< |
assertEquals(it.next(), new PDelay(2)); |
637 |
< |
assertEquals(it.next(), new PDelay(3)); |
636 |
> |
assertEquals(new PDelay(2), it.next()); |
637 |
> |
assertEquals(new PDelay(3), it.next()); |
638 |
|
assertFalse(it.hasNext()); |
639 |
|
} |
640 |
|
|
726 |
– |
|
641 |
|
/** |
642 |
|
* toString contains toStrings of elements |
643 |
|
*/ |
644 |
|
public void testToString() { |
645 |
|
DelayQueue q = populatedQueue(SIZE); |
646 |
|
String s = q.toString(); |
647 |
< |
for (int i = 0; i < SIZE; ++i) { |
648 |
< |
assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0); |
735 |
< |
} |
647 |
> |
for (Object e : q) |
648 |
> |
assertTrue(s.contains(e.toString())); |
649 |
|
} |
650 |
|
|
651 |
|
/** |
652 |
< |
* offer transfers elements across Executor tasks |
652 |
> |
* timed poll transfers elements across Executor tasks |
653 |
|
*/ |
654 |
|
public void testPollInExecutor() { |
655 |
|
final DelayQueue q = new DelayQueue(); |
656 |
+ |
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
657 |
|
ExecutorService executor = Executors.newFixedThreadPool(2); |
658 |
|
executor.execute(new CheckedRunnable() { |
659 |
|
public void realRun() throws InterruptedException { |
660 |
|
assertNull(q.poll()); |
661 |
< |
assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS)); |
662 |
< |
assertTrue(q.isEmpty()); |
661 |
> |
threadsStarted.await(); |
662 |
> |
assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS)); |
663 |
> |
checkEmpty(q); |
664 |
|
}}); |
665 |
|
|
666 |
|
executor.execute(new CheckedRunnable() { |
667 |
|
public void realRun() throws InterruptedException { |
668 |
< |
Thread.sleep(SHORT_DELAY_MS); |
668 |
> |
threadsStarted.await(); |
669 |
|
q.put(new PDelay(1)); |
670 |
|
}}); |
671 |
|
|
672 |
|
joinPool(executor); |
673 |
|
} |
674 |
|
|
760 |
– |
|
675 |
|
/** |
676 |
|
* Delayed actions do not occur until their delay elapses |
677 |
|
*/ |
678 |
|
public void testDelay() throws InterruptedException { |
679 |
< |
DelayQueue q = new DelayQueue(); |
680 |
< |
NanoDelay[] elements = new NanoDelay[SIZE]; |
681 |
< |
for (int i = 0; i < SIZE; ++i) { |
768 |
< |
elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i)); |
769 |
< |
} |
770 |
< |
for (int i = 0; i < SIZE; ++i) { |
771 |
< |
q.add(elements[i]); |
772 |
< |
} |
679 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
680 |
> |
for (int i = 0; i < SIZE; ++i) |
681 |
> |
q.add(new NanoDelay(1000000L * (SIZE - i))); |
682 |
|
|
683 |
|
long last = 0; |
684 |
|
for (int i = 0; i < SIZE; ++i) { |
685 |
< |
NanoDelay e = (NanoDelay)(q.take()); |
685 |
> |
NanoDelay e = q.take(); |
686 |
|
long tt = e.getTriggerTime(); |
687 |
< |
assertTrue(tt <= System.nanoTime()); |
687 |
> |
assertTrue(System.nanoTime() - tt >= 0); |
688 |
|
if (i != 0) |
689 |
|
assertTrue(tt >= last); |
690 |
|
last = tt; |
691 |
|
} |
692 |
+ |
assertTrue(q.isEmpty()); |
693 |
|
} |
694 |
|
|
695 |
|
/** |
698 |
|
public void testPeekDelayed() { |
699 |
|
DelayQueue q = new DelayQueue(); |
700 |
|
q.add(new NanoDelay(Long.MAX_VALUE)); |
701 |
< |
assert(q.peek() != null); |
701 |
> |
assertNotNull(q.peek()); |
702 |
|
} |
703 |
|
|
794 |
– |
|
704 |
|
/** |
705 |
|
* poll of a non-empty queue returns null if no expired elements. |
706 |
|
*/ |
716 |
|
public void testTimedPollDelayed() throws InterruptedException { |
717 |
|
DelayQueue q = new DelayQueue(); |
718 |
|
q.add(new NanoDelay(LONG_DELAY_MS * 1000000L)); |
719 |
< |
assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS)); |
811 |
< |
} |
812 |
< |
|
813 |
< |
/** |
814 |
< |
* drainTo(null) throws NPE |
815 |
< |
*/ |
816 |
< |
public void testDrainToNull() { |
817 |
< |
DelayQueue q = populatedQueue(SIZE); |
818 |
< |
try { |
819 |
< |
q.drainTo(null); |
820 |
< |
shouldThrow(); |
821 |
< |
} catch (NullPointerException success) {} |
822 |
< |
} |
823 |
< |
|
824 |
< |
/** |
825 |
< |
* drainTo(this) throws IAE |
826 |
< |
*/ |
827 |
< |
public void testDrainToSelf() { |
828 |
< |
DelayQueue q = populatedQueue(SIZE); |
829 |
< |
try { |
830 |
< |
q.drainTo(q); |
831 |
< |
shouldThrow(); |
832 |
< |
} catch (IllegalArgumentException success) {} |
719 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
720 |
|
} |
721 |
|
|
722 |
|
/** |
731 |
|
} |
732 |
|
ArrayList l = new ArrayList(); |
733 |
|
q.drainTo(l); |
734 |
< |
assertEquals(q.size(), 0); |
734 |
> |
assertEquals(0, q.size()); |
735 |
|
for (int i = 0; i < SIZE; ++i) |
736 |
< |
assertEquals(l.get(i), elems[i]); |
736 |
> |
assertEquals(elems[i], l.get(i)); |
737 |
|
q.add(elems[0]); |
738 |
|
q.add(elems[1]); |
739 |
|
assertFalse(q.isEmpty()); |
741 |
|
assertTrue(q.contains(elems[1])); |
742 |
|
l.clear(); |
743 |
|
q.drainTo(l); |
744 |
< |
assertEquals(q.size(), 0); |
745 |
< |
assertEquals(l.size(), 2); |
744 |
> |
assertEquals(0, q.size()); |
745 |
> |
assertEquals(2, l.size()); |
746 |
|
for (int i = 0; i < 2; ++i) |
747 |
< |
assertEquals(l.get(i), elems[i]); |
747 |
> |
assertEquals(elems[i], l.get(i)); |
748 |
|
} |
749 |
|
|
750 |
|
/** |
766 |
|
} |
767 |
|
|
768 |
|
/** |
769 |
< |
* drainTo(null, n) throws NPE |
883 |
< |
*/ |
884 |
< |
public void testDrainToNullN() { |
885 |
< |
DelayQueue q = populatedQueue(SIZE); |
886 |
< |
try { |
887 |
< |
q.drainTo(null, 0); |
888 |
< |
shouldThrow(); |
889 |
< |
} catch (NullPointerException success) {} |
890 |
< |
} |
891 |
< |
|
892 |
< |
/** |
893 |
< |
* drainTo(this, n) throws IAE |
894 |
< |
*/ |
895 |
< |
public void testDrainToSelfN() { |
896 |
< |
DelayQueue q = populatedQueue(SIZE); |
897 |
< |
try { |
898 |
< |
q.drainTo(q, 0); |
899 |
< |
shouldThrow(); |
900 |
< |
} catch (IllegalArgumentException success) {} |
901 |
< |
} |
902 |
< |
|
903 |
< |
/** |
904 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
769 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
770 |
|
*/ |
771 |
|
public void testDrainToN() { |
772 |
|
for (int i = 0; i < SIZE + 2; ++i) { |
773 |
|
DelayQueue q = populatedQueue(SIZE); |
774 |
|
ArrayList l = new ArrayList(); |
775 |
|
q.drainTo(l, i); |
776 |
< |
int k = (i < SIZE)? i : SIZE; |
777 |
< |
assertEquals(q.size(), SIZE-k); |
778 |
< |
assertEquals(l.size(), k); |
776 |
> |
int k = (i < SIZE) ? i : SIZE; |
777 |
> |
assertEquals(SIZE-k, q.size()); |
778 |
> |
assertEquals(k, l.size()); |
779 |
|
} |
780 |
|
} |
781 |
|
|
782 |
< |
|
782 |
> |
/** |
783 |
> |
* remove(null), contains(null) always return false |
784 |
> |
*/ |
785 |
> |
public void testNeverContainsNull() { |
786 |
> |
Collection<?> q = populatedQueue(SIZE); |
787 |
> |
assertFalse(q.contains(null)); |
788 |
> |
assertFalse(q.remove(null)); |
789 |
> |
} |
790 |
|
} |