90 |
|
} |
91 |
|
|
92 |
|
/** |
93 |
< |
* Constructor throws IAE if capacity argument nonpositive |
93 |
> |
* Constructor throws IllegalArgumentException if capacity argument nonpositive |
94 |
|
*/ |
95 |
|
public void testConstructor2() { |
96 |
|
try { |
229 |
|
} |
230 |
|
|
231 |
|
/** |
232 |
< |
* addAll(this) throws IAE |
232 |
> |
* addAll(this) throws IllegalArgumentException |
233 |
|
*/ |
234 |
|
public void testAddAllSelf() { |
235 |
|
PriorityBlockingQueue q = populatedQueue(SIZE); |
302 |
|
/** |
303 |
|
* timed offer does not time out |
304 |
|
*/ |
305 |
< |
public void testTimedOffer() throws InterruptedException { |
305 |
> |
public void testTimedOffer() { |
306 |
|
final PriorityBlockingQueue q = new PriorityBlockingQueue(2); |
307 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
308 |
|
public void realRun() { |
400 |
|
*/ |
401 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
402 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
403 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
403 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
404 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
405 |
|
public void realRun() throws InterruptedException { |
406 |
|
long startTime = System.nanoTime(); |
407 |
< |
for (int i = 0; i < SIZE; ++i) { |
407 |
> |
for (int i = 0; i < SIZE; i++) |
408 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
409 |
< |
} |
410 |
< |
aboutToWait.countDown(); |
409 |
> |
|
410 |
> |
Thread.currentThread().interrupt(); |
411 |
> |
try { |
412 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
413 |
> |
shouldThrow(); |
414 |
> |
} catch (InterruptedException success) {} |
415 |
> |
assertFalse(Thread.interrupted()); |
416 |
> |
|
417 |
> |
pleaseInterrupt.countDown(); |
418 |
|
try { |
419 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
420 |
|
shouldThrow(); |
421 |
< |
} catch (InterruptedException success) { |
422 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
423 |
< |
} |
421 |
> |
} catch (InterruptedException success) {} |
422 |
> |
assertFalse(Thread.interrupted()); |
423 |
> |
|
424 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
425 |
|
}}); |
426 |
|
|
427 |
< |
await(aboutToWait); |
427 |
> |
await(pleaseInterrupt); |
428 |
|
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
429 |
|
t.interrupt(); |
430 |
|
awaitTermination(t); |
659 |
|
} |
660 |
|
|
661 |
|
/** |
662 |
< |
* A deserialized serialized queue has same elements |
662 |
> |
* A deserialized/reserialized queue has same elements |
663 |
|
*/ |
664 |
|
public void testSerialization() throws Exception { |
665 |
|
Queue x = populatedQueue(SIZE); |