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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.84 by jsr166, Sat May 13 22:17:12 2017 UTC vs.
Revision 1.87 by jsr166, Sun May 14 00:56:43 2017 UTC

# Line 399 | Line 399 | public class ArrayBlockingQueueTest exte
399                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
400                      shouldThrow();
401                  } catch (InterruptedException success) {}
402 +                assertFalse(Thread.interrupted());
403              }});
404  
405          await(pleaseInterrupt);
# Line 493 | Line 494 | public class ArrayBlockingQueueTest exte
494       */
495      public void testInterruptedTimedPoll() throws InterruptedException {
496          final BlockingQueue<Integer> q = populatedQueue(SIZE);
497 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
497 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
498          Thread t = newStartedThread(new CheckedRunnable() {
499              public void realRun() throws InterruptedException {
500                  long startTime = System.nanoTime();
501                  for (int i = 0; i < SIZE; ++i) {
502                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
503                  }
504 <                aboutToWait.countDown();
504 >
505 >                pleaseInterrupt.countDown();
506                  try {
507                      q.poll(LONG_DELAY_MS, MILLISECONDS);
508                      shouldThrow();
509 <                } catch (InterruptedException success) {
510 <                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
511 <                }
509 >                } catch (InterruptedException success) {}
510 >                assertFalse(Thread.interrupted());
511 >
512 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
513              }});
514  
515 <        await(aboutToWait);
516 <        waitForThreadToEnterWaitState(t);
515 >        await(pleaseInterrupt);
516 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
517          t.interrupt();
518          awaitTermination(t);
519          checkEmpty(q);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines