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.79 by jsr166, Mon Oct 17 01:54:51 2016 UTC vs.
Revision 1.92 by jsr166, Thu Sep 5 20:54:24 2019 UTC

# Line 52 | Line 52 | public class DelayQueueTest extends JSR1
52      }
53  
54      /**
55 <     * A delayed implementation for testing.
56 <     * Most tests use Pseudodelays, where delays are all elapsed
55 >     * A fake Delayed implementation for testing.
56 >     * Most tests use PDelays, where delays are all elapsed
57       * (so, no blocking solely for delays) but are still ordered
58       */
59      static class PDelay implements Delayed {
60 <        int pseudodelay;
61 <        PDelay(int i) { pseudodelay = i; }
62 <        public int compareTo(PDelay other) {
63 <            int a = this.pseudodelay;
64 <            int b = other.pseudodelay;
65 <            return (a < b) ? -1 : (a > b) ? 1 : 0;
66 <        }
60 >        final int pseudodelay;
61 >        PDelay(int pseudodelay) { this.pseudodelay = pseudodelay; }
62          public int compareTo(Delayed y) {
63 <            return compareTo((PDelay)y);
63 >            return Integer.compare(this.pseudodelay, ((PDelay)y).pseudodelay);
64          }
65          public boolean equals(Object other) {
66              return (other instanceof PDelay) &&
# Line 74 | 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 85 | Line 80 | public class DelayQueueTest extends JSR1
80       * Delayed implementation that actually delays
81       */
82      static class NanoDelay implements Delayed {
83 <        long trigger;
83 >        final long trigger;
84          NanoDelay(long i) {
85              trigger = System.nanoTime() + i;
86          }
92 –        public int compareTo(NanoDelay y) {
93 –            long i = trigger;
94 –            long j = y.trigger;
95 –            if (i < j) return -1;
96 –            if (i > j) return 1;
97 –            return 0;
98 –        }
87  
88          public int compareTo(Delayed y) {
89 <            return compareTo((NanoDelay)y);
89 >            return Long.compare(trigger, ((NanoDelay)y).trigger);
90          }
91  
92          public boolean equals(Object other) {
# Line 127 | 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 246 | 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 317 | 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 350 | 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()));
355 –                }
343  
344                  Thread.currentThread().interrupt();
345                  try {
# Line 370 | Line 357 | public class DelayQueueTest extends JSR1
357              }});
358  
359          await(pleaseInterrupt);
360 <        assertThreadStaysAlive(t);
360 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
361          t.interrupt();
362          awaitTermination(t);
363      }
# Line 423 | 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)));
429 –                }
416  
417                  Thread.currentThread().interrupt();
418                  try {
419 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
419 >                    q.poll(randomTimeout(), randomTimeUnit());
420                      shouldThrow();
421                  } catch (InterruptedException success) {}
422                  assertFalse(Thread.interrupted());
# Line 441 | 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 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
436          t.interrupt();
437          awaitTermination(t);
438          checkEmpty(q);
# Line 579 | Line 566 | public class DelayQueueTest extends JSR1
566       */
567      public void testToArray() throws InterruptedException {
568          DelayQueue q = populatedQueue(SIZE);
569 <        Object[] o = q.toArray();
570 <        Arrays.sort(o);
571 <        for (int i = 0; i < o.length; i++)
572 <            assertSame(o[i], q.take());
569 >        Object[] a = q.toArray();
570 >        assertSame(Object[].class, a.getClass());
571 >        Arrays.sort(a);
572 >        for (Object o : a)
573 >            assertSame(o, q.take());
574 >        assertTrue(q.isEmpty());
575      }
576  
577      /**
# Line 594 | Line 583 | public class DelayQueueTest extends JSR1
583          PDelay[] array = q.toArray(ints);
584          assertSame(ints, array);
585          Arrays.sort(ints);
586 <        for (int i = 0; i < ints.length; i++)
587 <            assertSame(ints[i], q.remove());
586 >        for (PDelay o : ints)
587 >            assertSame(o, q.remove());
588 >        assertTrue(q.isEmpty());
589      }
590  
591      /**
# Line 686 | Line 676 | public class DelayQueueTest extends JSR1
676       * Delayed actions do not occur until their delay elapses
677       */
678      public void testDelay() throws InterruptedException {
679 <        DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
679 >        DelayQueue<NanoDelay> q = new DelayQueue<>();
680          for (int i = 0; i < SIZE; ++i)
681              q.add(new NanoDelay(1000000L * (SIZE - i)));
682  
# Line 726 | Line 716 | public class DelayQueueTest extends JSR1
716      public void testTimedPollDelayed() throws InterruptedException {
717          DelayQueue q = new DelayQueue();
718          q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
719 +        long startTime = System.nanoTime();
720          assertNull(q.poll(timeoutMillis(), MILLISECONDS));
721 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
722      }
723  
724      /**

Diff Legend

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