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.51 by jsr166, Sat May 28 12:45:38 2011 UTC vs.
Revision 1.65 by jsr166, Wed Dec 31 20:09:08 2014 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  
46      private static final int NOCAP = Integer.MAX_VALUE;
# Line 29 | Line 52 | public class DelayQueueTest extends JSR1
52       */
53      static class PDelay implements Delayed {
54          int pseudodelay;
55 <        PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
56 <        public int compareTo(PDelay y) {
57 <            int i = pseudodelay;
58 <            int j = y.pseudodelay;
59 <            if (i < j) return -1;
37 <            if (i > j) return 1;
38 <            return 0;
55 >        PDelay(int i) { pseudodelay = i; }
56 >        public int compareTo(PDelay other) {
57 >            int a = this.pseudodelay;
58 >            int b = other.pseudodelay;
59 >            return (a < b) ? -1 : (a > b) ? 1 : 0;
60          }
40
61          public int compareTo(Delayed y) {
62              return compareTo((PDelay)y);
63          }
44
64          public boolean equals(Object other) {
65 <            return equals((PDelay)other);
66 <        }
48 <        public boolean equals(PDelay other) {
49 <            return other.pseudodelay == pseudodelay;
65 >            return (other instanceof PDelay) &&
66 >                this.pseudodelay == ((PDelay)other).pseudodelay;
67          }
68 <
68 >        // suppress [overrides] javac warning
69 >        public int hashCode() { return pseudodelay; }
70          public long getDelay(TimeUnit ignore) {
71 <            return pseudodelay;
54 <        }
55 <        public int intValue() {
56 <            return pseudodelay;
71 >            return Integer.MIN_VALUE + pseudodelay;
72          }
58
73          public String toString() {
74              return String.valueOf(pseudodelay);
75          }
# Line 88 | Line 102 | public class DelayQueueTest extends JSR1
102              return other.trigger == trigger;
103          }
104  
105 +        // suppress [overrides] javac warning
106 +        public int hashCode() { return (int) trigger; }
107 +
108          public long getDelay(TimeUnit unit) {
109              long n = trigger - System.nanoTime();
110              return unit.convert(n, TimeUnit.NANOSECONDS);
# Line 103 | Line 120 | public class DelayQueueTest extends JSR1
120      }
121  
122      /**
123 <     * Create a queue of given size containing consecutive
123 >     * Returns a new queue of given size containing consecutive
124       * PDelays 0 ... n.
125       */
126      private DelayQueue<PDelay> populatedQueue(int n) {
127          DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128          assertTrue(q.isEmpty());
129 <        for (int i = n-1; i >= 0; i-=2)
129 >        for (int i = n-1; i >= 0; i -= 2)
130              assertTrue(q.offer(new PDelay(i)));
131 <        for (int i = (n & 1); i < n; i+=2)
131 >        for (int i = (n & 1); i < n; i += 2)
132              assertTrue(q.offer(new PDelay(i)));
133          assertFalse(q.isEmpty());
134          assertEquals(NOCAP, q.remainingCapacity());
# Line 206 | Line 223 | public class DelayQueueTest extends JSR1
223      }
224  
225      /**
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    /**
226       * offer non-null succeeds
227       */
228      public void testOffer() {
# Line 248 | Line 243 | public class DelayQueueTest extends JSR1
243      }
244  
245      /**
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    /**
246       * addAll(this) throws IAE
247       */
248      public void testAddAllSelf() {
# Line 270 | Line 254 | public class DelayQueueTest extends JSR1
254      }
255  
256      /**
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    /**
257       * addAll of a collection with any null elements throws NPE after
258       * possibly adding some elements
259       */
# Line 312 | Line 284 | public class DelayQueueTest extends JSR1
284      }
285  
286      /**
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    /**
287       * all elements successfully put are contained
288       */
289      public void testPut() {
# Line 379 | Line 340 | public class DelayQueueTest extends JSR1
340      }
341  
342      /**
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    /**
343       * Take removes existing elements until empty, then blocks interruptibly
344       */
345      public void testBlockingTake() throws InterruptedException {
# Line 507 | Line 445 | public class DelayQueueTest extends JSR1
445      }
446  
447      /**
510     * timed poll before a delayed offer fails; after offer succeeds;
511     * on interruption throws
512     */
513    public void testTimedPollWithOffer() throws InterruptedException {
514        final DelayQueue q = new DelayQueue();
515        final PDelay pdelay = new PDelay(0);
516        final CheckedBarrier barrier = new CheckedBarrier(2);
517        Thread t = newStartedThread(new CheckedRunnable() {
518            public void realRun() throws InterruptedException {
519                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
520
521                barrier.await();
522                assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
523
524                Thread.currentThread().interrupt();
525                try {
526                    q.poll(LONG_DELAY_MS, MILLISECONDS);
527                    shouldThrow();
528                } catch (InterruptedException success) {}
529                assertFalse(Thread.interrupted());
530
531                barrier.await();
532                try {
533                    q.poll(LONG_DELAY_MS, MILLISECONDS);
534                    shouldThrow();
535                } catch (InterruptedException success) {}
536                assertFalse(Thread.interrupted());
537            }});
538
539        barrier.await();
540        long startTime = System.nanoTime();
541        assertTrue(q.offer(pdelay, LONG_DELAY_MS, MILLISECONDS));
542        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
543
544        barrier.await();
545        assertThreadStaysAlive(t);
546        t.interrupt();
547        awaitTermination(t);
548    }
549
550    /**
448       * peek returns next element, or null if empty
449       */
450      public void testPeek() {
# Line 593 | Line 490 | public class DelayQueueTest extends JSR1
490      }
491  
492      /**
596     * remove(x) removes x and returns true if present
597     */
598    public void testRemoveElement() {
599        DelayQueue q = populatedQueue(SIZE);
600        for (int i = 1; i < SIZE; i+=2) {
601            assertTrue(q.remove(new PDelay(i)));
602        }
603        for (int i = 0; i < SIZE; i+=2) {
604            assertTrue(q.remove(new PDelay(i)));
605            assertFalse(q.remove(new PDelay(i+1)));
606        }
607        assertTrue(q.isEmpty());
608    }
609
610    /**
493       * contains(x) reports true when elements added but not yet removed
494       */
495      public void testContains() {
# Line 710 | Line 592 | public class DelayQueueTest extends JSR1
592      }
593  
594      /**
713     * toArray(null) throws NullPointerException
714     */
715    public void testToArray_NullArg() {
716        DelayQueue q = populatedQueue(SIZE);
717        try {
718            q.toArray(null);
719            shouldThrow();
720        } catch (NullPointerException success) {}
721    }
722
723    /**
595       * toArray(incompatible array type) throws ArrayStoreException
596       */
597      public void testToArray1_BadArg() {
# Line 757 | Line 628 | public class DelayQueueTest extends JSR1
628          it.next();
629          it.remove();
630          it = q.iterator();
631 <        assertEquals(it.next(), new PDelay(2));
632 <        assertEquals(it.next(), new PDelay(3));
631 >        assertEquals(new PDelay(2), it.next());
632 >        assertEquals(new PDelay(3), it.next());
633          assertFalse(it.hasNext());
634      }
635  
# Line 768 | Line 639 | public class DelayQueueTest extends JSR1
639      public void testToString() {
640          DelayQueue q = populatedQueue(SIZE);
641          String s = q.toString();
642 <        for (int i = 0; i < SIZE; ++i) {
643 <            assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
773 <        }
642 >        for (Object e : q)
643 >            assertTrue(s.contains(e.toString()));
644      }
645  
646      /**
# Line 784 | Line 654 | public class DelayQueueTest extends JSR1
654              public void realRun() throws InterruptedException {
655                  assertNull(q.poll());
656                  threadsStarted.await();
657 <                assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
657 >                assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
658                  checkEmpty(q);
659              }});
660  
# Line 841 | Line 711 | public class DelayQueueTest extends JSR1
711      public void testTimedPollDelayed() throws InterruptedException {
712          DelayQueue q = new DelayQueue();
713          q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
714 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
845 <    }
846 <
847 <    /**
848 <     * drainTo(null) throws NPE
849 <     */
850 <    public void testDrainToNull() {
851 <        DelayQueue q = populatedQueue(SIZE);
852 <        try {
853 <            q.drainTo(null);
854 <            shouldThrow();
855 <        } catch (NullPointerException success) {}
856 <    }
857 <
858 <    /**
859 <     * drainTo(this) throws IAE
860 <     */
861 <    public void testDrainToSelf() {
862 <        DelayQueue q = populatedQueue(SIZE);
863 <        try {
864 <            q.drainTo(q);
865 <            shouldThrow();
866 <        } catch (IllegalArgumentException success) {}
714 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
715      }
716  
717      /**
# Line 878 | Line 726 | public class DelayQueueTest extends JSR1
726          }
727          ArrayList l = new ArrayList();
728          q.drainTo(l);
729 <        assertEquals(q.size(), 0);
729 >        assertEquals(0, q.size());
730          for (int i = 0; i < SIZE; ++i)
731 <            assertEquals(l.get(i), elems[i]);
731 >            assertEquals(elems[i], l.get(i));
732          q.add(elems[0]);
733          q.add(elems[1]);
734          assertFalse(q.isEmpty());
# Line 888 | Line 736 | public class DelayQueueTest extends JSR1
736          assertTrue(q.contains(elems[1]));
737          l.clear();
738          q.drainTo(l);
739 <        assertEquals(q.size(), 0);
740 <        assertEquals(l.size(), 2);
739 >        assertEquals(0, q.size());
740 >        assertEquals(2, l.size());
741          for (int i = 0; i < 2; ++i)
742 <            assertEquals(l.get(i), elems[i]);
742 >            assertEquals(elems[i], l.get(i));
743      }
744  
745      /**
# Line 913 | Line 761 | public class DelayQueueTest extends JSR1
761      }
762  
763      /**
916     * drainTo(null, n) throws NPE
917     */
918    public void testDrainToNullN() {
919        DelayQueue q = populatedQueue(SIZE);
920        try {
921            q.drainTo(null, 0);
922            shouldThrow();
923        } catch (NullPointerException success) {}
924    }
925
926    /**
927     * drainTo(this, n) throws IAE
928     */
929    public void testDrainToSelfN() {
930        DelayQueue q = populatedQueue(SIZE);
931        try {
932            q.drainTo(q, 0);
933            shouldThrow();
934        } catch (IllegalArgumentException success) {}
935    }
936
937    /**
764       * drainTo(c, n) empties first min(n, size) elements of queue into c
765       */
766      public void testDrainToN() {
# Line 943 | Line 769 | public class DelayQueueTest extends JSR1
769              ArrayList l = new ArrayList();
770              q.drainTo(l, i);
771              int k = (i < SIZE) ? i : SIZE;
772 <            assertEquals(q.size(), SIZE-k);
773 <            assertEquals(l.size(), k);
772 >            assertEquals(SIZE-k, q.size());
773 >            assertEquals(k, l.size());
774          }
775      }
776  
777 +    /**
778 +     * remove(null), contains(null) always return false
779 +     */
780 +    public void testNeverContainsNull() {
781 +        Collection<?> q = populatedQueue(SIZE);
782 +        assertFalse(q.contains(null));
783 +        assertFalse(q.remove(null));
784 +    }
785   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines