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()); |
314 |
|
pleaseTake.countDown(); |
315 |
|
q.put(86); |
316 |
|
|
317 |
+ |
Thread.currentThread().interrupt(); |
318 |
+ |
try { |
319 |
+ |
q.put(99); |
320 |
+ |
shouldThrow(); |
321 |
+ |
} catch (InterruptedException success) {} |
322 |
+ |
assertFalse(Thread.interrupted()); |
323 |
+ |
|
324 |
|
pleaseInterrupt.countDown(); |
325 |
|
try { |
326 |
|
q.put(99); |
334 |
|
assertEquals(0, q.take()); |
335 |
|
|
336 |
|
await(pleaseInterrupt); |
337 |
< |
assertThreadStaysAlive(t); |
337 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
338 |
|
t.interrupt(); |
339 |
|
awaitTermination(t); |
340 |
|
assertEquals(0, q.remainingCapacity()); |
358 |
|
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
359 |
|
shouldThrow(); |
360 |
|
} catch (InterruptedException success) {} |
361 |
+ |
assertFalse(Thread.interrupted()); |
362 |
|
}}); |
363 |
|
|
364 |
|
await(pleaseInterrupt); |
365 |
< |
assertThreadStaysAlive(t); |
365 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
366 |
|
t.interrupt(); |
367 |
|
awaitTermination(t); |
368 |
|
} |
385 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
386 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
387 |
|
public void realRun() throws InterruptedException { |
388 |
< |
for (int i = 0; i < SIZE; ++i) { |
381 |
< |
assertEquals(i, q.take()); |
382 |
< |
} |
388 |
> |
for (int i = 0; i < SIZE; i++) assertEquals(i, q.take()); |
389 |
|
|
390 |
|
Thread.currentThread().interrupt(); |
391 |
|
try { |
403 |
|
}}); |
404 |
|
|
405 |
|
await(pleaseInterrupt); |
406 |
< |
assertThreadStaysAlive(t); |
406 |
> |
assertThreadBlocks(t, Thread.State.WAITING); |
407 |
|
t.interrupt(); |
408 |
|
awaitTermination(t); |
409 |
|
} |
452 |
|
*/ |
453 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
454 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
455 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
455 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
456 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
457 |
|
public void realRun() throws InterruptedException { |
458 |
|
long startTime = System.nanoTime(); |
459 |
< |
for (int i = 0; i < SIZE; ++i) { |
459 |
> |
for (int i = 0; i < SIZE; i++) |
460 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
461 |
< |
} |
462 |
< |
aboutToWait.countDown(); |
461 |
> |
|
462 |
> |
Thread.currentThread().interrupt(); |
463 |
|
try { |
464 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
465 |
|
shouldThrow(); |
466 |
< |
} catch (InterruptedException success) { |
467 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
468 |
< |
} |
466 |
> |
} catch (InterruptedException success) {} |
467 |
> |
assertFalse(Thread.interrupted()); |
468 |
> |
|
469 |
> |
pleaseInterrupt.countDown(); |
470 |
> |
try { |
471 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
472 |
> |
shouldThrow(); |
473 |
> |
} catch (InterruptedException success) {} |
474 |
> |
assertFalse(Thread.interrupted()); |
475 |
> |
|
476 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
477 |
|
}}); |
478 |
|
|
479 |
< |
await(aboutToWait); |
480 |
< |
waitForThreadToEnterWaitState(t); |
479 |
> |
await(pleaseInterrupt); |
480 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
481 |
|
t.interrupt(); |
482 |
|
awaitTermination(t); |
483 |
|
checkEmpty(q); |