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.75 by jsr166, Sun Oct 4 18:49:02 2015 UTC vs.
Revision 1.78 by jsr166, Sun Oct 16 20:44:18 2016 UTC

# Line 94 | Line 94 | public class DelayQueueTest extends JSR1
94          }
95  
96          public boolean equals(Object other) {
97 <            return equals((NanoDelay)other);
98 <        }
99 <        public boolean equals(NanoDelay other) {
100 <            return other.trigger == trigger;
97 >            return (other instanceof NanoDelay) &&
98 >                this.trigger == ((NanoDelay)other).trigger;
99          }
100  
101          // suppress [overrides] javac warning
# Line 119 | Line 117 | public class DelayQueueTest extends JSR1
117  
118      /**
119       * Returns a new queue of given size containing consecutive
120 <     * PDelays 0 ... n.
120 >     * PDelays 0 ... n - 1.
121       */
122      private DelayQueue<PDelay> populatedQueue(int n) {
123          DelayQueue<PDelay> q = new DelayQueue<PDelay>();
# Line 131 | Line 129 | public class DelayQueueTest extends JSR1
129          assertFalse(q.isEmpty());
130          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
131          assertEquals(n, q.size());
132 +        assertEquals(new PDelay(0), q.peek());
133          return q;
134      }
135  
# Line 412 | Line 411 | public class DelayQueueTest extends JSR1
411       */
412      public void testInterruptedTimedPoll() throws InterruptedException {
413          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
414 +        final DelayQueue q = populatedQueue(SIZE);
415          Thread t = newStartedThread(new CheckedRunnable() {
416              public void realRun() throws InterruptedException {
417 <                DelayQueue q = populatedQueue(SIZE);
417 >                long startTime = System.nanoTime();
418                  for (int i = 0; i < SIZE; ++i) {
419 <                    assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
419 >                    assertEquals(new PDelay(i),
420 >                                 ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
421                  }
422  
423                  Thread.currentThread().interrupt();
# Line 432 | Line 433 | public class DelayQueueTest extends JSR1
433                      shouldThrow();
434                  } catch (InterruptedException success) {}
435                  assertFalse(Thread.interrupted());
436 +                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
437              }});
438  
439          await(pleaseInterrupt);
440          assertThreadStaysAlive(t);
441          t.interrupt();
442          awaitTermination(t);
443 +        checkEmpty(q);
444      }
445  
446      /**

Diff Legend

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