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.27 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.53 by jsr166, Mon May 30 22:43:20 2011 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 < import java.util.*;
10 > import java.util.Arrays;
11 > import java.util.ArrayList;
12 > import java.util.Collection;
13 > import java.util.Iterator;
14 > import java.util.NoSuchElementException;
15 > import java.util.concurrent.BlockingQueue;
16 > import java.util.concurrent.CountDownLatch;
17 > import java.util.concurrent.Delayed;
18 > import java.util.concurrent.DelayQueue;
19 > import java.util.concurrent.Executors;
20 > import java.util.concurrent.ExecutorService;
21 > import java.util.concurrent.TimeUnit;
22   import static java.util.concurrent.TimeUnit.MILLISECONDS;
12 import java.util.concurrent.*;
23  
24   public class DelayQueueTest extends JSR166TestCase {
25 +
26 +    public static class Generic extends BlockingQueueTest {
27 +        protected BlockingQueue emptyCollection() {
28 +            return new DelayQueue();
29 +        }
30 +        protected PDelay makeElement(int i) {
31 +            return new PDelay(i);
32 +        }
33 +    }
34 +
35      public static void main(String[] args) {
36 <        junit.textui.TestRunner.run (suite());
36 >        junit.textui.TestRunner.run(suite());
37      }
38  
39      public static Test suite() {
40 <        return new TestSuite(DelayQueueTest.class);
40 >        return newTestSuite(DelayQueueTest.class,
41 >                            new Generic().testSuite());
42      }
43  
44      private static final int NOCAP = Integer.MAX_VALUE;
45  
46      /**
47       * A delayed implementation for testing.
48 <     * Most  tests use Pseudodelays, where delays are all elapsed
48 >     * Most tests use Pseudodelays, where delays are all elapsed
49       * (so, no blocking solely for delays) but are still ordered
50       */
51      static class PDelay implements Delayed {
# Line 32 | Line 53 | public class DelayQueueTest extends JSR1
53          PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
54          public int compareTo(PDelay y) {
55              int i = pseudodelay;
56 <            int j = ((PDelay)y).pseudodelay;
56 >            int j = y.pseudodelay;
57              if (i < j) return -1;
58              if (i > j) return 1;
59              return 0;
60          }
61  
62          public int compareTo(Delayed y) {
63 <            int i = pseudodelay;
43 <            int j = ((PDelay)y).pseudodelay;
44 <            if (i < j) return -1;
45 <            if (i > j) return 1;
46 <            return 0;
63 >            return compareTo((PDelay)y);
64          }
65  
66          public boolean equals(Object other) {
67 <            return ((PDelay)other).pseudodelay == pseudodelay;
67 >            return equals((PDelay)other);
68          }
69          public boolean equals(PDelay other) {
70 <            return ((PDelay)other).pseudodelay == pseudodelay;
70 >            return other.pseudodelay == pseudodelay;
71          }
72  
56
73          public long getDelay(TimeUnit ignore) {
74              return pseudodelay;
75          }
# Line 66 | Line 82 | public class DelayQueueTest extends JSR1
82          }
83      }
84  
69
85      /**
86       * Delayed implementation that actually delays
87       */
# Line 77 | Line 92 | public class DelayQueueTest extends JSR1
92          }
93          public int compareTo(NanoDelay y) {
94              long i = trigger;
95 <            long j = ((NanoDelay)y).trigger;
95 >            long j = y.trigger;
96              if (i < j) return -1;
97              if (i > j) return 1;
98              return 0;
99          }
100  
101          public int compareTo(Delayed y) {
102 <            long i = trigger;
88 <            long j = ((NanoDelay)y).trigger;
89 <            if (i < j) return -1;
90 <            if (i > j) return 1;
91 <            return 0;
102 >            return compareTo((NanoDelay)y);
103          }
104  
105          public boolean equals(Object other) {
106 <            return ((NanoDelay)other).trigger == trigger;
106 >            return equals((NanoDelay)other);
107          }
108          public boolean equals(NanoDelay other) {
109 <            return ((NanoDelay)other).trigger == trigger;
109 >            return other.trigger == trigger;
110          }
111  
112          public long getDelay(TimeUnit unit) {
# Line 112 | Line 123 | public class DelayQueueTest extends JSR1
123          }
124      }
125  
115
126      /**
127       * Create a queue of given size containing consecutive
128       * PDelays 0 ... n.
129       */
130 <    private DelayQueue populatedQueue(int n) {
131 <        DelayQueue q = new DelayQueue();
130 >    private DelayQueue<PDelay> populatedQueue(int n) {
131 >        DelayQueue<PDelay> q = new DelayQueue<PDelay>();
132          assertTrue(q.isEmpty());
133          for (int i = n-1; i >= 0; i-=2)
134              assertTrue(q.offer(new PDelay(i)));
# Line 199 | Line 209 | public class DelayQueueTest extends JSR1
209      }
210  
211      /**
212 <     * remainingCapacity does not change when elementa added or removed,
212 >     * remainingCapacity does not change when elements added or removed,
213       * but size does
214       */
215      public void testRemainingCapacity() {
# Line 217 | Line 227 | public class DelayQueueTest extends JSR1
227      }
228  
229      /**
220     * offer(null) throws NPE
221     */
222    public void testOfferNull() {
223        try {
224            DelayQueue q = new DelayQueue();
225            q.offer(null);
226            shouldThrow();
227        } catch (NullPointerException success) {}
228    }
229
230    /**
231     * add(null) throws NPE
232     */
233    public void testAddNull() {
234        try {
235            DelayQueue q = new DelayQueue();
236            q.add(null);
237            shouldThrow();
238        } catch (NullPointerException success) {}
239    }
240
241    /**
230       * offer non-null succeeds
231       */
232      public void testOffer() {
# Line 259 | Line 247 | public class DelayQueueTest extends JSR1
247      }
248  
249      /**
262     * addAll(null) throws NPE
263     */
264    public void testAddAll1() {
265        try {
266            DelayQueue q = new DelayQueue();
267            q.addAll(null);
268            shouldThrow();
269        } catch (NullPointerException success) {}
270    }
271
272
273    /**
250       * addAll(this) throws IAE
251       */
252      public void testAddAllSelf() {
# Line 282 | Line 258 | public class DelayQueueTest extends JSR1
258      }
259  
260      /**
285     * addAll of a collection with null elements throws NPE
286     */
287    public void testAddAll2() {
288        try {
289            DelayQueue q = new DelayQueue();
290            PDelay[] ints = new PDelay[SIZE];
291            q.addAll(Arrays.asList(ints));
292            shouldThrow();
293        } catch (NullPointerException success) {}
294    }
295    /**
261       * addAll of a collection with any null elements throws NPE after
262       * possibly adding some elements
263       */
# Line 323 | Line 288 | public class DelayQueueTest extends JSR1
288      }
289  
290      /**
326     * put(null) throws NPE
327     */
328     public void testPutNull() {
329        try {
330            DelayQueue q = new DelayQueue();
331            q.put(null);
332            shouldThrow();
333        } catch (NullPointerException success) {}
334     }
335
336    /**
291       * all elements successfully put are contained
292       */
293 <     public void testPut() {
294 <         DelayQueue q = new DelayQueue();
295 <         for (int i = 0; i < SIZE; ++i) {
296 <             PDelay I = new PDelay(i);
297 <             q.put(I);
298 <             assertTrue(q.contains(I));
299 <         }
300 <         assertEquals(SIZE, q.size());
293 >    public void testPut() {
294 >        DelayQueue q = new DelayQueue();
295 >        for (int i = 0; i < SIZE; ++i) {
296 >            PDelay I = new PDelay(i);
297 >            q.put(I);
298 >            assertTrue(q.contains(I));
299 >        }
300 >        assertEquals(SIZE, q.size());
301      }
302  
303      /**
# Line 351 | Line 305 | public class DelayQueueTest extends JSR1
305       */
306      public void testPutWithTake() throws InterruptedException {
307          final DelayQueue q = new DelayQueue();
308 <        Thread t = new Thread(new CheckedRunnable() {
308 >        Thread t = newStartedThread(new CheckedRunnable() {
309              public void realRun() {
310                  q.put(new PDelay(0));
311                  q.put(new PDelay(0));
# Line 359 | Line 313 | public class DelayQueueTest extends JSR1
313                  q.put(new PDelay(0));
314              }});
315  
316 <        t.start();
317 <        Thread.sleep(SHORT_DELAY_MS);
364 <        q.take();
365 <        t.interrupt();
366 <        t.join();
316 >        awaitTermination(t);
317 >        assertEquals(4, q.size());
318      }
319  
320      /**
# Line 371 | Line 322 | public class DelayQueueTest extends JSR1
322       */
323      public void testTimedOffer() throws InterruptedException {
324          final DelayQueue q = new DelayQueue();
325 <        Thread t = new Thread(new CheckedRunnable() {
325 >        Thread t = newStartedThread(new CheckedRunnable() {
326              public void realRun() throws InterruptedException {
327                  q.put(new PDelay(0));
328                  q.put(new PDelay(0));
# Line 379 | Line 330 | public class DelayQueueTest extends JSR1
330                  assertTrue(q.offer(new PDelay(0), LONG_DELAY_MS, MILLISECONDS));
331              }});
332  
333 <        t.start();
383 <        Thread.sleep(SMALL_DELAY_MS);
384 <        t.interrupt();
385 <        t.join();
333 >        awaitTermination(t);
334      }
335  
336      /**
# Line 396 | Line 344 | public class DelayQueueTest extends JSR1
344      }
345  
346      /**
399     * take blocks interruptibly when empty
400     */
401    public void testTakeFromEmpty() throws InterruptedException {
402        final DelayQueue q = new DelayQueue();
403        Thread t = new ThreadShouldThrow(InterruptedException.class) {
404            public void realRun() throws InterruptedException {
405                q.take();
406            }};
407
408        t.start();
409        Thread.sleep(SHORT_DELAY_MS);
410        t.interrupt();
411        t.join();
412    }
413
414    /**
347       * Take removes existing elements until empty, then blocks interruptibly
348       */
349      public void testBlockingTake() throws InterruptedException {
350          final DelayQueue q = populatedQueue(SIZE);
351 <        Thread t = new Thread(new CheckedRunnable() {
351 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
352 >        Thread t = newStartedThread(new CheckedRunnable() {
353              public void realRun() throws InterruptedException {
354                  for (int i = 0; i < SIZE; ++i) {
355                      assertEquals(new PDelay(i), ((PDelay)q.take()));
356                  }
357 +
358 +                Thread.currentThread().interrupt();
359                  try {
360                      q.take();
361                      shouldThrow();
362                  } catch (InterruptedException success) {}
363 +                assertFalse(Thread.interrupted());
364 +
365 +                pleaseInterrupt.countDown();
366 +                try {
367 +                    q.take();
368 +                    shouldThrow();
369 +                } catch (InterruptedException success) {}
370 +                assertFalse(Thread.interrupted());
371              }});
372  
373 <        t.start();
374 <        Thread.sleep(SHORT_DELAY_MS);
373 >        await(pleaseInterrupt);
374 >        assertThreadStaysAlive(t);
375          t.interrupt();
376 <        t.join();
376 >        awaitTermination(t);
377      }
378  
436
379      /**
380       * poll succeeds unless empty
381       */
# Line 446 | Line 388 | public class DelayQueueTest extends JSR1
388      }
389  
390      /**
391 <     * timed pool with zero timeout succeeds when non-empty, else times out
391 >     * timed poll with zero timeout succeeds when non-empty, else times out
392       */
393      public void testTimedPoll0() throws InterruptedException {
394          DelayQueue q = populatedQueue(SIZE);
# Line 457 | Line 399 | public class DelayQueueTest extends JSR1
399      }
400  
401      /**
402 <     * timed pool with nonzero timeout succeeds when non-empty, else times out
402 >     * timed poll with nonzero timeout succeeds when non-empty, else times out
403       */
404      public void testTimedPoll() throws InterruptedException {
405          DelayQueue q = populatedQueue(SIZE);
406          for (int i = 0; i < SIZE; ++i) {
407 <            assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
408 <        }
409 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
407 >            long startTime = System.nanoTime();
408 >            assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
409 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
410 >        }
411 >        long startTime = System.nanoTime();
412 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
413 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
414 >        checkEmpty(q);
415      }
416  
417      /**
# Line 472 | Line 419 | public class DelayQueueTest extends JSR1
419       * returning timeout status
420       */
421      public void testInterruptedTimedPoll() throws InterruptedException {
422 <        Thread t = new Thread(new CheckedRunnable() {
422 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
423 >        Thread t = newStartedThread(new CheckedRunnable() {
424              public void realRun() throws InterruptedException {
425                  DelayQueue q = populatedQueue(SIZE);
426                  for (int i = 0; i < SIZE; ++i) {
427                      assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
428                  }
429 +
430 +                Thread.currentThread().interrupt();
431                  try {
432 <                    q.poll(SMALL_DELAY_MS, MILLISECONDS);
432 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
433                      shouldThrow();
434                  } catch (InterruptedException success) {}
435 <            }});
486 <
487 <        t.start();
488 <        Thread.sleep(SHORT_DELAY_MS);
489 <        t.interrupt();
490 <        t.join();
491 <    }
435 >                assertFalse(Thread.interrupted());
436  
437 <    /**
494 <     *  timed poll before a delayed offer fails; after offer succeeds;
495 <     *  on interruption throws
496 <     */
497 <    public void testTimedPollWithOffer() throws InterruptedException {
498 <        final DelayQueue q = new DelayQueue();
499 <        final PDelay pdelay = new PDelay(0);
500 <        Thread t = new Thread(new CheckedRunnable() {
501 <            public void realRun() throws InterruptedException {
502 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
503 <                assertSame(pdelay, q.poll(LONG_DELAY_MS, MILLISECONDS));
437 >                pleaseInterrupt.countDown();
438                  try {
439                      q.poll(LONG_DELAY_MS, MILLISECONDS);
440                      shouldThrow();
441                  } catch (InterruptedException success) {}
442 +                assertFalse(Thread.interrupted());
443              }});
444  
445 <        t.start();
446 <        Thread.sleep(SMALL_DELAY_MS);
512 <        assertTrue(q.offer(pdelay, SHORT_DELAY_MS, MILLISECONDS));
445 >        await(pleaseInterrupt);
446 >        assertThreadStaysAlive(t);
447          t.interrupt();
448 <        t.join();
448 >        awaitTermination(t);
449      }
450  
517
451      /**
452       * peek returns next element, or null if empty
453       */
# Line 661 | Line 594 | public class DelayQueueTest extends JSR1
594          Object[] o = q.toArray();
595          Arrays.sort(o);
596          for (int i = 0; i < o.length; i++)
597 <            assertEquals(o[i], q.take());
597 >            assertSame(o[i], q.take());
598      }
599  
600      /**
601       * toArray(a) contains all elements
602       */
603 <    public void testToArray2() throws InterruptedException {
604 <        DelayQueue q = populatedQueue(SIZE);
603 >    public void testToArray2() {
604 >        DelayQueue<PDelay> q = populatedQueue(SIZE);
605          PDelay[] ints = new PDelay[SIZE];
606 <        ints = (PDelay[])q.toArray(ints);
606 >        PDelay[] array = q.toArray(ints);
607 >        assertSame(ints, array);
608          Arrays.sort(ints);
609          for (int i = 0; i < ints.length; i++)
610 <            assertEquals(ints[i], q.take());
677 <    }
678 <
679 <
680 <    /**
681 <     * toArray(null) throws NPE
682 <     */
683 <    public void testToArray_BadArg() {
684 <        DelayQueue q = populatedQueue(SIZE);
685 <        try {
686 <            Object o[] = q.toArray(null);
687 <            shouldThrow();
688 <        } catch (NullPointerException success) {}
610 >            assertSame(ints[i], q.remove());
611      }
612  
613      /**
614 <     * toArray with incompatible array type throws CCE
614 >     * toArray(incompatible array type) throws ArrayStoreException
615       */
616      public void testToArray1_BadArg() {
617          DelayQueue q = populatedQueue(SIZE);
618          try {
619 <            Object o[] = q.toArray(new String[10]);
619 >            q.toArray(new String[10]);
620              shouldThrow();
621          } catch (ArrayStoreException success) {}
622      }
# Line 716 | Line 638 | public class DelayQueueTest extends JSR1
638      /**
639       * iterator.remove removes current element
640       */
641 <    public void testIteratorRemove () {
641 >    public void testIteratorRemove() {
642          final DelayQueue q = new DelayQueue();
643          q.add(new PDelay(2));
644          q.add(new PDelay(1));
# Line 730 | Line 652 | public class DelayQueueTest extends JSR1
652          assertFalse(it.hasNext());
653      }
654  
733
655      /**
656       * toString contains toStrings of elements
657       */
# Line 738 | Line 659 | public class DelayQueueTest extends JSR1
659          DelayQueue q = populatedQueue(SIZE);
660          String s = q.toString();
661          for (int i = 0; i < SIZE; ++i) {
662 <            assertTrue(s.indexOf(String.valueOf(Integer.MIN_VALUE+i)) >= 0);
662 >            assertTrue(s.contains(String.valueOf(Integer.MIN_VALUE+i)));
663          }
664      }
665  
666      /**
667 <     * offer transfers elements across Executor tasks
667 >     * timed poll transfers elements across Executor tasks
668       */
669      public void testPollInExecutor() {
670          final DelayQueue q = new DelayQueue();
671 +        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
672          ExecutorService executor = Executors.newFixedThreadPool(2);
673          executor.execute(new CheckedRunnable() {
674              public void realRun() throws InterruptedException {
675                  assertNull(q.poll());
676 <                assertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
677 <                assertTrue(q.isEmpty());
676 >                threadsStarted.await();
677 >                assertTrue(null != q.poll(LONG_DELAY_MS, MILLISECONDS));
678 >                checkEmpty(q);
679              }});
680  
681          executor.execute(new CheckedRunnable() {
682              public void realRun() throws InterruptedException {
683 <                Thread.sleep(SHORT_DELAY_MS);
683 >                threadsStarted.await();
684                  q.put(new PDelay(1));
685              }});
686  
687          joinPool(executor);
765
688      }
689  
768
690      /**
691       * Delayed actions do not occur until their delay elapses
692       */
693      public void testDelay() throws InterruptedException {
694 <        DelayQueue q = new DelayQueue();
695 <        NanoDelay[] elements = new NanoDelay[SIZE];
696 <        for (int i = 0; i < SIZE; ++i) {
776 <            elements[i] = new NanoDelay(1000000000L + 1000000L * (SIZE - i));
777 <        }
778 <        for (int i = 0; i < SIZE; ++i) {
779 <            q.add(elements[i]);
780 <        }
694 >        DelayQueue<NanoDelay> q = new DelayQueue<NanoDelay>();
695 >        for (int i = 0; i < SIZE; ++i)
696 >            q.add(new NanoDelay(1000000L * (SIZE - i)));
697  
698          long last = 0;
699          for (int i = 0; i < SIZE; ++i) {
700 <            NanoDelay e = (NanoDelay)(q.take());
700 >            NanoDelay e = q.take();
701              long tt = e.getTriggerTime();
702 <            assertTrue(tt <= System.nanoTime());
702 >            assertTrue(System.nanoTime() - tt >= 0);
703              if (i != 0)
704                  assertTrue(tt >= last);
705              last = tt;
706          }
707 +        assertTrue(q.isEmpty());
708      }
709  
710      /**
# Line 796 | Line 713 | public class DelayQueueTest extends JSR1
713      public void testPeekDelayed() {
714          DelayQueue q = new DelayQueue();
715          q.add(new NanoDelay(Long.MAX_VALUE));
716 <        assert(q.peek() != null);
716 >        assertNotNull(q.peek());
717      }
718  
802
719      /**
720       * poll of a non-empty queue returns null if no expired elements.
721       */
# Line 815 | Line 731 | public class DelayQueueTest extends JSR1
731      public void testTimedPollDelayed() throws InterruptedException {
732          DelayQueue q = new DelayQueue();
733          q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
734 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
819 <    }
820 <
821 <    /**
822 <     * drainTo(null) throws NPE
823 <     */
824 <    public void testDrainToNull() {
825 <        DelayQueue q = populatedQueue(SIZE);
826 <        try {
827 <            q.drainTo(null);
828 <            shouldThrow();
829 <        } catch (NullPointerException success) {}
830 <    }
831 <
832 <    /**
833 <     * drainTo(this) throws IAE
834 <     */
835 <    public void testDrainToSelf() {
836 <        DelayQueue q = populatedQueue(SIZE);
837 <        try {
838 <            q.drainTo(q);
839 <            shouldThrow();
840 <        } catch (IllegalArgumentException success) {}
734 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
735      }
736  
737      /**
# Line 887 | Line 781 | public class DelayQueueTest extends JSR1
781      }
782  
783      /**
784 <     * drainTo(null, n) throws NPE
891 <     */
892 <    public void testDrainToNullN() {
893 <        DelayQueue q = populatedQueue(SIZE);
894 <        try {
895 <            q.drainTo(null, 0);
896 <            shouldThrow();
897 <        } catch (NullPointerException success) {}
898 <    }
899 <
900 <    /**
901 <     * drainTo(this, n) throws IAE
902 <     */
903 <    public void testDrainToSelfN() {
904 <        DelayQueue q = populatedQueue(SIZE);
905 <        try {
906 <            q.drainTo(q, 0);
907 <            shouldThrow();
908 <        } catch (IllegalArgumentException success) {}
909 <    }
910 <
911 <    /**
912 <     * drainTo(c, n) empties first max {n, size} elements of queue into c
784 >     * drainTo(c, n) empties first min(n, size) elements of queue into c
785       */
786      public void testDrainToN() {
787          for (int i = 0; i < SIZE + 2; ++i) {
788              DelayQueue q = populatedQueue(SIZE);
789              ArrayList l = new ArrayList();
790              q.drainTo(l, i);
791 <            int k = (i < SIZE)? i : SIZE;
791 >            int k = (i < SIZE) ? i : SIZE;
792              assertEquals(q.size(), SIZE-k);
793              assertEquals(l.size(), k);
794          }
795      }
796  
925
797   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines