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.50 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.70 by jsr166, Sat Feb 28 19:59:23 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.concurrent.*;
10 >
11 > import java.util.ArrayList;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Iterator;
15 > import java.util.NoSuchElementException;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Delayed;
19 > import java.util.concurrent.DelayQueue;
20 > import java.util.concurrent.Executors;
21 > import java.util.concurrent.ExecutorService;
22 > import java.util.concurrent.TimeUnit;
23 >
24 > import junit.framework.Test;
25  
26   public class DelayQueueTest extends JSR166TestCase {
27 +
28 +    public static class Generic extends BlockingQueueTest {
29 +        protected BlockingQueue emptyCollection() {
30 +            return new DelayQueue();
31 +        }
32 +        protected PDelay makeElement(int i) {
33 +            return new PDelay(i);
34 +        }
35 +    }
36 +
37      public static void main(String[] args) {
38          junit.textui.TestRunner.run(suite());
39      }
40  
41      public static Test suite() {
42 <        return new TestSuite(DelayQueueTest.class);
42 >        return newTestSuite(DelayQueueTest.class,
43 >                            new Generic().testSuite());
44      }
45  
23    private static final int NOCAP = Integer.MAX_VALUE;
24
46      /**
47       * A delayed implementation for testing.
48       * Most tests use Pseudodelays, where delays are all elapsed
# Line 29 | Line 50 | public class DelayQueueTest extends JSR1
50       */
51      static class PDelay implements Delayed {
52          int pseudodelay;
53 <        PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54 <        public int compareTo(PDelay y) {
55 <            int i = pseudodelay;
56 <            int j = y.pseudodelay;
57 <            if (i < j) return -1;
37 <            if (i > j) return 1;
38 <            return 0;
53 >        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          }
40
59          public int compareTo(Delayed y) {
60              return compareTo((PDelay)y);
61          }
44
62          public boolean equals(Object other) {
63 <            return equals((PDelay)other);
64 <        }
48 <        public boolean equals(PDelay other) {
49 <            return other.pseudodelay == pseudodelay;
63 >            return (other instanceof PDelay) &&
64 >                this.pseudodelay == ((PDelay)other).pseudodelay;
65          }
66 <
66 >        // suppress [overrides] javac warning
67 >        public int hashCode() { return pseudodelay; }
68          public long getDelay(TimeUnit ignore) {
69 <            return pseudodelay;
54 <        }
55 <        public int intValue() {
56 <            return pseudodelay;
69 >            return Integer.MIN_VALUE + pseudodelay;
70          }
58
71          public String toString() {
72              return String.valueOf(pseudodelay);
73          }
# Line 88 | Line 100 | public class DelayQueueTest extends JSR1
100              return other.trigger == trigger;
101          }
102  
103 +        // suppress [overrides] javac warning
104 +        public int hashCode() { return (int) trigger; }
105 +
106          public long getDelay(TimeUnit unit) {
107              long n = trigger - System.nanoTime();
108              return unit.convert(n, TimeUnit.NANOSECONDS);
# Line 103 | Line 118 | public class DelayQueueTest extends JSR1
118      }
119  
120      /**
121 <     * Create a queue of given size containing consecutive
121 >     * Returns a new queue of given size containing consecutive
122       * PDelays 0 ... n.
123       */
124      private DelayQueue<PDelay> populatedQueue(int n) {
125          DelayQueue<PDelay> q = new DelayQueue<PDelay>();
126          assertTrue(q.isEmpty());
127 <        for (int i = n-1; i >= 0; i-=2)
127 >        for (int i = n-1; i >= 0; i -= 2)
128              assertTrue(q.offer(new PDelay(i)));
129 <        for (int i = (n & 1); i < n; i+=2)
129 >        for (int i = (n & 1); i < n; i += 2)
130              assertTrue(q.offer(new PDelay(i)));
131          assertFalse(q.isEmpty());
132 <        assertEquals(NOCAP, q.remainingCapacity());
132 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
133          assertEquals(n, q.size());
134          return q;
135      }
# Line 123 | Line 138 | public class DelayQueueTest extends JSR1
138       * A new queue has unbounded capacity
139       */
140      public void testConstructor1() {
141 <        assertEquals(NOCAP, new DelayQueue().remainingCapacity());
141 >        assertEquals(Integer.MAX_VALUE, new DelayQueue().remainingCapacity());
142      }
143  
144      /**
# Line 131 | Line 146 | public class DelayQueueTest extends JSR1
146       */
147      public void testConstructor3() {
148          try {
149 <            DelayQueue q = new DelayQueue(null);
149 >            new DelayQueue(null);
150              shouldThrow();
151          } catch (NullPointerException success) {}
152      }
# Line 142 | Line 157 | public class DelayQueueTest extends JSR1
157      public void testConstructor4() {
158          try {
159              PDelay[] ints = new PDelay[SIZE];
160 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
160 >            new DelayQueue(Arrays.asList(ints));
161              shouldThrow();
162          } catch (NullPointerException success) {}
163      }
# Line 155 | Line 170 | public class DelayQueueTest extends JSR1
170              PDelay[] ints = new PDelay[SIZE];
171              for (int i = 0; i < SIZE-1; ++i)
172                  ints[i] = new PDelay(i);
173 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
173 >            new DelayQueue(Arrays.asList(ints));
174              shouldThrow();
175          } catch (NullPointerException success) {}
176      }
# Line 178 | Line 193 | public class DelayQueueTest extends JSR1
193      public void testEmpty() {
194          DelayQueue q = new DelayQueue();
195          assertTrue(q.isEmpty());
196 <        assertEquals(NOCAP, q.remainingCapacity());
196 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
197          q.add(new PDelay(1));
198          assertFalse(q.isEmpty());
199          q.add(new PDelay(2));
# Line 188 | Line 203 | public class DelayQueueTest extends JSR1
203      }
204  
205      /**
206 <     * remainingCapacity does not change when elements added or removed,
192 <     * but size does
206 >     * remainingCapacity() always returns Integer.MAX_VALUE
207       */
208      public void testRemainingCapacity() {
209 <        DelayQueue q = populatedQueue(SIZE);
209 >        BlockingQueue q = populatedQueue(SIZE);
210          for (int i = 0; i < SIZE; ++i) {
211 <            assertEquals(NOCAP, q.remainingCapacity());
211 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
212              assertEquals(SIZE-i, q.size());
213 <            q.remove();
213 >            assertTrue(q.remove() instanceof PDelay);
214          }
215          for (int i = 0; i < SIZE; ++i) {
216 <            assertEquals(NOCAP, q.remainingCapacity());
216 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
217              assertEquals(i, q.size());
218 <            q.add(new PDelay(i));
218 >            assertTrue(q.add(new PDelay(i)));
219          }
220      }
221  
222      /**
209     * offer(null) throws NPE
210     */
211    public void testOfferNull() {
212        try {
213            DelayQueue q = new DelayQueue();
214            q.offer(null);
215            shouldThrow();
216        } catch (NullPointerException success) {}
217    }
218
219    /**
220     * add(null) throws NPE
221     */
222    public void testAddNull() {
223        try {
224            DelayQueue q = new DelayQueue();
225            q.add(null);
226            shouldThrow();
227        } catch (NullPointerException success) {}
228    }
229
230    /**
223       * offer non-null succeeds
224       */
225      public void testOffer() {
# Line 248 | Line 240 | public class DelayQueueTest extends JSR1
240      }
241  
242      /**
251     * addAll(null) throws NPE
252     */
253    public void testAddAll1() {
254        try {
255            DelayQueue q = new DelayQueue();
256            q.addAll(null);
257            shouldThrow();
258        } catch (NullPointerException success) {}
259    }
260
261    /**
243       * addAll(this) throws IAE
244       */
245      public void testAddAllSelf() {
# Line 270 | Line 251 | public class DelayQueueTest extends JSR1
251      }
252  
253      /**
273     * addAll of a collection with null elements throws NPE
274     */
275    public void testAddAll2() {
276        try {
277            DelayQueue q = new DelayQueue();
278            PDelay[] ints = new PDelay[SIZE];
279            q.addAll(Arrays.asList(ints));
280            shouldThrow();
281        } catch (NullPointerException success) {}
282    }
283
284    /**
254       * addAll of a collection with any null elements throws NPE after
255       * possibly adding some elements
256       */
# Line 312 | Line 281 | public class DelayQueueTest extends JSR1
281      }
282  
283      /**
315     * put(null) throws NPE
316     */
317    public void testPutNull() {
318        try {
319            DelayQueue q = new DelayQueue();
320            q.put(null);
321            shouldThrow();
322        } catch (NullPointerException success) {}
323    }
324
325    /**
284       * all elements successfully put are contained
285       */
286      public void testPut() {
287          DelayQueue q = new DelayQueue();
288          for (int i = 0; i < SIZE; ++i) {
289 <            PDelay I = new PDelay(i);
290 <            q.put(I);
291 <            assertTrue(q.contains(I));
289 >            PDelay x = new PDelay(i);
290 >            q.put(x);
291 >            assertTrue(q.contains(x));
292          }
293          assertEquals(SIZE, q.size());
294      }
# Line 374 | Line 332 | public class DelayQueueTest extends JSR1
332      public void testTake() throws InterruptedException {
333          DelayQueue q = populatedQueue(SIZE);
334          for (int i = 0; i < SIZE; ++i) {
335 <            assertEquals(new PDelay(i), ((PDelay)q.take()));
335 >            assertEquals(new PDelay(i), q.take());
336          }
337      }
338  
339      /**
382     * take blocks interruptibly when empty
383     */
384    public void testTakeFromEmptyBlocksInterruptibly()
385            throws InterruptedException {
386        final BlockingQueue q = new DelayQueue();
387        final CountDownLatch threadStarted = new CountDownLatch(1);
388        Thread t = newStartedThread(new CheckedRunnable() {
389            public void realRun() {
390                threadStarted.countDown();
391                try {
392                    q.take();
393                    shouldThrow();
394                } catch (InterruptedException success) {}
395                assertFalse(Thread.interrupted());
396            }});
397
398        await(threadStarted);
399        assertThreadStaysAlive(t);
400        t.interrupt();
401        awaitTermination(t);
402    }
403
404    /**
340       * Take removes existing elements until empty, then blocks interruptibly
341       */
342      public void testBlockingTake() throws InterruptedException {
# Line 440 | Line 375 | public class DelayQueueTest extends JSR1
375      public void testPoll() {
376          DelayQueue q = populatedQueue(SIZE);
377          for (int i = 0; i < SIZE; ++i) {
378 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
378 >            assertEquals(new PDelay(i), q.poll());
379          }
380          assertNull(q.poll());
381      }
# Line 451 | Line 386 | public class DelayQueueTest extends JSR1
386      public void testTimedPoll0() throws InterruptedException {
387          DelayQueue q = populatedQueue(SIZE);
388          for (int i = 0; i < SIZE; ++i) {
389 <            assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
389 >            assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
390          }
391          assertNull(q.poll(0, MILLISECONDS));
392      }
# Line 462 | Line 397 | public class DelayQueueTest extends JSR1
397      public void testTimedPoll() throws InterruptedException {
398          DelayQueue q = populatedQueue(SIZE);
399          for (int i = 0; i < SIZE; ++i) {
400 <            assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
400 >            long startTime = System.nanoTime();
401 >            assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
402 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
403          }
404 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
404 >        long startTime = System.nanoTime();
405 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
406 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
407 >        checkEmpty(q);
408      }
409  
410      /**
# Line 502 | Line 442 | public class DelayQueueTest extends JSR1
442      }
443  
444      /**
505     * timed poll before a delayed offer fails; after offer succeeds;
506     * on interruption throws
507     */
508    public void testTimedPollWithOffer() throws InterruptedException {
509        final DelayQueue q = new DelayQueue();
510        final PDelay pdelay = new PDelay(0);
511        final CheckedBarrier barrier = new CheckedBarrier(2);
512        Thread t = newStartedThread(new CheckedRunnable() {
513            public void realRun() throws InterruptedException {
514                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
515
516                barrier.await();
517                assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
518
519                Thread.currentThread().interrupt();
520                try {
521                    q.poll(LONG_DELAY_MS, MILLISECONDS);
522                    shouldThrow();
523                } catch (InterruptedException success) {}
524                assertFalse(Thread.interrupted());
525
526                barrier.await();
527                try {
528                    q.poll(LONG_DELAY_MS, MILLISECONDS);
529                    shouldThrow();
530                } catch (InterruptedException success) {}
531                assertFalse(Thread.interrupted());
532            }});
533
534        barrier.await();
535        long startTime = System.nanoTime();
536        assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS));
537        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
538
539        barrier.await();
540        assertThreadStaysAlive(t);
541        t.interrupt();
542        awaitTermination(t);
543    }
544
545    /**
445       * peek returns next element, or null if empty
446       */
447      public void testPeek() {
448          DelayQueue q = populatedQueue(SIZE);
449          for (int i = 0; i < SIZE; ++i) {
450 <            assertEquals(new PDelay(i), ((PDelay)q.peek()));
451 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
450 >            assertEquals(new PDelay(i), q.peek());
451 >            assertEquals(new PDelay(i), q.poll());
452              if (q.isEmpty())
453                  assertNull(q.peek());
454              else
# Line 564 | Line 463 | public class DelayQueueTest extends JSR1
463      public void testElement() {
464          DelayQueue q = populatedQueue(SIZE);
465          for (int i = 0; i < SIZE; ++i) {
466 <            assertEquals(new PDelay(i), ((PDelay)q.element()));
466 >            assertEquals(new PDelay(i), q.element());
467              q.poll();
468          }
469          try {
# Line 579 | Line 478 | public class DelayQueueTest extends JSR1
478      public void testRemove() {
479          DelayQueue q = populatedQueue(SIZE);
480          for (int i = 0; i < SIZE; ++i) {
481 <            assertEquals(new PDelay(i), ((PDelay)q.remove()));
481 >            assertEquals(new PDelay(i), q.remove());
482          }
483          try {
484              q.remove();
# Line 588 | Line 487 | public class DelayQueueTest extends JSR1
487      }
488  
489      /**
591     * remove(x) removes x and returns true if present
592     */
593    public void testRemoveElement() {
594        DelayQueue q = populatedQueue(SIZE);
595        for (int i = 1; i < SIZE; i+=2) {
596            assertTrue(q.remove(new PDelay(i)));
597        }
598        for (int i = 0; i < SIZE; i+=2) {
599            assertTrue(q.remove(new PDelay(i)));
600            assertFalse(q.remove(new PDelay(i+1)));
601        }
602        assertTrue(q.isEmpty());
603    }
604
605    /**
490       * contains(x) reports true when elements added but not yet removed
491       */
492      public void testContains() {
# Line 622 | Line 506 | public class DelayQueueTest extends JSR1
506          q.clear();
507          assertTrue(q.isEmpty());
508          assertEquals(0, q.size());
509 <        assertEquals(NOCAP, q.remainingCapacity());
509 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
510          PDelay x = new PDelay(1);
511          q.add(x);
512          assertFalse(q.isEmpty());
# Line 674 | Line 558 | public class DelayQueueTest extends JSR1
558              assertTrue(q.removeAll(p));
559              assertEquals(SIZE-i, q.size());
560              for (int j = 0; j < i; ++j) {
561 <                PDelay I = (PDelay)(p.remove());
562 <                assertFalse(q.contains(I));
561 >                PDelay x = (PDelay)(p.remove());
562 >                assertFalse(q.contains(x));
563              }
564          }
565      }
# Line 705 | Line 589 | public class DelayQueueTest extends JSR1
589      }
590  
591      /**
708     * toArray(null) throws NullPointerException
709     */
710    public void testToArray_NullArg() {
711        DelayQueue q = populatedQueue(SIZE);
712        try {
713            q.toArray(null);
714            shouldThrow();
715        } catch (NullPointerException success) {}
716    }
717
718    /**
592       * toArray(incompatible array type) throws ArrayStoreException
593       */
594      public void testToArray1_BadArg() {
# Line 738 | Line 611 | public class DelayQueueTest extends JSR1
611              ++i;
612          }
613          assertEquals(i, SIZE);
614 +        assertIteratorExhausted(it);
615 +    }
616 +
617 +    /**
618 +     * iterator of empty collection has no elements
619 +     */
620 +    public void testEmptyIterator() {
621 +        assertIteratorExhausted(new DelayQueue().iterator());
622      }
623  
624      /**
# Line 752 | Line 633 | public class DelayQueueTest extends JSR1
633          it.next();
634          it.remove();
635          it = q.iterator();
636 <        assertEquals(it.next(), new PDelay(2));
637 <        assertEquals(it.next(), new PDelay(3));
636 >        assertEquals(new PDelay(2), it.next());
637 >        assertEquals(new PDelay(3), it.next());
638          assertFalse(it.hasNext());
639      }
640  
# Line 763 | Line 644 | public class DelayQueueTest extends JSR1
644      public void testToString() {
645          DelayQueue q = populatedQueue(SIZE);
646          String s = q.toString();
647 <        for (int i = 0; i < SIZE; ++i) {
648 <            assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
768 <        }
647 >        for (Object e : q)
648 >            assertTrue(s.contains(e.toString()));
649      }
650  
651      /**
# Line 779 | Line 659 | public class DelayQueueTest extends JSR1
659              public void realRun() throws InterruptedException {
660                  assertNull(q.poll());
661                  threadsStarted.await();
662 <                assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
662 >                assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
663                  checkEmpty(q);
664              }});
665  
# Line 836 | 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 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
840 <    }
841 <
842 <    /**
843 <     * drainTo(null) throws NPE
844 <     */
845 <    public void testDrainToNull() {
846 <        DelayQueue q = populatedQueue(SIZE);
847 <        try {
848 <            q.drainTo(null);
849 <            shouldThrow();
850 <        } catch (NullPointerException success) {}
851 <    }
852 <
853 <    /**
854 <     * drainTo(this) throws IAE
855 <     */
856 <    public void testDrainToSelf() {
857 <        DelayQueue q = populatedQueue(SIZE);
858 <        try {
859 <            q.drainTo(q);
860 <            shouldThrow();
861 <        } catch (IllegalArgumentException success) {}
719 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
720      }
721  
722      /**
# Line 873 | Line 731 | public class DelayQueueTest extends JSR1
731          }
732          ArrayList l = new ArrayList();
733          q.drainTo(l);
734 <        assertEquals(q.size(), 0);
734 >        assertEquals(0, q.size());
735          for (int i = 0; i < SIZE; ++i)
736 <            assertEquals(l.get(i), elems[i]);
736 >            assertEquals(elems[i], l.get(i));
737          q.add(elems[0]);
738          q.add(elems[1]);
739          assertFalse(q.isEmpty());
# Line 883 | Line 741 | public class DelayQueueTest extends JSR1
741          assertTrue(q.contains(elems[1]));
742          l.clear();
743          q.drainTo(l);
744 <        assertEquals(q.size(), 0);
745 <        assertEquals(l.size(), 2);
744 >        assertEquals(0, q.size());
745 >        assertEquals(2, l.size());
746          for (int i = 0; i < 2; ++i)
747 <            assertEquals(l.get(i), elems[i]);
747 >            assertEquals(elems[i], l.get(i));
748      }
749  
750      /**
# Line 908 | Line 766 | public class DelayQueueTest extends JSR1
766      }
767  
768      /**
911     * drainTo(null, n) throws NPE
912     */
913    public void testDrainToNullN() {
914        DelayQueue q = populatedQueue(SIZE);
915        try {
916            q.drainTo(null, 0);
917            shouldThrow();
918        } catch (NullPointerException success) {}
919    }
920
921    /**
922     * drainTo(this, n) throws IAE
923     */
924    public void testDrainToSelfN() {
925        DelayQueue q = populatedQueue(SIZE);
926        try {
927            q.drainTo(q, 0);
928            shouldThrow();
929        } catch (IllegalArgumentException success) {}
930    }
931
932    /**
769       * drainTo(c, n) empties first min(n, size) elements of queue into c
770       */
771      public void testDrainToN() {
# Line 938 | Line 774 | public class DelayQueueTest extends JSR1
774              ArrayList l = new ArrayList();
775              q.drainTo(l, i);
776              int k = (i < SIZE) ? i : SIZE;
777 <            assertEquals(q.size(), SIZE-k);
778 <            assertEquals(l.size(), k);
777 >            assertEquals(SIZE-k, q.size());
778 >            assertEquals(k, l.size());
779          }
780      }
781  
782 +    /**
783 +     * remove(null), contains(null) always return false
784 +     */
785 +    public void testNeverContainsNull() {
786 +        Collection<?> q = populatedQueue(SIZE);
787 +        assertFalse(q.contains(null));
788 +        assertFalse(q.remove(null));
789 +    }
790   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines