1 |
|
/* |
2 |
< |
* Written by members of JCP JSR-166 Expert Group and released to the |
3 |
< |
* public domain. Use, modify, and redistribute this code in any way |
4 |
< |
* without acknowledgement. Other contributors include Andrew Wright, |
5 |
< |
* Jeffrey Hayes, Pat Fischer, Mike Judd. |
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/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.*; |
11 |
< |
import java.util.concurrent.*; |
10 |
> |
import java.util.Arrays; |
11 |
> |
import java.util.ArrayList; |
12 |
> |
import java.util.Iterator; |
13 |
> |
import java.util.NoSuchElementException; |
14 |
> |
import java.util.concurrent.BlockingQueue; |
15 |
> |
import java.util.concurrent.CountDownLatch; |
16 |
> |
import java.util.concurrent.Delayed; |
17 |
> |
import java.util.concurrent.DelayQueue; |
18 |
> |
import java.util.concurrent.Executors; |
19 |
> |
import java.util.concurrent.ExecutorService; |
20 |
> |
import java.util.concurrent.TimeUnit; |
21 |
> |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
22 |
|
|
23 |
|
public class DelayQueueTest extends JSR166TestCase { |
24 |
+ |
|
25 |
+ |
public static class Generic extends BlockingQueueTest { |
26 |
+ |
protected BlockingQueue emptyCollection() { |
27 |
+ |
return new DelayQueue(); |
28 |
+ |
} |
29 |
+ |
protected PDelay makeElement(int i) { |
30 |
+ |
return new PDelay(i); |
31 |
+ |
} |
32 |
+ |
} |
33 |
+ |
|
34 |
|
public static void main(String[] args) { |
35 |
< |
junit.textui.TestRunner.run (suite()); |
35 |
> |
junit.textui.TestRunner.run(suite()); |
36 |
|
} |
37 |
|
|
38 |
|
public static Test suite() { |
39 |
< |
return new TestSuite(DelayQueueTest.class); |
39 |
> |
return newTestSuite(DelayQueueTest.class, |
40 |
> |
new Generic().testSuite()); |
41 |
|
} |
42 |
|
|
43 |
|
private static final int NOCAP = Integer.MAX_VALUE; |
44 |
|
|
45 |
|
/** |
46 |
< |
* A delayed implmentation for testing. |
47 |
< |
* Most tests use Pseudodelays, where delays are all elapsed |
46 |
> |
* A delayed implementation for testing. |
47 |
> |
* Most tests use Pseudodelays, where delays are all elapsed |
48 |
|
* (so, no blocking solely for delays) but are still ordered |
49 |
< |
*/ |
50 |
< |
static class PDelay implements Delayed { |
49 |
> |
*/ |
50 |
> |
static class PDelay implements Delayed { |
51 |
|
int pseudodelay; |
52 |
< |
PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; } |
53 |
< |
public int compareTo(Object y) { |
54 |
< |
int i = pseudodelay; |
55 |
< |
int j = ((PDelay)y).pseudodelay; |
56 |
< |
if (i < j) return -1; |
35 |
< |
if (i > j) return 1; |
36 |
< |
return 0; |
52 |
> |
PDelay(int i) { pseudodelay = i; } |
53 |
> |
public int compareTo(PDelay other) { |
54 |
> |
int a = this.pseudodelay; |
55 |
> |
int b = other.pseudodelay; |
56 |
> |
return (a < b) ? -1 : (a > b) ? 1 : 0; |
57 |
|
} |
58 |
< |
|
59 |
< |
public int compareTo(PDelay y) { |
40 |
< |
int i = pseudodelay; |
41 |
< |
int j = ((PDelay)y).pseudodelay; |
42 |
< |
if (i < j) return -1; |
43 |
< |
if (i > j) return 1; |
44 |
< |
return 0; |
58 |
> |
public int compareTo(Delayed y) { |
59 |
> |
return compareTo((PDelay)y); |
60 |
|
} |
46 |
– |
|
61 |
|
public boolean equals(Object other) { |
62 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
63 |
< |
} |
50 |
< |
public boolean equals(PDelay other) { |
51 |
< |
return ((PDelay)other).pseudodelay == pseudodelay; |
62 |
> |
return (other instanceof PDelay) && |
63 |
> |
this.pseudodelay == ((PDelay)other).pseudodelay; |
64 |
|
} |
65 |
< |
|
66 |
< |
|
65 |
> |
// suppress [overrides] javac warning |
66 |
> |
public int hashCode() { return pseudodelay; } |
67 |
|
public long getDelay(TimeUnit ignore) { |
68 |
< |
return pseudodelay; |
68 |
> |
return Integer.MIN_VALUE + pseudodelay; |
69 |
|
} |
58 |
– |
public int intValue() { |
59 |
– |
return pseudodelay; |
60 |
– |
} |
61 |
– |
|
70 |
|
public String toString() { |
71 |
|
return String.valueOf(pseudodelay); |
72 |
|
} |
73 |
|
} |
74 |
|
|
67 |
– |
|
75 |
|
/** |
76 |
|
* Delayed implementation that actually delays |
77 |
|
*/ |
78 |
< |
static class NanoDelay implements Delayed { |
78 |
> |
static class NanoDelay implements Delayed { |
79 |
|
long trigger; |
80 |
< |
NanoDelay(long i) { |
80 |
> |
NanoDelay(long i) { |
81 |
|
trigger = System.nanoTime() + i; |
82 |
|
} |
83 |
< |
public int compareTo(Object y) { |
83 |
> |
public int compareTo(NanoDelay y) { |
84 |
|
long i = trigger; |
85 |
< |
long j = ((NanoDelay)y).trigger; |
85 |
> |
long j = y.trigger; |
86 |
|
if (i < j) return -1; |
87 |
|
if (i > j) return 1; |
88 |
|
return 0; |
89 |
|
} |
90 |
|
|
91 |
< |
public int compareTo(NanoDelay y) { |
92 |
< |
long i = trigger; |
86 |
< |
long j = ((NanoDelay)y).trigger; |
87 |
< |
if (i < j) return -1; |
88 |
< |
if (i > j) return 1; |
89 |
< |
return 0; |
91 |
> |
public int compareTo(Delayed y) { |
92 |
> |
return compareTo((NanoDelay)y); |
93 |
|
} |
94 |
|
|
95 |
|
public boolean equals(Object other) { |
96 |
< |
return ((NanoDelay)other).trigger == trigger; |
96 |
> |
return equals((NanoDelay)other); |
97 |
|
} |
98 |
|
public boolean equals(NanoDelay other) { |
99 |
< |
return ((NanoDelay)other).trigger == trigger; |
99 |
> |
return other.trigger == trigger; |
100 |
|
} |
101 |
|
|
102 |
+ |
// suppress [overrides] javac warning |
103 |
+ |
public int hashCode() { return (int) trigger; } |
104 |
+ |
|
105 |
|
public long getDelay(TimeUnit unit) { |
106 |
|
long n = trigger - System.nanoTime(); |
107 |
|
return unit.convert(n, TimeUnit.NANOSECONDS); |
116 |
|
} |
117 |
|
} |
118 |
|
|
113 |
– |
|
119 |
|
/** |
120 |
< |
* Create a queue of given size containing consecutive |
120 |
> |
* Returns a new queue of given size containing consecutive |
121 |
|
* PDelays 0 ... n. |
122 |
|
*/ |
123 |
< |
private DelayQueue populatedQueue(int n) { |
124 |
< |
DelayQueue q = new DelayQueue(); |
123 |
> |
private DelayQueue<PDelay> populatedQueue(int n) { |
124 |
> |
DelayQueue<PDelay> q = new DelayQueue<PDelay>(); |
125 |
|
assertTrue(q.isEmpty()); |
126 |
< |
for(int i = n-1; i >= 0; i-=2) |
127 |
< |
assertTrue(q.offer(new PDelay(i))); |
128 |
< |
for(int i = (n & 1); i < n; i+=2) |
129 |
< |
assertTrue(q.offer(new PDelay(i))); |
126 |
> |
for (int i = n-1; i >= 0; i-=2) |
127 |
> |
assertTrue(q.offer(new PDelay(i))); |
128 |
> |
for (int i = (n & 1); i < n; i+=2) |
129 |
> |
assertTrue(q.offer(new PDelay(i))); |
130 |
|
assertFalse(q.isEmpty()); |
131 |
|
assertEquals(NOCAP, q.remainingCapacity()); |
132 |
< |
assertEquals(n, q.size()); |
132 |
> |
assertEquals(n, q.size()); |
133 |
|
return q; |
134 |
|
} |
135 |
< |
|
135 |
> |
|
136 |
|
/** |
137 |
|
* A new queue has unbounded capacity |
138 |
|
*/ |
147 |
|
try { |
148 |
|
DelayQueue q = new DelayQueue(null); |
149 |
|
shouldThrow(); |
150 |
< |
} |
146 |
< |
catch (NullPointerException success) {} |
150 |
> |
} catch (NullPointerException success) {} |
151 |
|
} |
152 |
|
|
153 |
|
/** |
158 |
|
PDelay[] ints = new PDelay[SIZE]; |
159 |
|
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
160 |
|
shouldThrow(); |
161 |
< |
} |
158 |
< |
catch (NullPointerException success) {} |
161 |
> |
} catch (NullPointerException success) {} |
162 |
|
} |
163 |
|
|
164 |
|
/** |
171 |
|
ints[i] = new PDelay(i); |
172 |
|
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
173 |
|
shouldThrow(); |
174 |
< |
} |
172 |
< |
catch (NullPointerException success) {} |
174 |
> |
} catch (NullPointerException success) {} |
175 |
|
} |
176 |
|
|
177 |
|
/** |
178 |
|
* Queue contains all elements of collection used to initialize |
179 |
|
*/ |
180 |
|
public void testConstructor6() { |
181 |
< |
try { |
182 |
< |
PDelay[] ints = new PDelay[SIZE]; |
183 |
< |
for (int i = 0; i < SIZE; ++i) |
184 |
< |
ints[i] = new PDelay(i); |
185 |
< |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
186 |
< |
for (int i = 0; i < SIZE; ++i) |
185 |
< |
assertEquals(ints[i], q.poll()); |
186 |
< |
} |
187 |
< |
finally {} |
181 |
> |
PDelay[] ints = new PDelay[SIZE]; |
182 |
> |
for (int i = 0; i < SIZE; ++i) |
183 |
> |
ints[i] = new PDelay(i); |
184 |
> |
DelayQueue q = new DelayQueue(Arrays.asList(ints)); |
185 |
> |
for (int i = 0; i < SIZE; ++i) |
186 |
> |
assertEquals(ints[i], q.poll()); |
187 |
|
} |
188 |
|
|
189 |
|
/** |
202 |
|
} |
203 |
|
|
204 |
|
/** |
205 |
< |
* remainingCapacity does not change when elementa added or removed, |
205 |
> |
* remainingCapacity does not change when elements added or removed, |
206 |
|
* but size does |
207 |
|
*/ |
208 |
|
public void testRemainingCapacity() { |
220 |
|
} |
221 |
|
|
222 |
|
/** |
224 |
– |
* offer(null) throws NPE |
225 |
– |
*/ |
226 |
– |
public void testOfferNull() { |
227 |
– |
try { |
228 |
– |
DelayQueue q = new DelayQueue(); |
229 |
– |
q.offer(null); |
230 |
– |
shouldThrow(); |
231 |
– |
} catch (NullPointerException success) { } |
232 |
– |
} |
233 |
– |
|
234 |
– |
/** |
235 |
– |
* add(null) throws NPE |
236 |
– |
*/ |
237 |
– |
public void testAddNull() { |
238 |
– |
try { |
239 |
– |
DelayQueue q = new DelayQueue(); |
240 |
– |
q.add(null); |
241 |
– |
shouldThrow(); |
242 |
– |
} catch (NullPointerException success) { } |
243 |
– |
} |
244 |
– |
|
245 |
– |
/** |
223 |
|
* offer non-null succeeds |
224 |
|
*/ |
225 |
|
public void testOffer() { |
240 |
|
} |
241 |
|
|
242 |
|
/** |
266 |
– |
* addAll(null) throws NPE |
267 |
– |
*/ |
268 |
– |
public void testAddAll1() { |
269 |
– |
try { |
270 |
– |
DelayQueue q = new DelayQueue(); |
271 |
– |
q.addAll(null); |
272 |
– |
shouldThrow(); |
273 |
– |
} |
274 |
– |
catch (NullPointerException success) {} |
275 |
– |
} |
276 |
– |
|
277 |
– |
|
278 |
– |
/** |
243 |
|
* addAll(this) throws IAE |
244 |
|
*/ |
245 |
|
public void testAddAllSelf() { |
247 |
|
DelayQueue q = populatedQueue(SIZE); |
248 |
|
q.addAll(q); |
249 |
|
shouldThrow(); |
250 |
< |
} |
287 |
< |
catch (IllegalArgumentException success) {} |
250 |
> |
} catch (IllegalArgumentException success) {} |
251 |
|
} |
252 |
|
|
253 |
|
/** |
291 |
– |
* addAll of a collection with null elements throws NPE |
292 |
– |
*/ |
293 |
– |
public void testAddAll2() { |
294 |
– |
try { |
295 |
– |
DelayQueue q = new DelayQueue(); |
296 |
– |
PDelay[] ints = new PDelay[SIZE]; |
297 |
– |
q.addAll(Arrays.asList(ints)); |
298 |
– |
shouldThrow(); |
299 |
– |
} |
300 |
– |
catch (NullPointerException success) {} |
301 |
– |
} |
302 |
– |
/** |
254 |
|
* addAll of a collection with any null elements throws NPE after |
255 |
|
* possibly adding some elements |
256 |
|
*/ |
262 |
|
ints[i] = new PDelay(i); |
263 |
|
q.addAll(Arrays.asList(ints)); |
264 |
|
shouldThrow(); |
265 |
< |
} |
315 |
< |
catch (NullPointerException success) {} |
265 |
> |
} catch (NullPointerException success) {} |
266 |
|
} |
267 |
|
|
268 |
|
/** |
269 |
|
* Queue contains all elements of successful addAll |
270 |
|
*/ |
271 |
|
public void testAddAll5() { |
272 |
< |
try { |
273 |
< |
PDelay[] empty = new PDelay[0]; |
274 |
< |
PDelay[] ints = new PDelay[SIZE]; |
275 |
< |
for (int i = SIZE-1; i >= 0; --i) |
276 |
< |
ints[i] = new PDelay(i); |
277 |
< |
DelayQueue q = new DelayQueue(); |
278 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
279 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
280 |
< |
for (int i = 0; i < SIZE; ++i) |
331 |
< |
assertEquals(ints[i], q.poll()); |
332 |
< |
} |
333 |
< |
finally {} |
272 |
> |
PDelay[] empty = new PDelay[0]; |
273 |
> |
PDelay[] ints = new PDelay[SIZE]; |
274 |
> |
for (int i = SIZE-1; i >= 0; --i) |
275 |
> |
ints[i] = new PDelay(i); |
276 |
> |
DelayQueue q = new DelayQueue(); |
277 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
278 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
279 |
> |
for (int i = 0; i < SIZE; ++i) |
280 |
> |
assertEquals(ints[i], q.poll()); |
281 |
|
} |
282 |
|
|
283 |
|
/** |
337 |
– |
* put(null) throws NPE |
338 |
– |
*/ |
339 |
– |
public void testPutNull() { |
340 |
– |
try { |
341 |
– |
DelayQueue q = new DelayQueue(); |
342 |
– |
q.put(null); |
343 |
– |
shouldThrow(); |
344 |
– |
} |
345 |
– |
catch (NullPointerException success){ |
346 |
– |
} |
347 |
– |
} |
348 |
– |
|
349 |
– |
/** |
284 |
|
* all elements successfully put are contained |
285 |
|
*/ |
286 |
< |
public void testPut() { |
287 |
< |
try { |
288 |
< |
DelayQueue q = new DelayQueue(); |
289 |
< |
for (int i = 0; i < SIZE; ++i) { |
290 |
< |
PDelay I = new PDelay(i); |
291 |
< |
q.put(I); |
358 |
< |
assertTrue(q.contains(I)); |
359 |
< |
} |
360 |
< |
assertEquals(SIZE, q.size()); |
361 |
< |
} |
362 |
< |
finally { |
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()); |
294 |
|
} |
295 |
|
|
296 |
|
/** |
297 |
|
* put doesn't block waiting for take |
298 |
|
*/ |
299 |
< |
public void testPutWithTake() { |
299 |
> |
public void testPutWithTake() throws InterruptedException { |
300 |
|
final DelayQueue q = new DelayQueue(); |
301 |
< |
Thread t = new Thread(new Runnable() { |
302 |
< |
public void run() { |
303 |
< |
int added = 0; |
304 |
< |
try { |
305 |
< |
q.put(new PDelay(0)); |
306 |
< |
++added; |
307 |
< |
q.put(new PDelay(0)); |
308 |
< |
++added; |
309 |
< |
q.put(new PDelay(0)); |
310 |
< |
++added; |
381 |
< |
q.put(new PDelay(0)); |
382 |
< |
++added; |
383 |
< |
threadAssertTrue(added == 4); |
384 |
< |
} finally { |
385 |
< |
} |
386 |
< |
} |
387 |
< |
}); |
388 |
< |
try { |
389 |
< |
t.start(); |
390 |
< |
Thread.sleep(SHORT_DELAY_MS); |
391 |
< |
q.take(); |
392 |
< |
t.interrupt(); |
393 |
< |
t.join(); |
394 |
< |
} catch (Exception e){ |
395 |
< |
unexpectedException(); |
396 |
< |
} |
301 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
302 |
> |
public void realRun() { |
303 |
> |
q.put(new PDelay(0)); |
304 |
> |
q.put(new PDelay(0)); |
305 |
> |
q.put(new PDelay(0)); |
306 |
> |
q.put(new PDelay(0)); |
307 |
> |
}}); |
308 |
> |
|
309 |
> |
awaitTermination(t); |
310 |
> |
assertEquals(4, q.size()); |
311 |
|
} |
312 |
|
|
313 |
|
/** |
314 |
|
* timed offer does not time out |
315 |
|
*/ |
316 |
< |
public void testTimedOffer() { |
316 |
> |
public void testTimedOffer() throws InterruptedException { |
317 |
|
final DelayQueue q = new DelayQueue(); |
318 |
< |
Thread t = new Thread(new Runnable() { |
319 |
< |
public void run() { |
320 |
< |
try { |
321 |
< |
q.put(new PDelay(0)); |
322 |
< |
q.put(new PDelay(0)); |
323 |
< |
threadAssertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
324 |
< |
threadAssertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS)); |
411 |
< |
} finally { } |
412 |
< |
} |
413 |
< |
}); |
414 |
< |
|
415 |
< |
try { |
416 |
< |
t.start(); |
417 |
< |
Thread.sleep(SMALL_DELAY_MS); |
418 |
< |
t.interrupt(); |
419 |
< |
t.join(); |
420 |
< |
} catch (Exception e){ |
421 |
< |
unexpectedException(); |
422 |
< |
} |
423 |
< |
} |
318 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
319 |
> |
public void realRun() throws InterruptedException { |
320 |
> |
q.put(new PDelay(0)); |
321 |
> |
q.put(new PDelay(0)); |
322 |
> |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, MILLISECONDS)); |
323 |
> |
assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS)); |
324 |
> |
}}); |
325 |
|
|
326 |
< |
/** |
426 |
< |
* take retrieves elements in priority order |
427 |
< |
*/ |
428 |
< |
public void testTake() { |
429 |
< |
try { |
430 |
< |
DelayQueue q = populatedQueue(SIZE); |
431 |
< |
for (int i = 0; i < SIZE; ++i) { |
432 |
< |
assertEquals(new PDelay(i), ((PDelay)q.take())); |
433 |
< |
} |
434 |
< |
} catch (InterruptedException e){ |
435 |
< |
unexpectedException(); |
436 |
< |
} |
326 |
> |
awaitTermination(t); |
327 |
|
} |
328 |
|
|
329 |
|
/** |
330 |
< |
* take blocks interruptibly when empty |
330 |
> |
* take retrieves elements in priority order |
331 |
|
*/ |
332 |
< |
public void testTakeFromEmpty() { |
333 |
< |
final DelayQueue q = new DelayQueue(); |
334 |
< |
Thread t = new Thread(new Runnable() { |
335 |
< |
public void run() { |
446 |
< |
try { |
447 |
< |
q.take(); |
448 |
< |
threadShouldThrow(); |
449 |
< |
} catch (InterruptedException success){ } |
450 |
< |
} |
451 |
< |
}); |
452 |
< |
try { |
453 |
< |
t.start(); |
454 |
< |
Thread.sleep(SHORT_DELAY_MS); |
455 |
< |
t.interrupt(); |
456 |
< |
t.join(); |
457 |
< |
} catch (Exception e){ |
458 |
< |
unexpectedException(); |
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())); |
336 |
|
} |
337 |
|
} |
338 |
|
|
339 |
|
/** |
340 |
|
* Take removes existing elements until empty, then blocks interruptibly |
341 |
|
*/ |
342 |
< |
public void testBlockingTake() { |
343 |
< |
Thread t = new Thread(new Runnable() { |
344 |
< |
public void run() { |
345 |
< |
try { |
346 |
< |
DelayQueue q = populatedQueue(SIZE); |
347 |
< |
for (int i = 0; i < SIZE; ++i) { |
348 |
< |
threadAssertEquals(new PDelay(i), ((PDelay)q.take())); |
349 |
< |
} |
473 |
< |
q.take(); |
474 |
< |
threadShouldThrow(); |
475 |
< |
} catch (InterruptedException success){ |
476 |
< |
} |
477 |
< |
}}); |
478 |
< |
t.start(); |
479 |
< |
try { |
480 |
< |
Thread.sleep(SHORT_DELAY_MS); |
481 |
< |
t.interrupt(); |
482 |
< |
t.join(); |
483 |
< |
} |
484 |
< |
catch (InterruptedException ie) { |
485 |
< |
unexpectedException(); |
486 |
< |
} |
487 |
< |
} |
342 |
> |
public void testBlockingTake() throws InterruptedException { |
343 |
> |
final DelayQueue q = populatedQueue(SIZE); |
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 |
+ |
await(pleaseInterrupt); |
367 |
+ |
assertThreadStaysAlive(t); |
368 |
+ |
t.interrupt(); |
369 |
+ |
awaitTermination(t); |
370 |
+ |
} |
371 |
|
|
372 |
|
/** |
373 |
|
* poll succeeds unless empty |
377 |
|
for (int i = 0; i < SIZE; ++i) { |
378 |
|
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
379 |
|
} |
380 |
< |
assertNull(q.poll()); |
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() { |
387 |
< |
try { |
388 |
< |
DelayQueue q = populatedQueue(SIZE); |
389 |
< |
for (int i = 0; i < SIZE; ++i) { |
390 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(0, TimeUnit.MILLISECONDS))); |
391 |
< |
} |
510 |
< |
assertNull(q.poll(0, TimeUnit.MILLISECONDS)); |
511 |
< |
} catch (InterruptedException e){ |
512 |
< |
unexpectedException(); |
513 |
< |
} |
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))); |
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() { |
398 |
< |
try { |
399 |
< |
DelayQueue q = populatedQueue(SIZE); |
400 |
< |
for (int i = 0; i < SIZE; ++i) { |
401 |
< |
assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS))); |
402 |
< |
} |
403 |
< |
assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
404 |
< |
} catch (InterruptedException e){ |
405 |
< |
unexpectedException(); |
406 |
< |
} |
397 |
> |
public void testTimedPoll() throws InterruptedException { |
398 |
> |
DelayQueue q = populatedQueue(SIZE); |
399 |
> |
for (int i = 0; i < SIZE; ++i) { |
400 |
> |
long startTime = System.nanoTime(); |
401 |
> |
assertEquals(new PDelay(i), ((PDelay)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 |
|
/** |
411 |
|
* Interrupted timed poll throws InterruptedException instead of |
412 |
|
* returning timeout status |
413 |
|
*/ |
414 |
< |
public void testInterruptedTimedPoll() { |
415 |
< |
Thread t = new Thread(new Runnable() { |
416 |
< |
public void run() { |
417 |
< |
try { |
418 |
< |
DelayQueue q = populatedQueue(SIZE); |
419 |
< |
for (int i = 0; i < SIZE; ++i) { |
420 |
< |
threadAssertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS))); |
542 |
< |
} |
543 |
< |
threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
544 |
< |
} catch (InterruptedException success){ |
545 |
< |
} |
546 |
< |
}}); |
547 |
< |
t.start(); |
548 |
< |
try { |
549 |
< |
Thread.sleep(SHORT_DELAY_MS); |
550 |
< |
t.interrupt(); |
551 |
< |
t.join(); |
552 |
< |
} |
553 |
< |
catch (InterruptedException ie) { |
554 |
< |
unexpectedException(); |
555 |
< |
} |
556 |
< |
} |
557 |
< |
|
558 |
< |
/** |
559 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
560 |
< |
* on interruption throws |
561 |
< |
*/ |
562 |
< |
public void testTimedPollWithOffer() { |
563 |
< |
final DelayQueue q = new DelayQueue(); |
564 |
< |
Thread t = new Thread(new Runnable() { |
565 |
< |
public void run() { |
566 |
< |
try { |
567 |
< |
threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
568 |
< |
q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); |
569 |
< |
q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); |
570 |
< |
threadFail("Should block"); |
571 |
< |
} catch (InterruptedException success) { } |
414 |
> |
public void testInterruptedTimedPoll() throws InterruptedException { |
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 |
|
} |
573 |
– |
}); |
574 |
– |
try { |
575 |
– |
t.start(); |
576 |
– |
Thread.sleep(SMALL_DELAY_MS); |
577 |
– |
assertTrue(q.offer(new PDelay(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
578 |
– |
t.interrupt(); |
579 |
– |
t.join(); |
580 |
– |
} catch (Exception e){ |
581 |
– |
unexpectedException(); |
582 |
– |
} |
583 |
– |
} |
422 |
|
|
423 |
+ |
Thread.currentThread().interrupt(); |
424 |
+ |
try { |
425 |
+ |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
426 |
+ |
shouldThrow(); |
427 |
+ |
} catch (InterruptedException success) {} |
428 |
+ |
assertFalse(Thread.interrupted()); |
429 |
+ |
|
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 |
+ |
await(pleaseInterrupt); |
439 |
+ |
assertThreadStaysAlive(t); |
440 |
+ |
t.interrupt(); |
441 |
+ |
awaitTermination(t); |
442 |
+ |
} |
443 |
|
|
444 |
|
/** |
445 |
|
* peek returns next element, or null if empty |
448 |
|
DelayQueue q = populatedQueue(SIZE); |
449 |
|
for (int i = 0; i < SIZE; ++i) { |
450 |
|
assertEquals(new PDelay(i), ((PDelay)q.peek())); |
451 |
< |
q.poll(); |
452 |
< |
assertTrue(q.peek() == null || |
453 |
< |
i != ((PDelay)q.peek()).intValue()); |
451 |
> |
assertEquals(new PDelay(i), ((PDelay)q.poll())); |
452 |
> |
if (q.isEmpty()) |
453 |
> |
assertNull(q.peek()); |
454 |
> |
else |
455 |
> |
assertFalse(new PDelay(i).equals(q.peek())); |
456 |
|
} |
457 |
< |
assertNull(q.peek()); |
457 |
> |
assertNull(q.peek()); |
458 |
|
} |
459 |
|
|
460 |
|
/** |
469 |
|
try { |
470 |
|
q.element(); |
471 |
|
shouldThrow(); |
472 |
< |
} |
613 |
< |
catch (NoSuchElementException success) {} |
472 |
> |
} catch (NoSuchElementException success) {} |
473 |
|
} |
474 |
|
|
475 |
|
/** |
483 |
|
try { |
484 |
|
q.remove(); |
485 |
|
shouldThrow(); |
486 |
< |
} catch (NoSuchElementException success){ |
628 |
< |
} |
486 |
> |
} catch (NoSuchElementException success) {} |
487 |
|
} |
488 |
|
|
489 |
|
/** |
632 |
– |
* remove(x) removes x and returns true if present |
633 |
– |
*/ |
634 |
– |
public void testRemoveElement() { |
635 |
– |
DelayQueue q = populatedQueue(SIZE); |
636 |
– |
for (int i = 1; i < SIZE; i+=2) { |
637 |
– |
assertTrue(q.remove(new PDelay(i))); |
638 |
– |
} |
639 |
– |
for (int i = 0; i < SIZE; i+=2) { |
640 |
– |
assertTrue(q.remove(new PDelay(i))); |
641 |
– |
assertFalse(q.remove(new PDelay(i+1))); |
642 |
– |
} |
643 |
– |
assertTrue(q.isEmpty()); |
644 |
– |
} |
645 |
– |
|
646 |
– |
/** |
490 |
|
* contains(x) reports true when elements added but not yet removed |
491 |
|
*/ |
492 |
|
public void testContains() { |
507 |
|
assertTrue(q.isEmpty()); |
508 |
|
assertEquals(0, q.size()); |
509 |
|
assertEquals(NOCAP, q.remainingCapacity()); |
510 |
< |
q.add(new PDelay(1)); |
510 |
> |
PDelay x = new PDelay(1); |
511 |
> |
q.add(x); |
512 |
|
assertFalse(q.isEmpty()); |
513 |
+ |
assertTrue(q.contains(x)); |
514 |
|
q.clear(); |
515 |
|
assertTrue(q.isEmpty()); |
516 |
|
} |
567 |
|
/** |
568 |
|
* toArray contains all elements |
569 |
|
*/ |
570 |
< |
public void testToArray() { |
570 |
> |
public void testToArray() throws InterruptedException { |
571 |
|
DelayQueue q = populatedQueue(SIZE); |
572 |
< |
Object[] o = q.toArray(); |
572 |
> |
Object[] o = q.toArray(); |
573 |
|
Arrays.sort(o); |
574 |
< |
try { |
575 |
< |
for(int i = 0; i < o.length; i++) |
731 |
< |
assertEquals(o[i], q.take()); |
732 |
< |
} catch (InterruptedException e){ |
733 |
< |
unexpectedException(); |
734 |
< |
} |
574 |
> |
for (int i = 0; i < o.length; i++) |
575 |
> |
assertSame(o[i], q.take()); |
576 |
|
} |
577 |
|
|
578 |
|
/** |
579 |
|
* toArray(a) contains all elements |
580 |
|
*/ |
581 |
|
public void testToArray2() { |
582 |
< |
DelayQueue q = populatedQueue(SIZE); |
583 |
< |
PDelay[] ints = new PDelay[SIZE]; |
584 |
< |
ints = (PDelay[])q.toArray(ints); |
582 |
> |
DelayQueue<PDelay> q = populatedQueue(SIZE); |
583 |
> |
PDelay[] ints = new PDelay[SIZE]; |
584 |
> |
PDelay[] array = q.toArray(ints); |
585 |
> |
assertSame(ints, array); |
586 |
|
Arrays.sort(ints); |
587 |
< |
try { |
588 |
< |
for(int i = 0; i < ints.length; i++) |
747 |
< |
assertEquals(ints[i], q.take()); |
748 |
< |
} catch (InterruptedException e){ |
749 |
< |
unexpectedException(); |
750 |
< |
} |
587 |
> |
for (int i = 0; i < ints.length; i++) |
588 |
> |
assertSame(ints[i], q.remove()); |
589 |
|
} |
590 |
|
|
753 |
– |
|
591 |
|
/** |
592 |
< |
* toArray(null) throws NPE |
756 |
< |
*/ |
757 |
< |
public void testToArray_BadArg() { |
758 |
< |
try { |
759 |
< |
DelayQueue q = populatedQueue(SIZE); |
760 |
< |
Object o[] = q.toArray(null); |
761 |
< |
shouldThrow(); |
762 |
< |
} catch(NullPointerException success){} |
763 |
< |
} |
764 |
< |
|
765 |
< |
/** |
766 |
< |
* toArray with incompatable array type throws CCE |
592 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
593 |
|
*/ |
594 |
|
public void testToArray1_BadArg() { |
595 |
< |
try { |
596 |
< |
DelayQueue q = populatedQueue(SIZE); |
597 |
< |
Object o[] = q.toArray(new String[10] ); |
598 |
< |
shouldThrow(); |
599 |
< |
} catch(ArrayStoreException success){} |
595 |
> |
DelayQueue q = populatedQueue(SIZE); |
596 |
> |
try { |
597 |
> |
q.toArray(new String[10]); |
598 |
> |
shouldThrow(); |
599 |
> |
} catch (ArrayStoreException success) {} |
600 |
|
} |
601 |
< |
|
601 |
> |
|
602 |
|
/** |
603 |
|
* iterator iterates through all elements |
604 |
|
*/ |
605 |
|
public void testIterator() { |
606 |
|
DelayQueue q = populatedQueue(SIZE); |
607 |
|
int i = 0; |
608 |
< |
Iterator it = q.iterator(); |
609 |
< |
while(it.hasNext()) { |
608 |
> |
Iterator it = q.iterator(); |
609 |
> |
while (it.hasNext()) { |
610 |
|
assertTrue(q.contains(it.next())); |
611 |
|
++i; |
612 |
|
} |
616 |
|
/** |
617 |
|
* iterator.remove removes current element |
618 |
|
*/ |
619 |
< |
public void testIteratorRemove () { |
619 |
> |
public void testIteratorRemove() { |
620 |
|
final DelayQueue q = new DelayQueue(); |
621 |
|
q.add(new PDelay(2)); |
622 |
|
q.add(new PDelay(1)); |
625 |
|
it.next(); |
626 |
|
it.remove(); |
627 |
|
it = q.iterator(); |
628 |
< |
assertEquals(it.next(), new PDelay(2)); |
629 |
< |
assertEquals(it.next(), new PDelay(3)); |
628 |
> |
assertEquals(new PDelay(2), it.next()); |
629 |
> |
assertEquals(new PDelay(3), it.next()); |
630 |
|
assertFalse(it.hasNext()); |
631 |
|
} |
632 |
|
|
807 |
– |
|
633 |
|
/** |
634 |
|
* toString contains toStrings of elements |
635 |
|
*/ |
636 |
|
public void testToString() { |
637 |
|
DelayQueue q = populatedQueue(SIZE); |
638 |
|
String s = q.toString(); |
639 |
< |
for (int i = 0; i < SIZE; ++i) { |
640 |
< |
assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0); |
641 |
< |
} |
817 |
< |
} |
639 |
> |
for (Object e : q) |
640 |
> |
assertTrue(s.contains(e.toString())); |
641 |
> |
} |
642 |
|
|
643 |
|
/** |
644 |
< |
* offer transfers elements across Executor tasks |
644 |
> |
* timed poll transfers elements across Executor tasks |
645 |
|
*/ |
646 |
|
public void testPollInExecutor() { |
647 |
|
final DelayQueue q = new DelayQueue(); |
648 |
+ |
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
649 |
|
ExecutorService executor = Executors.newFixedThreadPool(2); |
650 |
< |
executor.execute(new Runnable() { |
651 |
< |
public void run() { |
652 |
< |
threadAssertNull(q.poll()); |
653 |
< |
try { |
654 |
< |
threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); |
655 |
< |
threadAssertTrue(q.isEmpty()); |
656 |
< |
} |
657 |
< |
catch (InterruptedException e) { |
658 |
< |
threadUnexpectedException(); |
659 |
< |
} |
660 |
< |
} |
661 |
< |
}); |
650 |
> |
executor.execute(new CheckedRunnable() { |
651 |
> |
public void realRun() throws InterruptedException { |
652 |
> |
assertNull(q.poll()); |
653 |
> |
threadsStarted.await(); |
654 |
> |
assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS)); |
655 |
> |
checkEmpty(q); |
656 |
> |
}}); |
657 |
> |
|
658 |
> |
executor.execute(new CheckedRunnable() { |
659 |
> |
public void realRun() throws InterruptedException { |
660 |
> |
threadsStarted.await(); |
661 |
> |
q.put(new PDelay(1)); |
662 |
> |
}}); |
663 |
|
|
838 |
– |
executor.execute(new Runnable() { |
839 |
– |
public void run() { |
840 |
– |
try { |
841 |
– |
Thread.sleep(SHORT_DELAY_MS); |
842 |
– |
q.put(new PDelay(1)); |
843 |
– |
} |
844 |
– |
catch (InterruptedException e) { |
845 |
– |
threadUnexpectedException(); |
846 |
– |
} |
847 |
– |
} |
848 |
– |
}); |
664 |
|
joinPool(executor); |
850 |
– |
|
665 |
|
} |
666 |
|
|
853 |
– |
|
667 |
|
/** |
668 |
< |
* Dekayed actions do not occur until their delay elapses |
668 |
> |
* Delayed actions do not occur until their delay elapses |
669 |
|
*/ |
670 |
< |
public void testDelay() { |
671 |
< |
DelayQueue q = new DelayQueue(); |
672 |
< |
NanoDelay[] elements = new NanoDelay[SIZE]; |
673 |
< |
for (int i = 0; i < SIZE; ++i) { |
674 |
< |
elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i)); |
675 |
< |
} |
676 |
< |
for (int i = 0; i < SIZE; ++i) { |
677 |
< |
q.add(elements[i]); |
678 |
< |
} |
679 |
< |
|
680 |
< |
try { |
681 |
< |
long last = 0; |
682 |
< |
for (int i = 0; i < SIZE; ++i) { |
870 |
< |
NanoDelay e = (NanoDelay)(q.take()); |
871 |
< |
long tt = e.getTriggerTime(); |
872 |
< |
assertTrue(tt <= System.nanoTime()); |
873 |
< |
if (i != 0) |
874 |
< |
assertTrue(tt >= last); |
875 |
< |
last = tt; |
876 |
< |
} |
877 |
< |
} |
878 |
< |
catch(InterruptedException ie) { |
879 |
< |
unexpectedException(); |
670 |
> |
public void testDelay() throws InterruptedException { |
671 |
> |
DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>(); |
672 |
> |
for (int i = 0; i < SIZE; ++i) |
673 |
> |
q.add(new NanoDelay(1000000L * (SIZE - i))); |
674 |
> |
|
675 |
> |
long last = 0; |
676 |
> |
for (int i = 0; i < SIZE; ++i) { |
677 |
> |
NanoDelay e = q.take(); |
678 |
> |
long tt = e.getTriggerTime(); |
679 |
> |
assertTrue(System.nanoTime() - tt >= 0); |
680 |
> |
if (i != 0) |
681 |
> |
assertTrue(tt >= last); |
682 |
> |
last = tt; |
683 |
|
} |
684 |
+ |
assertTrue(q.isEmpty()); |
685 |
|
} |
686 |
|
|
687 |
+ |
/** |
688 |
+ |
* peek of a non-empty queue returns non-null even if not expired |
689 |
+ |
*/ |
690 |
+ |
public void testPeekDelayed() { |
691 |
+ |
DelayQueue q = new DelayQueue(); |
692 |
+ |
q.add(new NanoDelay(Long.MAX_VALUE)); |
693 |
+ |
assertNotNull(q.peek()); |
694 |
+ |
} |
695 |
|
|
696 |
|
/** |
697 |
< |
* drainTo(null) throws NPE |
698 |
< |
*/ |
699 |
< |
public void testDrainToNull() { |
700 |
< |
DelayQueue q = populatedQueue(SIZE); |
701 |
< |
try { |
702 |
< |
q.drainTo(null); |
891 |
< |
shouldThrow(); |
892 |
< |
} catch(NullPointerException success) { |
893 |
< |
} |
697 |
> |
* poll of a non-empty queue returns null if no expired elements. |
698 |
> |
*/ |
699 |
> |
public void testPollDelayed() { |
700 |
> |
DelayQueue q = new DelayQueue(); |
701 |
> |
q.add(new NanoDelay(Long.MAX_VALUE)); |
702 |
> |
assertNull(q.poll()); |
703 |
|
} |
704 |
|
|
705 |
|
/** |
706 |
< |
* drainTo(this) throws IAE |
707 |
< |
*/ |
708 |
< |
public void testDrainToSelf() { |
709 |
< |
DelayQueue q = populatedQueue(SIZE); |
710 |
< |
try { |
711 |
< |
q.drainTo(q); |
903 |
< |
shouldThrow(); |
904 |
< |
} catch(IllegalArgumentException success) { |
905 |
< |
} |
706 |
> |
* timed poll of a non-empty queue returns null if no expired elements. |
707 |
> |
*/ |
708 |
> |
public void testTimedPollDelayed() throws InterruptedException { |
709 |
> |
DelayQueue q = new DelayQueue(); |
710 |
> |
q.add(new NanoDelay(LONG_DELAY_MS * 1000000L)); |
711 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
712 |
|
} |
713 |
|
|
714 |
|
/** |
715 |
|
* drainTo(c) empties queue into another collection c |
716 |
< |
*/ |
716 |
> |
*/ |
717 |
|
public void testDrainTo() { |
718 |
< |
DelayQueue q = populatedQueue(SIZE); |
718 |
> |
DelayQueue q = new DelayQueue(); |
719 |
> |
PDelay[] elems = new PDelay[SIZE]; |
720 |
> |
for (int i = 0; i < SIZE; ++i) { |
721 |
> |
elems[i] = new PDelay(i); |
722 |
> |
q.add(elems[i]); |
723 |
> |
} |
724 |
|
ArrayList l = new ArrayList(); |
725 |
|
q.drainTo(l); |
726 |
< |
assertEquals(q.size(), 0); |
727 |
< |
assertEquals(l.size(), SIZE); |
726 |
> |
assertEquals(0, q.size()); |
727 |
> |
for (int i = 0; i < SIZE; ++i) |
728 |
> |
assertEquals(elems[i], l.get(i)); |
729 |
> |
q.add(elems[0]); |
730 |
> |
q.add(elems[1]); |
731 |
> |
assertFalse(q.isEmpty()); |
732 |
> |
assertTrue(q.contains(elems[0])); |
733 |
> |
assertTrue(q.contains(elems[1])); |
734 |
> |
l.clear(); |
735 |
> |
q.drainTo(l); |
736 |
> |
assertEquals(0, q.size()); |
737 |
> |
assertEquals(2, l.size()); |
738 |
> |
for (int i = 0; i < 2; ++i) |
739 |
> |
assertEquals(elems[i], l.get(i)); |
740 |
|
} |
741 |
|
|
742 |
|
/** |
743 |
|
* drainTo empties queue |
744 |
< |
*/ |
745 |
< |
public void testDrainToWithActivePut() { |
744 |
> |
*/ |
745 |
> |
public void testDrainToWithActivePut() throws InterruptedException { |
746 |
|
final DelayQueue q = populatedQueue(SIZE); |
747 |
< |
Thread t = new Thread(new Runnable() { |
748 |
< |
public void run() { |
749 |
< |
q.put(new PDelay(SIZE+1)); |
750 |
< |
} |
928 |
< |
}); |
929 |
< |
try { |
930 |
< |
t.start(); |
931 |
< |
ArrayList l = new ArrayList(); |
932 |
< |
q.drainTo(l); |
933 |
< |
assertTrue(l.size() >= SIZE); |
934 |
< |
t.join(); |
935 |
< |
assertTrue(q.size() + l.size() == SIZE+1); |
936 |
< |
} catch(Exception e){ |
937 |
< |
unexpectedException(); |
938 |
< |
} |
939 |
< |
} |
747 |
> |
Thread t = new Thread(new CheckedRunnable() { |
748 |
> |
public void realRun() { |
749 |
> |
q.put(new PDelay(SIZE+1)); |
750 |
> |
}}); |
751 |
|
|
752 |
< |
/** |
753 |
< |
* drainTo(null, n) throws NPE |
754 |
< |
*/ |
755 |
< |
public void testDrainToNullN() { |
756 |
< |
DelayQueue q = populatedQueue(SIZE); |
757 |
< |
try { |
947 |
< |
q.drainTo(null, 0); |
948 |
< |
shouldThrow(); |
949 |
< |
} catch(NullPointerException success) { |
950 |
< |
} |
951 |
< |
} |
952 |
< |
|
953 |
< |
/** |
954 |
< |
* drainTo(this, n) throws IAE |
955 |
< |
*/ |
956 |
< |
public void testDrainToSelfN() { |
957 |
< |
DelayQueue q = populatedQueue(SIZE); |
958 |
< |
try { |
959 |
< |
q.drainTo(q, 0); |
960 |
< |
shouldThrow(); |
961 |
< |
} catch(IllegalArgumentException success) { |
962 |
< |
} |
752 |
> |
t.start(); |
753 |
> |
ArrayList l = new ArrayList(); |
754 |
> |
q.drainTo(l); |
755 |
> |
assertTrue(l.size() >= SIZE); |
756 |
> |
t.join(); |
757 |
> |
assertTrue(q.size() + l.size() >= SIZE); |
758 |
|
} |
759 |
|
|
760 |
|
/** |
761 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
762 |
< |
*/ |
761 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
762 |
> |
*/ |
763 |
|
public void testDrainToN() { |
764 |
|
for (int i = 0; i < SIZE + 2; ++i) { |
765 |
|
DelayQueue q = populatedQueue(SIZE); |
766 |
|
ArrayList l = new ArrayList(); |
767 |
|
q.drainTo(l, i); |
768 |
< |
int k = (i < SIZE)? i : SIZE; |
769 |
< |
assertEquals(q.size(), SIZE-k); |
770 |
< |
assertEquals(l.size(), k); |
768 |
> |
int k = (i < SIZE) ? i : SIZE; |
769 |
> |
assertEquals(SIZE-k, q.size()); |
770 |
> |
assertEquals(k, l.size()); |
771 |
|
} |
772 |
|
} |
773 |
|
|
979 |
– |
|
774 |
|
} |