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.80 by jsr166, Tue Jan 3 07:29:30 2017 UTC vs.
Revision 1.87 by jsr166, Sun May 14 01:30:34 2017 UTC

# Line 115 | Line 115 | public class DelayQueueTest extends JSR1
115       * Returns a new queue of given size containing consecutive
116       * PDelays 0 ... n - 1.
117       */
118 <    private DelayQueue<PDelay> populatedQueue(int n) {
119 <        DelayQueue<PDelay> q = new DelayQueue<PDelay>();
118 >    private static DelayQueue<PDelay> populatedQueue(int n) {
119 >        DelayQueue<PDelay> q = new DelayQueue<>();
120          assertTrue(q.isEmpty());
121          for (int i = n - 1; i >= 0; i -= 2)
122              assertTrue(q.offer(new PDelay(i)));
# 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 674 | Line 673 | public class DelayQueueTest extends JSR1
673       * Delayed actions do not occur until their delay elapses
674       */
675      public void testDelay() throws InterruptedException {
676 <        DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
676 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
677          for (int i = 0; i < SIZE; ++i)
678              q.add(new NanoDelay(1000000L * (SIZE - i)));
679  
# 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