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()); |
350 |
|
public void realRun() throws InterruptedException { |
351 |
|
q.put(new Object()); |
352 |
|
q.put(new Object()); |
353 |
+ |
|
354 |
|
long startTime = System.nanoTime(); |
355 |
|
assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS)); |
356 |
|
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
357 |
+ |
|
358 |
+ |
Thread.currentThread().interrupt(); |
359 |
+ |
try { |
360 |
+ |
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
361 |
+ |
shouldThrow(); |
362 |
+ |
} catch (InterruptedException success) {} |
363 |
+ |
assertFalse(Thread.interrupted()); |
364 |
+ |
|
365 |
|
pleaseInterrupt.countDown(); |
366 |
|
try { |
367 |
|
q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS); |
368 |
|
shouldThrow(); |
369 |
|
} catch (InterruptedException success) {} |
370 |
+ |
assertFalse(Thread.interrupted()); |
371 |
|
}}); |
372 |
|
|
373 |
|
await(pleaseInterrupt); |
374 |
< |
assertThreadStaysAlive(t); |
374 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
375 |
|
t.interrupt(); |
376 |
|
awaitTermination(t); |
377 |
|
} |
461 |
|
*/ |
462 |
|
public void testInterruptedTimedPoll() throws InterruptedException { |
463 |
|
final BlockingQueue<Integer> q = populatedQueue(SIZE); |
464 |
< |
final CountDownLatch aboutToWait = new CountDownLatch(1); |
464 |
> |
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
465 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
466 |
|
public void realRun() throws InterruptedException { |
467 |
|
long startTime = System.nanoTime(); |
468 |
< |
for (int i = 0; i < SIZE; ++i) { |
468 |
> |
for (int i = 0; i < SIZE; i++) |
469 |
|
assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS)); |
470 |
< |
} |
471 |
< |
aboutToWait.countDown(); |
470 |
> |
|
471 |
> |
Thread.currentThread().interrupt(); |
472 |
> |
try { |
473 |
> |
q.poll(LONG_DELAY_MS, MILLISECONDS); |
474 |
> |
shouldThrow(); |
475 |
> |
} catch (InterruptedException success) {} |
476 |
> |
assertFalse(Thread.interrupted()); |
477 |
> |
|
478 |
> |
pleaseInterrupt.countDown(); |
479 |
|
try { |
480 |
|
q.poll(LONG_DELAY_MS, MILLISECONDS); |
481 |
|
shouldThrow(); |
482 |
< |
} catch (InterruptedException success) { |
483 |
< |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
484 |
< |
} |
482 |
> |
} catch (InterruptedException success) {} |
483 |
> |
assertFalse(Thread.interrupted()); |
484 |
> |
|
485 |
> |
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
486 |
|
}}); |
487 |
|
|
488 |
< |
await(aboutToWait); |
489 |
< |
waitForThreadToEnterWaitState(t); |
488 |
> |
await(pleaseInterrupt); |
489 |
> |
assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
490 |
|
t.interrupt(); |
491 |
|
awaitTermination(t); |
492 |
|
checkEmpty(q); |