103 |
|
} |
104 |
|
|
105 |
|
/** |
106 |
< |
* Constructor throws IAE if capacity argument nonpositive |
106 |
> |
* Constructor throws IllegalArgumentException if capacity argument nonpositive |
107 |
|
*/ |
108 |
|
public void testConstructor_nonPositiveCapacity() { |
109 |
|
for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) { |
156 |
|
} |
157 |
|
|
158 |
|
/** |
159 |
< |
* Initializing from too large collection throws IAE |
159 |
> |
* Initializing from too large collection throws IllegalArgumentException |
160 |
|
*/ |
161 |
|
public void testConstructor_collectionTooLarge() { |
162 |
|
// just barely fits - succeeds |
227 |
|
} |
228 |
|
|
229 |
|
/** |
230 |
< |
* add succeeds if not full; throws ISE if full |
230 |
> |
* add succeeds if not full; throws IllegalStateException if full |
231 |
|
*/ |
232 |
|
public void testAdd() { |
233 |
|
ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE); |
240 |
|
} |
241 |
|
|
242 |
|
/** |
243 |
< |
* addAll(this) throws IAE |
243 |
> |
* addAll(this) throws IllegalArgumentException |
244 |
|
*/ |
245 |
|
public void testAddAllSelf() { |
246 |
|
ArrayBlockingQueue q = populatedQueue(SIZE); |
266 |
|
} |
267 |
|
|
268 |
|
/** |
269 |
< |
* addAll throws ISE if not enough room |
269 |
> |
* addAll throws IllegalStateException if not enough room |
270 |
|
*/ |
271 |
|
public void testAddAll_insufficientSpace() { |
272 |
< |
int size = ThreadLocalRandom.current().nextInt(SIZE); |
272 |
> |
int size = ThreadLocalRandom.current().nextInt(1, SIZE); |
273 |
|
ArrayBlockingQueue q = populatedQueue(0, size, size, false); |
274 |
|
// Just fits: |
275 |
|
q.addAll(populatedQueue(size, size, 2 * size, false)); |
340 |
|
}}); |
341 |
|
|
342 |
|
await(pleaseInterrupt); |
343 |
< |
assertThreadStaysAlive(t); |
343 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
344 |
|
t.interrupt(); |
345 |
|
awaitTermination(t); |
346 |
|
assertEquals(SIZE, q.size()); |
362 |
|
pleaseTake.countDown(); |
363 |
|
q.put(86); |
364 |
|
|
365 |
+ |
Thread.currentThread().interrupt(); |
366 |
+ |
try { |
367 |
+ |
q.put(99); |
368 |
+ |
shouldThrow(); |
369 |
+ |
} catch (InterruptedException success) {} |
370 |
+ |
assertFalse(Thread.interrupted()); |
371 |
+ |
|
372 |
|
pleaseInterrupt.countDown(); |
373 |
|
try { |
374 |
|
q.put(99); |
382 |
|
assertEquals(0, q.take()); |
383 |
|
|
384 |
|
await(pleaseInterrupt); |
385 |
< |
assertThreadStaysAlive(t); |
385 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
386 |
|
t.interrupt(); |
387 |
|
awaitTermination(t); |
388 |
|
assertEquals(0, q.remainingCapacity()); |
391 |
|
/** |
392 |
|
* timed offer times out if full and elements not taken |
393 |
|
*/ |
394 |
< |
public void testTimedOffer() throws InterruptedException { |
394 |
> |
public void testTimedOffer() { |
395 |
|
final ArrayBlockingQueue q = new ArrayBlockingQueue(2); |
396 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
397 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
401 |
|
long startTime = System.nanoTime(); |
402 |
|
assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS)); |
403 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
404 |
+ |
|
405 |
+ |
Thread.currentThread().interrupt(); |
406 |
+ |
try { |
407 |
+ |
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
408 |
+ |
shouldThrow(); |
409 |
+ |
} catch (InterruptedException success) {} |
410 |
+ |
assertFalse(Thread.interrupted()); |
411 |
+ |
|
412 |
|
pleaseInterrupt.countDown(); |
413 |
|
try { |
414 |
|
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
415 |
|
shouldThrow(); |
416 |
|
} catch (InterruptedException success) {} |
417 |
+ |
assertFalse(Thread.interrupted()); |
418 |
|
}}); |
419 |
|
|
420 |
|
await(pleaseInterrupt); |
421 |
< |
assertThreadStaysAlive(t); |
421 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
422 |
|
t.interrupt(); |
423 |
|
awaitTermination(t); |
424 |
|
} |
441 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
442 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
443 |
|
public void realRun() throws InterruptedException { |
444 |
< |
for (int i = 0; i < SIZE; ++i) { |
429 |
< |
assertEquals(i, q.take()); |
430 |
< |
} |
444 |
> |
for (int i = 0; i < SIZE; i++) assertEquals(i, q.take()); |
445 |
|
|
446 |
|
Thread.currentThread().interrupt(); |
447 |
|
try { |
459 |
|
}}); |
460 |
|
|
461 |
|
await(pleaseInterrupt); |
462 |
< |
assertThreadStaysAlive(t); |
462 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
463 |
|
t.interrupt(); |
464 |
|
awaitTermination(t); |
465 |
|
} |
509 |
|
*/ |
510 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
511 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
512 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
512 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
513 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
514 |
|
public void realRun() throws InterruptedException { |
515 |
|
long startTime = System.nanoTime(); |
516 |
< |
for (int i = 0; i < SIZE; ++i) { |
516 |
> |
for (int i = 0; i < SIZE; i++) |
517 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
518 |
< |
} |
519 |
< |
aboutToWait.countDown(); |
518 |
> |
|
519 |
> |
Thread.currentThread().interrupt(); |
520 |
> |
try { |
521 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
522 |
> |
shouldThrow(); |
523 |
> |
} catch (InterruptedException success) {} |
524 |
> |
assertFalse(Thread.interrupted()); |
525 |
> |
|
526 |
> |
pleaseInterrupt.countDown(); |
527 |
|
try { |
528 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
529 |
|
shouldThrow(); |
530 |
< |
} catch (InterruptedException success) { |
531 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
532 |
< |
} |
530 |
> |
} catch (InterruptedException success) {} |
531 |
> |
assertFalse(Thread.interrupted()); |
532 |
> |
|
533 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
534 |
|
}}); |
535 |
|
|
536 |
< |
await(aboutToWait); |
537 |
< |
waitForThreadToEnterWaitState(t); |
536 |
> |
await(pleaseInterrupt); |
537 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
538 |
|
t.interrupt(); |
539 |
|
awaitTermination(t); |
540 |
|
checkEmpty(q); |
587 |
|
* contains(x) reports true when elements added but not yet removed |
588 |
|
*/ |
589 |
|
public void testContains() { |
590 |
< |
ArrayBlockingQueue q = populatedQueue(SIZE); |
591 |
< |
for (int i = 0; i < SIZE; ++i) { |
590 |
> |
int size = ThreadLocalRandom.current().nextInt(1, SIZE); |
591 |
> |
ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false); |
592 |
> |
assertFalse(q.contains(null)); |
593 |
> |
for (int i = 0; i < size; ++i) { |
594 |
|
assertTrue(q.contains(new Integer(i))); |
595 |
|
assertEquals(i, q.poll()); |
596 |
|
assertFalse(q.contains(new Integer(i))); |
601 |
|
* clear removes all elements |
602 |
|
*/ |
603 |
|
public void testClear() { |
604 |
< |
ArrayBlockingQueue q = populatedQueue(SIZE); |
604 |
> |
int size = ThreadLocalRandom.current().nextInt(1, 5); |
605 |
> |
ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false); |
606 |
> |
int capacity = size + q.remainingCapacity(); |
607 |
|
q.clear(); |
608 |
|
assertTrue(q.isEmpty()); |
609 |
|
assertEquals(0, q.size()); |
610 |
< |
assertEquals(SIZE, q.remainingCapacity()); |
610 |
> |
assertEquals(capacity, q.remainingCapacity()); |
611 |
|
q.add(one); |
612 |
|
assertFalse(q.isEmpty()); |
613 |
|
assertTrue(q.contains(one)); |
876 |
|
} |
877 |
|
|
878 |
|
/** |
879 |
< |
* A deserialized serialized queue has same elements in same order |
879 |
> |
* A deserialized/reserialized queue has same elements in same order |
880 |
|
*/ |
881 |
|
public void testSerialization() throws Exception { |
882 |
|
Queue x = populatedQueue(SIZE); |
961 |
|
*/ |
962 |
|
public void testNeverContainsNull() { |
963 |
|
Collection<?>[] qs = { |
964 |
< |
new ArrayBlockingQueue<Object>(10), |
965 |
< |
populatedQueue(2), |
964 |
> |
populatedQueue(0, 1, 10, false), |
965 |
> |
populatedQueue(2, 2, 10, true), |
966 |
|
}; |
967 |
|
|
968 |
|
for (Collection<?> q : qs) { |