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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.82 by jsr166, Sat Mar 11 18:20:47 2017 UTC vs.
Revision 1.88 by jsr166, Mon May 29 22:44:26 2017 UTC

# Line 234 | Line 234 | public class DelayQueueTest extends JSR1
234      }
235  
236      /**
237 <     * addAll(this) throws IAE
237 >     * addAll(this) throws IllegalArgumentException
238       */
239      public void testAddAllSelf() {
240          DelayQueue q = populatedQueue(SIZE);
# Line 338 | Line 338 | public class DelayQueueTest extends JSR1
338          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
339          Thread t = newStartedThread(new CheckedRunnable() {
340              public void realRun() throws InterruptedException {
341 <                for (int i = 0; i < SIZE; ++i) {
341 >                for (int i = 0; i < SIZE; i++)
342                      assertEquals(new PDelay(i), ((PDelay)q.take()));
343 –                }
343  
344                  Thread.currentThread().interrupt();
345                  try {
# Line 358 | Line 357 | public class DelayQueueTest extends JSR1
357              }});
358  
359          await(pleaseInterrupt);
360 <        assertThreadStaysAlive(t);
360 >        assertThreadBlocks(t, Thread.State.WAITING);
361          t.interrupt();
362          awaitTermination(t);
363      }
# Line 411 | Line 410 | public class DelayQueueTest extends JSR1
410          Thread t = newStartedThread(new CheckedRunnable() {
411              public void realRun() throws InterruptedException {
412                  long startTime = System.nanoTime();
413 <                for (int i = 0; i < SIZE; ++i) {
413 >                for (int i = 0; i < SIZE; i++)
414                      assertEquals(new PDelay(i),
415                                   ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
417 –                }
416  
417                  Thread.currentThread().interrupt();
418                  try {
# Line 429 | Line 427 | public class DelayQueueTest extends JSR1
427                      shouldThrow();
428                  } catch (InterruptedException success) {}
429                  assertFalse(Thread.interrupted());
430 +
431                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
432              }});
433  
434          await(pleaseInterrupt);
435 <        assertThreadStaysAlive(t);
435 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
436          t.interrupt();
437          awaitTermination(t);
438          checkEmpty(q);
# Line 714 | Line 713 | public class DelayQueueTest extends JSR1
713      public void testTimedPollDelayed() throws InterruptedException {
714          DelayQueue q = new DelayQueue();
715          q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
716 +        long startTime = System.nanoTime();
717          assertNull(q.poll(timeoutMillis(), MILLISECONDS));
718 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
719      }
720  
721      /**

Diff Legend

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