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.73 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.90 by jsr166, Sun Jul 22 21:42:14 2018 UTC

# Line 39 | Line 39 | public class DelayQueueTest extends JSR1
39      }
40  
41      public static Test suite() {
42 +        class Implementation implements CollectionImplementation {
43 +            public Class<?> klazz() { return DelayQueue.class; }
44 +            public Collection emptyCollection() { return new DelayQueue(); }
45 +            public Object makeElement(int i) { return new PDelay(i); }
46 +            public boolean isConcurrent() { return true; }
47 +            public boolean permitsNulls() { return false; }
48 +        }
49          return newTestSuite(DelayQueueTest.class,
50 <                            new Generic().testSuite());
50 >                            new Generic().testSuite(),
51 >                            CollectionTest.testSuite(new Implementation()));
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; }
54 <        public int compareTo(PDelay other) {
55 <            int a = this.pseudodelay;
56 <            int b = other.pseudodelay;
57 <            return (a < b) ? -1 : (a > b) ? 1 : 0;
58 <        }
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 66 | 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 77 | 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          }
84 –        public int compareTo(NanoDelay y) {
85 –            long i = trigger;
86 –            long j = y.trigger;
87 –            if (i < j) return -1;
88 –            if (i > j) return 1;
89 –            return 0;
90 –        }
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) {
93 <            return equals((NanoDelay)other);
94 <        }
99 <        public boolean equals(NanoDelay other) {
100 <            return other.trigger == trigger;
93 >            return (other instanceof NanoDelay) &&
94 >                this.trigger == ((NanoDelay)other).trigger;
95          }
96  
97          // suppress [overrides] javac warning
# Line 119 | Line 113 | public class DelayQueueTest extends JSR1
113  
114      /**
115       * Returns a new queue of given size containing consecutive
116 <     * PDelays 0 ... n.
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)
121 >        for (int i = n - 1; i >= 0; i -= 2)
122              assertTrue(q.offer(new PDelay(i)));
123          for (int i = (n & 1); i < n; i += 2)
124              assertTrue(q.offer(new PDelay(i)));
125          assertFalse(q.isEmpty());
126          assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
127          assertEquals(n, q.size());
128 +        assertEquals(new PDelay(0), q.peek());
129          return q;
130      }
131  
# Line 239 | 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 343 | 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()));
348 –                }
343  
344                  Thread.currentThread().interrupt();
345                  try {
# Line 363 | 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 412 | Line 406 | public class DelayQueueTest extends JSR1
406       */
407      public void testInterruptedTimedPoll() throws InterruptedException {
408          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
409 +        final DelayQueue q = populatedQueue(SIZE);
410          Thread t = newStartedThread(new CheckedRunnable() {
411              public void realRun() throws InterruptedException {
412 <                DelayQueue q = populatedQueue(SIZE);
413 <                for (int i = 0; i < SIZE; ++i) {
414 <                    assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
415 <                }
412 >                long startTime = System.nanoTime();
413 >                for (int i = 0; i < SIZE; i++)
414 >                    assertEquals(new PDelay(i),
415 >                                 ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
416  
417                  Thread.currentThread().interrupt();
418                  try {
# Line 432 | 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);
439      }
440  
441      /**
# Line 568 | 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 583 | 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 653 | Line 654 | public class DelayQueueTest extends JSR1
654      public void testPollInExecutor() {
655          final DelayQueue q = new DelayQueue();
656          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
657 <        ExecutorService executor = Executors.newFixedThreadPool(2);
658 <        executor.execute(new CheckedRunnable() {
659 <            public void realRun() throws InterruptedException {
660 <                assertNull(q.poll());
661 <                threadsStarted.await();
662 <                assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
663 <                checkEmpty(q);
664 <            }});
665 <
666 <        executor.execute(new CheckedRunnable() {
667 <            public void realRun() throws InterruptedException {
668 <                threadsStarted.await();
669 <                q.put(new PDelay(1));
670 <            }});
671 <
672 <        joinPool(executor);
657 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
658 >        try (PoolCleaner cleaner = cleaner(executor)) {
659 >            executor.execute(new CheckedRunnable() {
660 >                public void realRun() throws InterruptedException {
661 >                    assertNull(q.poll());
662 >                    threadsStarted.await();
663 >                    assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
664 >                    checkEmpty(q);
665 >                }});
666 >
667 >            executor.execute(new CheckedRunnable() {
668 >                public void realRun() throws InterruptedException {
669 >                    threadsStarted.await();
670 >                    q.put(new PDelay(1));
671 >                }});
672 >        }
673      }
674  
675      /**
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 715 | 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