58 |
|
* Returns a new queue of given size containing consecutive |
59 |
|
* Integers 0 ... n - 1. |
60 |
|
*/ |
61 |
< |
private LinkedBlockingQueue<Integer> populatedQueue(int n) { |
61 |
> |
private static LinkedBlockingQueue<Integer> populatedQueue(int n) { |
62 |
|
LinkedBlockingQueue<Integer> q = |
63 |
|
new LinkedBlockingQueue<Integer>(n); |
64 |
|
assertTrue(q.isEmpty()); |
292 |
|
}}); |
293 |
|
|
294 |
|
await(pleaseInterrupt); |
295 |
< |
assertThreadStaysAlive(t); |
295 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
296 |
|
t.interrupt(); |
297 |
|
awaitTermination(t); |
298 |
|
assertEquals(SIZE, q.size()); |
327 |
|
assertEquals(0, q.take()); |
328 |
|
|
329 |
|
await(pleaseInterrupt); |
330 |
< |
assertThreadStaysAlive(t); |
330 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
331 |
|
t.interrupt(); |
332 |
|
awaitTermination(t); |
333 |
|
assertEquals(0, q.remainingCapacity()); |
354 |
|
}}); |
355 |
|
|
356 |
|
await(pleaseInterrupt); |
357 |
< |
assertThreadStaysAlive(t); |
357 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
358 |
|
t.interrupt(); |
359 |
|
awaitTermination(t); |
360 |
|
} |
377 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
378 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
379 |
|
public void realRun() throws InterruptedException { |
380 |
< |
for (int i = 0; i < SIZE; ++i) { |
381 |
< |
assertEquals(i, q.take()); |
382 |
< |
} |
380 |
> |
for (int i = 0; i < SIZE; i++) assertEquals(i, q.take()); |
381 |
|
|
382 |
|
Thread.currentThread().interrupt(); |
383 |
|
try { |
395 |
|
}}); |
396 |
|
|
397 |
|
await(pleaseInterrupt); |
398 |
< |
assertThreadStaysAlive(t); |
398 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
399 |
|
t.interrupt(); |
400 |
|
awaitTermination(t); |
401 |
|
} |
444 |
|
*/ |
445 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
446 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
447 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
447 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
448 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
449 |
|
public void realRun() throws InterruptedException { |
450 |
|
long startTime = System.nanoTime(); |
451 |
|
for (int i = 0; i < SIZE; ++i) { |
452 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
453 |
|
} |
454 |
< |
aboutToWait.countDown(); |
454 |
> |
|
455 |
> |
pleaseInterrupt.countDown(); |
456 |
|
try { |
457 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
458 |
|
shouldThrow(); |
459 |
< |
} catch (InterruptedException success) { |
460 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
461 |
< |
} |
459 |
> |
} catch (InterruptedException success) {} |
460 |
> |
assertFalse(Thread.interrupted()); |
461 |
> |
|
462 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
463 |
|
}}); |
464 |
|
|
465 |
< |
await(aboutToWait); |
466 |
< |
waitForThreadToEnterWaitState(t); |
465 |
> |
await(pleaseInterrupt); |
466 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
467 |
|
t.interrupt(); |
468 |
|
awaitTermination(t); |
469 |
|
checkEmpty(q); |