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.71 by jsr166, Sat Mar 11 18:20:47 2017 UTC vs.
Revision 1.75 by jsr166, Sun May 14 00:48:20 2017 UTC

# Line 333 | Line 333 | public class PriorityBlockingQueueTest e
333          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
334          Thread t = newStartedThread(new CheckedRunnable() {
335              public void realRun() throws InterruptedException {
336 <                for (int i = 0; i < SIZE; ++i) {
337 <                    assertEquals(i, q.take());
338 <                }
336 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
337  
338                  Thread.currentThread().interrupt();
339                  try {
# Line 353 | Line 351 | public class PriorityBlockingQueueTest e
351              }});
352  
353          await(pleaseInterrupt);
354 <        assertThreadStaysAlive(t);
354 >        assertThreadBlocks(t, Thread.State.WAITING);
355          t.interrupt();
356          awaitTermination(t);
357      }
# Line 402 | 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) {
408                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
409                  }
410 <                aboutToWait.countDown();
410 >
411 >                pleaseInterrupt.countDown();
412                  try {
413                      q.poll(LONG_DELAY_MS, MILLISECONDS);
414                      shouldThrow();
415 <                } catch (InterruptedException success) {
416 <                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
417 <                }
415 >                } catch (InterruptedException success) {}
416 >                assertFalse(Thread.interrupted());
417 >
418 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
419              }});
420  
421 <        aboutToWait.await();
422 <        waitForThreadToEnterWaitState(t);
421 >        await(pleaseInterrupt);
422 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
423          t.interrupt();
424          awaitTermination(t);
425      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines