ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.74 by jsr166, Sat May 13 22:49:01 2017 UTC vs.
Revision 1.76 by jsr166, Sun May 14 01:30:34 2017 UTC

# Line 400 | Line 400 | public class PriorityBlockingQueueTest e
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);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines