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.89 by jsr166, Mon May 28 21:43:48 2018 UTC vs.
Revision 1.93 by jsr166, Thu Sep 5 21:11:13 2019 UTC

# Line 69 | Line 69 | public class DelayQueueTest extends JSR1
69          // suppress [overrides] javac warning
70          public int hashCode() { return pseudodelay; }
71          public long getDelay(TimeUnit ignore) {
72 <            return Integer.MIN_VALUE + pseudodelay;
72 >            return (long) Integer.MIN_VALUE + pseudodelay;
73          }
74          public String toString() {
75              return String.valueOf(pseudodelay);
# Line 305 | Line 305 | public class DelayQueueTest extends JSR1
305      }
306  
307      /**
308 <     * timed offer does not time out
308 >     * Queue is unbounded, so timed offer never times out
309       */
310      public void testTimedOffer() throws InterruptedException {
311          final DelayQueue q = new DelayQueue();
# Line 357 | Line 357 | public class DelayQueueTest extends JSR1
357              }});
358  
359          await(pleaseInterrupt);
360 <        assertThreadBlocks(t, Thread.State.WAITING);
360 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361          t.interrupt();
362          awaitTermination(t);
363      }
# Line 409 | Line 409 | public class DelayQueueTest extends JSR1
409          final DelayQueue q = populatedQueue(SIZE);
410          Thread t = newStartedThread(new CheckedRunnable() {
411              public void realRun() throws InterruptedException {
412 –                long startTime = System.nanoTime();
412                  for (int i = 0; i < SIZE; i++)
413                      assertEquals(new PDelay(i),
414                                   ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
415  
416                  Thread.currentThread().interrupt();
417                  try {
418 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
418 >                    q.poll(randomTimeout(), randomTimeUnit());
419                      shouldThrow();
420                  } catch (InterruptedException success) {}
421                  assertFalse(Thread.interrupted());
422  
423                  pleaseInterrupt.countDown();
424                  try {
425 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
425 >                    q.poll(LONGER_DELAY_MS, MILLISECONDS);
426                      shouldThrow();
427                  } catch (InterruptedException success) {}
428                  assertFalse(Thread.interrupted());
430 –
431 –                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
429              }});
430  
431          await(pleaseInterrupt);
432 <        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
432 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
433          t.interrupt();
434          awaitTermination(t);
435          checkEmpty(q);

Diff Legend

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