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.*; |
11 |
< |
import java.util.concurrent.*; |
12 |
< |
import java.io.*; |
10 |
> |
import java.util.Arrays; |
11 |
> |
import java.util.ArrayList; |
12 |
> |
import java.util.Collection; |
13 |
> |
import java.util.Comparator; |
14 |
> |
import java.util.Iterator; |
15 |
> |
import java.util.NoSuchElementException; |
16 |
> |
import java.util.Queue; |
17 |
> |
import java.util.concurrent.PriorityBlockingQueue; |
18 |
> |
import java.util.concurrent.BlockingQueue; |
19 |
> |
import java.util.concurrent.CountDownLatch; |
20 |
> |
import java.util.concurrent.Executors; |
21 |
> |
import java.util.concurrent.ExecutorService; |
22 |
> |
import static java.util.concurrent.TimeUnit.MILLISECONDS; |
23 |
|
|
24 |
|
public class PriorityBlockingQueueTest extends JSR166TestCase { |
25 |
+ |
|
26 |
+ |
public static class Generic extends BlockingQueueTest { |
27 |
+ |
protected BlockingQueue emptyCollection() { |
28 |
+ |
return new PriorityBlockingQueue(); |
29 |
+ |
} |
30 |
+ |
} |
31 |
+ |
|
32 |
+ |
public static class InitialCapacity extends BlockingQueueTest { |
33 |
+ |
protected BlockingQueue emptyCollection() { |
34 |
+ |
return new PriorityBlockingQueue(20); |
35 |
+ |
} |
36 |
+ |
} |
37 |
+ |
|
38 |
|
public static void main(String[] args) { |
39 |
< |
junit.textui.TestRunner.run (suite()); |
39 |
> |
junit.textui.TestRunner.run(suite()); |
40 |
|
} |
41 |
+ |
|
42 |
|
public static Test suite() { |
43 |
< |
return new TestSuite(PriorityBlockingQueueTest.class); |
43 |
> |
return newTestSuite(PriorityBlockingQueueTest.class, |
44 |
> |
new Generic().testSuite(), |
45 |
> |
new InitialCapacity().testSuite()); |
46 |
|
} |
47 |
|
|
48 |
|
private static final int NOCAP = Integer.MAX_VALUE; |
50 |
|
/** Sample Comparator */ |
51 |
|
static class MyReverseComparator implements Comparator { |
52 |
|
public int compare(Object x, Object y) { |
53 |
< |
int i = ((Integer)x).intValue(); |
28 |
< |
int j = ((Integer)y).intValue(); |
29 |
< |
if (i < j) return 1; |
30 |
< |
if (i > j) return -1; |
31 |
< |
return 0; |
53 |
> |
return ((Comparable)y).compareTo(x); |
54 |
|
} |
55 |
|
} |
56 |
|
|
58 |
|
* Create a queue of given size containing consecutive |
59 |
|
* Integers 0 ... n. |
60 |
|
*/ |
61 |
< |
private PriorityBlockingQueue populatedQueue(int n) { |
62 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(n); |
61 |
> |
private PriorityBlockingQueue<Integer> populatedQueue(int n) { |
62 |
> |
PriorityBlockingQueue<Integer> q = |
63 |
> |
new PriorityBlockingQueue<Integer>(n); |
64 |
|
assertTrue(q.isEmpty()); |
65 |
|
for (int i = n-1; i >= 0; i-=2) |
66 |
|
assertTrue(q.offer(new Integer(i))); |
80 |
|
} |
81 |
|
|
82 |
|
/** |
83 |
< |
* Constructor throws IAE if capacity argument nonpositive |
83 |
> |
* Constructor throws IAE if capacity argument nonpositive |
84 |
|
*/ |
85 |
|
public void testConstructor2() { |
86 |
|
try { |
87 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(0); |
87 |
> |
new PriorityBlockingQueue(0); |
88 |
|
shouldThrow(); |
89 |
|
} catch (IllegalArgumentException success) {} |
90 |
|
} |
94 |
|
*/ |
95 |
|
public void testConstructor3() { |
96 |
|
try { |
97 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(null); |
97 |
> |
new PriorityBlockingQueue(null); |
98 |
|
shouldThrow(); |
99 |
|
} catch (NullPointerException success) {} |
100 |
|
} |
103 |
|
* Initializing from Collection of null elements throws NPE |
104 |
|
*/ |
105 |
|
public void testConstructor4() { |
106 |
+ |
Collection<Integer> elements = Arrays.asList(new Integer[SIZE]); |
107 |
|
try { |
108 |
< |
Integer[] ints = new Integer[SIZE]; |
85 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
108 |
> |
new PriorityBlockingQueue(elements); |
109 |
|
shouldThrow(); |
110 |
|
} catch (NullPointerException success) {} |
111 |
|
} |
114 |
|
* Initializing from Collection with some null elements throws NPE |
115 |
|
*/ |
116 |
|
public void testConstructor5() { |
117 |
+ |
Integer[] ints = new Integer[SIZE]; |
118 |
+ |
for (int i = 0; i < SIZE-1; ++i) |
119 |
+ |
ints[i] = i; |
120 |
+ |
Collection<Integer> elements = Arrays.asList(ints); |
121 |
|
try { |
122 |
< |
Integer[] ints = new Integer[SIZE]; |
96 |
< |
for (int i = 0; i < SIZE-1; ++i) |
97 |
< |
ints[i] = new Integer(i); |
98 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
122 |
> |
new PriorityBlockingQueue(elements); |
123 |
|
shouldThrow(); |
124 |
|
} catch (NullPointerException success) {} |
125 |
|
} |
130 |
|
public void testConstructor6() { |
131 |
|
Integer[] ints = new Integer[SIZE]; |
132 |
|
for (int i = 0; i < SIZE; ++i) |
133 |
< |
ints[i] = new Integer(i); |
133 |
> |
ints[i] = i; |
134 |
|
PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints)); |
135 |
|
for (int i = 0; i < SIZE; ++i) |
136 |
|
assertEquals(ints[i], q.poll()); |
185 |
|
} |
186 |
|
|
187 |
|
/** |
164 |
– |
* offer(null) throws NPE |
165 |
– |
*/ |
166 |
– |
public void testOfferNull() { |
167 |
– |
try { |
168 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
169 |
– |
q.offer(null); |
170 |
– |
shouldThrow(); |
171 |
– |
} catch (NullPointerException success) {} |
172 |
– |
} |
173 |
– |
|
174 |
– |
/** |
175 |
– |
* add(null) throws NPE |
176 |
– |
*/ |
177 |
– |
public void testAddNull() { |
178 |
– |
try { |
179 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
180 |
– |
q.add(null); |
181 |
– |
shouldThrow(); |
182 |
– |
} catch (NullPointerException success) {} |
183 |
– |
} |
184 |
– |
|
185 |
– |
/** |
188 |
|
* Offer of comparable element succeeds |
189 |
|
*/ |
190 |
|
public void testOffer() { |
218 |
|
} |
219 |
|
|
220 |
|
/** |
219 |
– |
* addAll(null) throws NPE |
220 |
– |
*/ |
221 |
– |
public void testAddAll1() { |
222 |
– |
try { |
223 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(1); |
224 |
– |
q.addAll(null); |
225 |
– |
shouldThrow(); |
226 |
– |
} catch (NullPointerException success) {} |
227 |
– |
} |
228 |
– |
|
229 |
– |
/** |
221 |
|
* addAll(this) throws IAE |
222 |
|
*/ |
223 |
|
public void testAddAllSelf() { |
229 |
|
} |
230 |
|
|
231 |
|
/** |
241 |
– |
* addAll of a collection with null elements throws NPE |
242 |
– |
*/ |
243 |
– |
public void testAddAll2() { |
244 |
– |
try { |
245 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
246 |
– |
Integer[] ints = new Integer[SIZE]; |
247 |
– |
q.addAll(Arrays.asList(ints)); |
248 |
– |
shouldThrow(); |
249 |
– |
} catch (NullPointerException success) {} |
250 |
– |
} |
251 |
– |
/** |
232 |
|
* addAll of a collection with any null elements throws NPE after |
233 |
|
* possibly adding some elements |
234 |
|
*/ |
259 |
|
} |
260 |
|
|
261 |
|
/** |
282 |
– |
* put(null) throws NPE |
283 |
– |
*/ |
284 |
– |
public void testPutNull() { |
285 |
– |
try { |
286 |
– |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
287 |
– |
q.put(null); |
288 |
– |
shouldThrow(); |
289 |
– |
} catch (NullPointerException success) {} |
290 |
– |
} |
291 |
– |
|
292 |
– |
/** |
262 |
|
* all elements successfully put are contained |
263 |
|
*/ |
264 |
< |
public void testPut() { |
265 |
< |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
266 |
< |
for (int i = 0; i < SIZE; ++i) { |
267 |
< |
Integer I = new Integer(i); |
268 |
< |
q.put(I); |
269 |
< |
assertTrue(q.contains(I)); |
270 |
< |
} |
271 |
< |
assertEquals(SIZE, q.size()); |
264 |
> |
public void testPut() { |
265 |
> |
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE); |
266 |
> |
for (int i = 0; i < SIZE; ++i) { |
267 |
> |
Integer I = new Integer(i); |
268 |
> |
q.put(I); |
269 |
> |
assertTrue(q.contains(I)); |
270 |
> |
} |
271 |
> |
assertEquals(SIZE, q.size()); |
272 |
|
} |
273 |
|
|
274 |
|
/** |
277 |
|
public void testPutWithTake() throws InterruptedException { |
278 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
279 |
|
final int size = 4; |
280 |
< |
Thread t = new Thread(new CheckedRunnable() { |
280 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
281 |
|
public void realRun() { |
282 |
|
for (int i = 0; i < size; i++) |
283 |
|
q.put(new Integer(0)); |
284 |
|
}}); |
285 |
|
|
286 |
< |
t.start(); |
287 |
< |
Thread.sleep(SHORT_DELAY_MS); |
319 |
< |
assertEquals(q.size(), size); |
286 |
> |
awaitTermination(t); |
287 |
> |
assertEquals(size, q.size()); |
288 |
|
q.take(); |
321 |
– |
t.interrupt(); |
322 |
– |
t.join(); |
289 |
|
} |
290 |
|
|
291 |
|
/** |
293 |
|
*/ |
294 |
|
public void testTimedOffer() throws InterruptedException { |
295 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
296 |
< |
Thread t = new Thread(new Runnable() { |
297 |
< |
public void run() { |
298 |
< |
try { |
299 |
< |
q.put(new Integer(0)); |
300 |
< |
q.put(new Integer(0)); |
301 |
< |
threadAssertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
302 |
< |
threadAssertTrue(q.offer(new Integer(0), LONG_DELAY_MS, TimeUnit.MILLISECONDS)); |
337 |
< |
} finally { } |
338 |
< |
} |
339 |
< |
}); |
296 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
297 |
> |
public void realRun() { |
298 |
> |
q.put(new Integer(0)); |
299 |
> |
q.put(new Integer(0)); |
300 |
> |
assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, MILLISECONDS)); |
301 |
> |
assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS)); |
302 |
> |
}}); |
303 |
|
|
304 |
< |
t.start(); |
342 |
< |
Thread.sleep(SMALL_DELAY_MS); |
343 |
< |
t.interrupt(); |
344 |
< |
t.join(); |
304 |
> |
awaitTermination(t); |
305 |
|
} |
306 |
|
|
307 |
|
/** |
310 |
|
public void testTake() throws InterruptedException { |
311 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
312 |
|
for (int i = 0; i < SIZE; ++i) { |
313 |
< |
assertEquals(i, ((Integer)q.take()).intValue()); |
313 |
> |
assertEquals(i, q.take()); |
314 |
|
} |
315 |
|
} |
316 |
|
|
317 |
|
/** |
358 |
– |
* take blocks interruptibly when empty |
359 |
– |
*/ |
360 |
– |
public void testTakeFromEmpty() throws InterruptedException { |
361 |
– |
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
362 |
– |
Thread t = new Thread(new CheckedInterruptedRunnable() { |
363 |
– |
public void realRun() throws InterruptedException { |
364 |
– |
q.take(); |
365 |
– |
}}); |
366 |
– |
|
367 |
– |
t.start(); |
368 |
– |
Thread.sleep(SHORT_DELAY_MS); |
369 |
– |
t.interrupt(); |
370 |
– |
t.join(); |
371 |
– |
} |
372 |
– |
|
373 |
– |
/** |
318 |
|
* Take removes existing elements until empty, then blocks interruptibly |
319 |
|
*/ |
320 |
|
public void testBlockingTake() throws InterruptedException { |
321 |
< |
Thread t = new Thread(new CheckedInterruptedRunnable() { |
321 |
> |
final PriorityBlockingQueue q = populatedQueue(SIZE); |
322 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
323 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
324 |
|
public void realRun() throws InterruptedException { |
379 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
325 |
|
for (int i = 0; i < SIZE; ++i) { |
326 |
< |
threadAssertEquals(i, ((Integer)q.take()).intValue()); |
326 |
> |
assertEquals(i, q.take()); |
327 |
|
} |
328 |
< |
q.take(); |
328 |
> |
|
329 |
> |
Thread.currentThread().interrupt(); |
330 |
> |
try { |
331 |
> |
q.take(); |
332 |
> |
shouldThrow(); |
333 |
> |
} catch (InterruptedException success) {} |
334 |
> |
assertFalse(Thread.interrupted()); |
335 |
> |
|
336 |
> |
pleaseInterrupt.countDown(); |
337 |
> |
try { |
338 |
> |
q.take(); |
339 |
> |
shouldThrow(); |
340 |
> |
} catch (InterruptedException success) {} |
341 |
> |
assertFalse(Thread.interrupted()); |
342 |
|
}}); |
343 |
|
|
344 |
< |
t.start(); |
345 |
< |
Thread.sleep(SHORT_DELAY_MS); |
344 |
> |
await(pleaseInterrupt); |
345 |
> |
assertThreadStaysAlive(t); |
346 |
|
t.interrupt(); |
347 |
< |
t.join(); |
347 |
> |
awaitTermination(t); |
348 |
|
} |
349 |
|
|
392 |
– |
|
350 |
|
/** |
351 |
|
* poll succeeds unless empty |
352 |
|
*/ |
353 |
|
public void testPoll() { |
354 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
355 |
|
for (int i = 0; i < SIZE; ++i) { |
356 |
< |
assertEquals(i, ((Integer)q.poll()).intValue()); |
356 |
> |
assertEquals(i, q.poll()); |
357 |
|
} |
358 |
|
assertNull(q.poll()); |
359 |
|
} |
360 |
|
|
361 |
|
/** |
362 |
< |
* timed pool with zero timeout succeeds when non-empty, else times out |
362 |
> |
* timed poll with zero timeout succeeds when non-empty, else times out |
363 |
|
*/ |
364 |
|
public void testTimedPoll0() throws InterruptedException { |
365 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
366 |
|
for (int i = 0; i < SIZE; ++i) { |
367 |
< |
assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue()); |
367 |
> |
assertEquals(i, q.poll(0, MILLISECONDS)); |
368 |
|
} |
369 |
< |
assertNull(q.poll(0, TimeUnit.MILLISECONDS)); |
369 |
> |
assertNull(q.poll(0, MILLISECONDS)); |
370 |
|
} |
371 |
|
|
372 |
|
/** |
373 |
< |
* timed pool with nonzero timeout succeeds when non-empty, else times out |
373 |
> |
* timed poll with nonzero timeout succeeds when non-empty, else times out |
374 |
|
*/ |
375 |
|
public void testTimedPoll() throws InterruptedException { |
376 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
376 |
> |
PriorityBlockingQueue<Integer> q = populatedQueue(SIZE); |
377 |
|
for (int i = 0; i < SIZE; ++i) { |
378 |
< |
assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue()); |
379 |
< |
} |
380 |
< |
assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
378 |
> |
long startTime = System.nanoTime(); |
379 |
> |
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
380 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
381 |
> |
} |
382 |
> |
long startTime = System.nanoTime(); |
383 |
> |
assertNull(q.poll(timeoutMillis(), MILLISECONDS)); |
384 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
385 |
> |
checkEmpty(q); |
386 |
|
} |
387 |
|
|
388 |
|
/** |
390 |
|
* returning timeout status |
391 |
|
*/ |
392 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
393 |
< |
Thread t = new Thread(new CheckedRunnable() { |
393 |
> |
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
394 |
> |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
395 |
> |
Thread t = newStartedThread(new CheckedRunnable() { |
396 |
|
public void realRun() throws InterruptedException { |
433 |
– |
PriorityBlockingQueue q = populatedQueue(SIZE); |
397 |
|
for (int i = 0; i < SIZE; ++i) { |
398 |
< |
threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue()); |
398 |
> |
long t0 = System.nanoTime(); |
399 |
> |
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
400 |
> |
assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS); |
401 |
|
} |
402 |
+ |
long t0 = System.nanoTime(); |
403 |
+ |
aboutToWait.countDown(); |
404 |
|
try { |
405 |
< |
q.poll(SMALL_DELAY_MS, TimeUnit.MILLISECONDS); |
406 |
< |
threadShouldThrow(); |
407 |
< |
} catch (InterruptedException success) {} |
408 |
< |
}}); |
409 |
< |
|
443 |
< |
t.start(); |
444 |
< |
Thread.sleep(SHORT_DELAY_MS); |
445 |
< |
t.interrupt(); |
446 |
< |
t.join(); |
447 |
< |
} |
448 |
< |
|
449 |
< |
/** |
450 |
< |
* timed poll before a delayed offer fails; after offer succeeds; |
451 |
< |
* on interruption throws |
452 |
< |
*/ |
453 |
< |
public void testTimedPollWithOffer() throws InterruptedException { |
454 |
< |
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
455 |
< |
Thread t = new Thread(new CheckedRunnable() { |
456 |
< |
public void realRun() throws InterruptedException { |
457 |
< |
threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
458 |
< |
threadAssertEquals(0, q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); |
459 |
< |
try { |
460 |
< |
q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS); |
461 |
< |
threadShouldThrow(); |
462 |
< |
} catch (InterruptedException success) {} |
405 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
406 |
> |
shouldThrow(); |
407 |
> |
} catch (InterruptedException success) { |
408 |
> |
assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS); |
409 |
> |
} |
410 |
|
}}); |
411 |
|
|
412 |
< |
t.start(); |
413 |
< |
Thread.sleep(SMALL_DELAY_MS); |
467 |
< |
assertTrue(q.offer(new Integer(0), SHORT_DELAY_MS, TimeUnit.MILLISECONDS)); |
412 |
> |
aboutToWait.await(); |
413 |
> |
waitForThreadToEnterWaitState(t, SMALL_DELAY_MS); |
414 |
|
t.interrupt(); |
415 |
< |
t.join(); |
415 |
> |
awaitTermination(t, MEDIUM_DELAY_MS); |
416 |
|
} |
417 |
|
|
472 |
– |
|
418 |
|
/** |
419 |
|
* peek returns next element, or null if empty |
420 |
|
*/ |
421 |
|
public void testPeek() { |
422 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
423 |
|
for (int i = 0; i < SIZE; ++i) { |
424 |
< |
assertEquals(i, ((Integer)q.peek()).intValue()); |
425 |
< |
q.poll(); |
424 |
> |
assertEquals(i, q.peek()); |
425 |
> |
assertEquals(i, q.poll()); |
426 |
|
assertTrue(q.peek() == null || |
427 |
< |
i != ((Integer)q.peek()).intValue()); |
427 |
> |
!q.peek().equals(i)); |
428 |
|
} |
429 |
|
assertNull(q.peek()); |
430 |
|
} |
435 |
|
public void testElement() { |
436 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
437 |
|
for (int i = 0; i < SIZE; ++i) { |
438 |
< |
assertEquals(i, ((Integer)q.element()).intValue()); |
439 |
< |
q.poll(); |
438 |
> |
assertEquals(i, q.element()); |
439 |
> |
assertEquals(i, q.poll()); |
440 |
|
} |
441 |
|
try { |
442 |
|
q.element(); |
450 |
|
public void testRemove() { |
451 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
452 |
|
for (int i = 0; i < SIZE; ++i) { |
453 |
< |
assertEquals(i, ((Integer)q.remove()).intValue()); |
453 |
> |
assertEquals(i, q.remove()); |
454 |
|
} |
455 |
|
try { |
456 |
|
q.remove(); |
464 |
|
public void testRemoveElement() { |
465 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
466 |
|
for (int i = 1; i < SIZE; i+=2) { |
467 |
< |
assertTrue(q.remove(new Integer(i))); |
467 |
> |
assertTrue(q.contains(i)); |
468 |
> |
assertTrue(q.remove(i)); |
469 |
> |
assertFalse(q.contains(i)); |
470 |
> |
assertTrue(q.contains(i-1)); |
471 |
|
} |
472 |
|
for (int i = 0; i < SIZE; i+=2) { |
473 |
< |
assertTrue(q.remove(new Integer(i))); |
474 |
< |
assertFalse(q.remove(new Integer(i+1))); |
473 |
> |
assertTrue(q.contains(i)); |
474 |
> |
assertTrue(q.remove(i)); |
475 |
> |
assertFalse(q.contains(i)); |
476 |
> |
assertFalse(q.remove(i+1)); |
477 |
> |
assertFalse(q.contains(i+1)); |
478 |
|
} |
479 |
|
assertTrue(q.isEmpty()); |
480 |
|
} |
556 |
|
} |
557 |
|
|
558 |
|
/** |
559 |
< |
* toArray contains all elements |
559 |
> |
* toArray contains all elements |
560 |
|
*/ |
561 |
|
public void testToArray() throws InterruptedException { |
562 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
563 |
|
Object[] o = q.toArray(); |
564 |
|
Arrays.sort(o); |
565 |
|
for (int i = 0; i < o.length; i++) |
566 |
< |
assertEquals(o[i], q.take()); |
566 |
> |
assertSame(o[i], q.take()); |
567 |
|
} |
568 |
|
|
569 |
|
/** |
570 |
|
* toArray(a) contains all elements |
571 |
|
*/ |
572 |
|
public void testToArray2() throws InterruptedException { |
573 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
573 |
> |
PriorityBlockingQueue<Integer> q = populatedQueue(SIZE); |
574 |
|
Integer[] ints = new Integer[SIZE]; |
575 |
< |
ints = (Integer[])q.toArray(ints); |
575 |
> |
Integer[] array = q.toArray(ints); |
576 |
> |
assertSame(ints, array); |
577 |
|
Arrays.sort(ints); |
578 |
|
for (int i = 0; i < ints.length; i++) |
579 |
< |
assertEquals(ints[i], q.take()); |
579 |
> |
assertSame(ints[i], q.take()); |
580 |
|
} |
581 |
|
|
582 |
|
/** |
583 |
< |
* toArray(null) throws NPE |
632 |
< |
*/ |
633 |
< |
public void testToArray_BadArg() { |
634 |
< |
try { |
635 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
636 |
< |
Object o[] = q.toArray(null); |
637 |
< |
shouldThrow(); |
638 |
< |
} catch (NullPointerException success) {} |
639 |
< |
} |
640 |
< |
|
641 |
< |
/** |
642 |
< |
* toArray with incompatible array type throws CCE |
583 |
> |
* toArray(incompatible array type) throws ArrayStoreException |
584 |
|
*/ |
585 |
|
public void testToArray1_BadArg() { |
586 |
+ |
PriorityBlockingQueue q = populatedQueue(SIZE); |
587 |
|
try { |
588 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
647 |
< |
Object o[] = q.toArray(new String[10] ); |
588 |
> |
q.toArray(new String[10]); |
589 |
|
shouldThrow(); |
590 |
< |
} catch (ArrayStoreException success) {} |
590 |
> |
} catch (ArrayStoreException success) {} |
591 |
|
} |
592 |
|
|
593 |
|
/** |
607 |
|
/** |
608 |
|
* iterator.remove removes current element |
609 |
|
*/ |
610 |
< |
public void testIteratorRemove () { |
610 |
> |
public void testIteratorRemove() { |
611 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(3); |
612 |
|
q.add(new Integer(2)); |
613 |
|
q.add(new Integer(1)); |
623 |
|
assertFalse(it.hasNext()); |
624 |
|
} |
625 |
|
|
685 |
– |
|
626 |
|
/** |
627 |
|
* toString contains toStrings of elements |
628 |
|
*/ |
630 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
631 |
|
String s = q.toString(); |
632 |
|
for (int i = 0; i < SIZE; ++i) { |
633 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
633 |
> |
assertTrue(s.contains(String.valueOf(i))); |
634 |
|
} |
635 |
|
} |
636 |
|
|
637 |
|
/** |
638 |
< |
* offer transfers elements across Executor tasks |
638 |
> |
* timed poll transfers elements across Executor tasks |
639 |
|
*/ |
640 |
|
public void testPollInExecutor() { |
641 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
642 |
+ |
final CheckedBarrier threadsStarted = new CheckedBarrier(2); |
643 |
|
ExecutorService executor = Executors.newFixedThreadPool(2); |
644 |
|
executor.execute(new CheckedRunnable() { |
645 |
|
public void realRun() throws InterruptedException { |
646 |
< |
threadAssertNull(q.poll()); |
647 |
< |
threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS)); |
648 |
< |
threadAssertTrue(q.isEmpty()); |
646 |
> |
assertNull(q.poll()); |
647 |
> |
threadsStarted.await(); |
648 |
> |
assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS)); |
649 |
> |
checkEmpty(q); |
650 |
|
}}); |
651 |
|
|
652 |
|
executor.execute(new CheckedRunnable() { |
653 |
|
public void realRun() throws InterruptedException { |
654 |
< |
Thread.sleep(SMALL_DELAY_MS); |
655 |
< |
q.put(new Integer(1)); |
654 |
> |
threadsStarted.await(); |
655 |
> |
q.put(one); |
656 |
|
}}); |
657 |
|
|
658 |
|
joinPool(executor); |
662 |
|
* A deserialized serialized queue has same elements |
663 |
|
*/ |
664 |
|
public void testSerialization() throws Exception { |
665 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
666 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
725 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
726 |
< |
out.writeObject(q); |
727 |
< |
out.close(); |
728 |
< |
|
729 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
730 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
731 |
< |
PriorityBlockingQueue r = (PriorityBlockingQueue)in.readObject(); |
732 |
< |
assertEquals(q.size(), r.size()); |
733 |
< |
while (!q.isEmpty()) |
734 |
< |
assertEquals(q.remove(), r.remove()); |
735 |
< |
} |
736 |
< |
|
737 |
< |
/** |
738 |
< |
* drainTo(null) throws NPE |
739 |
< |
*/ |
740 |
< |
public void testDrainToNull() { |
741 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
742 |
< |
try { |
743 |
< |
q.drainTo(null); |
744 |
< |
shouldThrow(); |
745 |
< |
} catch (NullPointerException success) {} |
746 |
< |
} |
665 |
> |
Queue x = populatedQueue(SIZE); |
666 |
> |
Queue y = serialClone(x); |
667 |
|
|
668 |
< |
/** |
669 |
< |
* drainTo(this) throws IAE |
670 |
< |
*/ |
671 |
< |
public void testDrainToSelf() { |
672 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
673 |
< |
try { |
674 |
< |
q.drainTo(q); |
755 |
< |
shouldThrow(); |
756 |
< |
} catch (IllegalArgumentException success) {} |
668 |
> |
assertTrue(x != y); |
669 |
> |
assertEquals(x.size(), y.size()); |
670 |
> |
while (!x.isEmpty()) { |
671 |
> |
assertFalse(y.isEmpty()); |
672 |
> |
assertEquals(x.remove(), y.remove()); |
673 |
> |
} |
674 |
> |
assertTrue(y.isEmpty()); |
675 |
|
} |
676 |
|
|
677 |
|
/** |
719 |
|
} |
720 |
|
|
721 |
|
/** |
722 |
< |
* drainTo(null, n) throws NPE |
805 |
< |
*/ |
806 |
< |
public void testDrainToNullN() { |
807 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
808 |
< |
try { |
809 |
< |
q.drainTo(null, 0); |
810 |
< |
shouldThrow(); |
811 |
< |
} catch (NullPointerException success) {} |
812 |
< |
} |
813 |
< |
|
814 |
< |
/** |
815 |
< |
* drainTo(this, n) throws IAE |
816 |
< |
*/ |
817 |
< |
public void testDrainToSelfN() { |
818 |
< |
PriorityBlockingQueue q = populatedQueue(SIZE); |
819 |
< |
try { |
820 |
< |
q.drainTo(q, 0); |
821 |
< |
shouldThrow(); |
822 |
< |
} catch (IllegalArgumentException success) {} |
823 |
< |
} |
824 |
< |
|
825 |
< |
/** |
826 |
< |
* drainTo(c, n) empties first max {n, size} elements of queue into c |
722 |
> |
* drainTo(c, n) empties first min(n, size) elements of queue into c |
723 |
|
*/ |
724 |
|
public void testDrainToN() { |
725 |
|
PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2); |
728 |
|
assertTrue(q.offer(new Integer(j))); |
729 |
|
ArrayList l = new ArrayList(); |
730 |
|
q.drainTo(l, i); |
731 |
< |
int k = (i < SIZE)? i : SIZE; |
731 |
> |
int k = (i < SIZE) ? i : SIZE; |
732 |
|
assertEquals(l.size(), k); |
733 |
|
assertEquals(q.size(), SIZE-k); |
734 |
|
for (int j = 0; j < k; ++j) |