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.3 by dl, Sun Sep 14 20:42:40 2003 UTC vs.
Revision 1.10 by dl, Tue Jun 1 12:54:09 2004 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 20 | Line 21 | public class DelayQueueTest extends JSR1
21  
22      private static final int NOCAP = Integer.MAX_VALUE;
23  
24 <    // Most Q/BQ tests use Pseudodelays, where delays are all elapsed
25 <    // (so, no blocking solely for delays) but are still ordered
26 <
24 >    /**
25 >     * A delayed implementation for testing.
26 >     * Most  tests use Pseudodelays, where delays are all elapsed
27 >     * (so, no blocking solely for delays) but are still ordered
28 >     */
29      static class PDelay implements Delayed {
30          int pseudodelay;
31          PDelay(int i) { pseudodelay = Integer.MIN_VALUE + i; }
32 <        public int compareTo(Object y) {
32 >        public int compareTo(PDelay y) {
33              int i = pseudodelay;
34              int j = ((PDelay)y).pseudodelay;
35              if (i < j) return -1;
# Line 34 | Line 37 | public class DelayQueueTest extends JSR1
37              return 0;
38          }
39  
40 <        public int compareTo(PDelay y) {
40 >        public int compareTo(Delayed y) {
41              int i = pseudodelay;
42              int j = ((PDelay)y).pseudodelay;
43              if (i < j) return -1;
# Line 63 | Line 66 | public class DelayQueueTest extends JSR1
66      }
67  
68  
69 +    /**
70 +     * Delayed implementation that actually delays
71 +     */
72 +    static class NanoDelay implements Delayed {
73 +        long trigger;
74 +        NanoDelay(long i) {
75 +            trigger = System.nanoTime() + i;
76 +        }
77 +        public int compareTo(NanoDelay y) {
78 +            long i = trigger;
79 +            long j = ((NanoDelay)y).trigger;
80 +            if (i < j) return -1;
81 +            if (i > j) return 1;
82 +            return 0;
83 +        }
84 +
85 +        public int compareTo(Delayed y) {
86 +            long i = trigger;
87 +            long j = ((NanoDelay)y).trigger;
88 +            if (i < j) return -1;
89 +            if (i > j) return 1;
90 +            return 0;
91 +        }
92 +
93 +        public boolean equals(Object other) {
94 +            return ((NanoDelay)other).trigger == trigger;
95 +        }
96 +        public boolean equals(NanoDelay other) {
97 +            return ((NanoDelay)other).trigger == trigger;
98 +        }
99 +
100 +        public long getDelay(TimeUnit unit) {
101 +            long n = trigger - System.nanoTime();
102 +            return unit.convert(n, TimeUnit.NANOSECONDS);
103 +        }
104 +
105 +        public long getTriggerTime() {
106 +            return trigger;
107 +        }
108 +
109 +        public String toString() {
110 +            return String.valueOf(trigger);
111 +        }
112 +    }
113  
114  
115      /**
# Line 82 | Line 129 | public class DelayQueueTest extends JSR1
129          return q;
130      }
131  
132 <    public void testConstructor1(){
132 >    /**
133 >     * A new queue has unbounded capacity
134 >     */
135 >    public void testConstructor1() {
136          assertEquals(NOCAP, new DelayQueue().remainingCapacity());
137      }
138  
139 <    public void testConstructor3(){
140 <
139 >    /**
140 >     * Initializing from null Collection throws NPE
141 >     */
142 >    public void testConstructor3() {
143          try {
144              DelayQueue q = new DelayQueue(null);
145 <            fail("Cannot make from null collection");
145 >            shouldThrow();
146          }
147          catch (NullPointerException success) {}
148      }
149  
150 <    public void testConstructor4(){
150 >    /**
151 >     * Initializing from Collection of null elements throws NPE
152 >     */
153 >    public void testConstructor4() {
154          try {
155              PDelay[] ints = new PDelay[SIZE];
156              DelayQueue q = new DelayQueue(Arrays.asList(ints));
157 <            fail("Cannot make with null elements");
157 >            shouldThrow();
158          }
159          catch (NullPointerException success) {}
160      }
161  
162 <    public void testConstructor5(){
162 >    /**
163 >     * Initializing from Collection with some null elements throws NPE
164 >     */
165 >    public void testConstructor5() {
166          try {
167              PDelay[] ints = new PDelay[SIZE];
168              for (int i = 0; i < SIZE-1; ++i)
169                  ints[i] = new PDelay(i);
170              DelayQueue q = new DelayQueue(Arrays.asList(ints));
171 <            fail("Cannot make with null elements");
171 >            shouldThrow();
172          }
173          catch (NullPointerException success) {}
174      }
175  
176 <    public void testConstructor6(){
176 >    /**
177 >     * Queue contains all elements of collection used to initialize
178 >     */
179 >    public void testConstructor6() {
180          try {
181              PDelay[] ints = new PDelay[SIZE];
182              for (int i = 0; i < SIZE; ++i)
# Line 127 | Line 188 | public class DelayQueueTest extends JSR1
188          finally {}
189      }
190  
191 +    /**
192 +     * isEmpty is true before add, false after
193 +     */
194      public void testEmpty() {
195          DelayQueue q = new DelayQueue();
196          assertTrue(q.isEmpty());
# Line 139 | Line 203 | public class DelayQueueTest extends JSR1
203          assertTrue(q.isEmpty());
204      }
205  
206 <    public void testRemainingCapacity(){
206 >    /**
207 >     * remainingCapacity does not change when elementa added or removed,
208 >     * but size does
209 >     */
210 >    public void testRemainingCapacity() {
211          DelayQueue q = populatedQueue(SIZE);
212          for (int i = 0; i < SIZE; ++i) {
213              assertEquals(NOCAP, q.remainingCapacity());
# Line 153 | Line 221 | public class DelayQueueTest extends JSR1
221          }
222      }
223  
224 <    public void testOfferNull(){
224 >    /**
225 >     * offer(null) throws NPE
226 >     */
227 >    public void testOfferNull() {
228          try {
229              DelayQueue q = new DelayQueue();
230              q.offer(null);
231 <            fail("should throw NPE");
231 >            shouldThrow();
232          } catch (NullPointerException success) { }  
233      }
234  
235 +    /**
236 +     * add(null) throws NPE
237 +     */
238 +    public void testAddNull() {
239 +        try {
240 +            DelayQueue q = new DelayQueue();
241 +            q.add(null);
242 +            shouldThrow();
243 +        } catch (NullPointerException success) { }  
244 +    }
245 +
246 +    /**
247 +     * offer non-null succeeds
248 +     */
249      public void testOffer() {
250          DelayQueue q = new DelayQueue();
251          assertTrue(q.offer(new PDelay(0)));
252          assertTrue(q.offer(new PDelay(1)));
253      }
254  
255 <    public void testAdd(){
255 >    /**
256 >     * add succeeds
257 >     */
258 >    public void testAdd() {
259          DelayQueue q = new DelayQueue();
260          for (int i = 0; i < SIZE; ++i) {
261              assertEquals(i, q.size());
# Line 175 | Line 263 | public class DelayQueueTest extends JSR1
263          }
264      }
265  
266 <    public void testAddAll1(){
266 >    /**
267 >     * addAll(null) throws NPE
268 >     */
269 >    public void testAddAll1() {
270          try {
271              DelayQueue q = new DelayQueue();
272              q.addAll(null);
273 <            fail("Cannot add null collection");
273 >            shouldThrow();
274          }
275          catch (NullPointerException success) {}
276      }
277 <    public void testAddAll2(){
277 >
278 >
279 >    /**
280 >     * addAll(this) throws IAE
281 >     */
282 >    public void testAddAllSelf() {
283 >        try {
284 >            DelayQueue q = populatedQueue(SIZE);
285 >            q.addAll(q);
286 >            shouldThrow();
287 >        }
288 >        catch (IllegalArgumentException success) {}
289 >    }
290 >
291 >    /**
292 >     * addAll of a collection with null elements throws NPE
293 >     */
294 >    public void testAddAll2() {
295          try {
296              DelayQueue q = new DelayQueue();
297              PDelay[] ints = new PDelay[SIZE];
298              q.addAll(Arrays.asList(ints));
299 <            fail("Cannot add null elements");
299 >            shouldThrow();
300          }
301          catch (NullPointerException success) {}
302      }
303 <    public void testAddAll3(){
303 >    /**
304 >     * addAll of a collection with any null elements throws NPE after
305 >     * possibly adding some elements
306 >     */
307 >    public void testAddAll3() {
308          try {
309              DelayQueue q = new DelayQueue();
310              PDelay[] ints = new PDelay[SIZE];
311              for (int i = 0; i < SIZE-1; ++i)
312                  ints[i] = new PDelay(i);
313              q.addAll(Arrays.asList(ints));
314 <            fail("Cannot add null elements");
314 >            shouldThrow();
315          }
316          catch (NullPointerException success) {}
317      }
318  
319 <    public void testAddAll5(){
319 >    /**
320 >     * Queue contains all elements of successful addAll
321 >     */
322 >    public void testAddAll5() {
323          try {
324              PDelay[] empty = new PDelay[0];
325              PDelay[] ints = new PDelay[SIZE];
# Line 219 | Line 334 | public class DelayQueueTest extends JSR1
334          finally {}
335      }
336  
337 +    /**
338 +     * put(null) throws NPE
339 +     */
340       public void testPutNull() {
341          try {
342              DelayQueue q = new DelayQueue();
343              q.put(null);
344 <            fail("put should throw NPE");
344 >            shouldThrow();
345          }
346          catch (NullPointerException success){
347          }  
348       }
349  
350 +    /**
351 +     * all elements successfully put are contained
352 +     */
353       public void testPut() {
354           try {
355               DelayQueue q = new DelayQueue();
# Line 243 | Line 364 | public class DelayQueueTest extends JSR1
364          }
365      }
366  
367 +    /**
368 +     * put doesn't block waiting for take
369 +     */
370      public void testPutWithTake() {
371          final DelayQueue q = new DelayQueue();
372          Thread t = new Thread(new Runnable() {
373 <                public void run(){
373 >                public void run() {
374                      int added = 0;
375                      try {
376                          q.put(new PDelay(0));
# Line 269 | Line 393 | public class DelayQueueTest extends JSR1
393              t.interrupt();
394              t.join();
395          } catch (Exception e){
396 <            fail("Unexpected exception");
396 >            unexpectedException();
397          }
398      }
399  
400 +    /**
401 +     * timed offer does not time out
402 +     */
403      public void testTimedOffer() {
404          final DelayQueue q = new DelayQueue();
405          Thread t = new Thread(new Runnable() {
406 <                public void run(){
406 >                public void run() {
407                      try {
408                          q.put(new PDelay(0));
409                          q.put(new PDelay(0));
# Line 292 | Line 419 | public class DelayQueueTest extends JSR1
419              t.interrupt();
420              t.join();
421          } catch (Exception e){
422 <            fail("Unexpected exception");
422 >            unexpectedException();
423          }
424      }
425  
426 <    public void testTake(){
426 >    /**
427 >     * take retrieves elements in priority order
428 >     */
429 >    public void testTake() {
430          try {
431              DelayQueue q = populatedQueue(SIZE);
432              for (int i = 0; i < SIZE; ++i) {
433                  assertEquals(new PDelay(i), ((PDelay)q.take()));
434              }
435          } catch (InterruptedException e){
436 <            fail("Unexpected exception");
436 >            unexpectedException();
437          }  
438      }
439  
440 +    /**
441 +     * take blocks interruptibly when empty
442 +     */
443      public void testTakeFromEmpty() {
444          final DelayQueue q = new DelayQueue();
445          Thread t = new Thread(new Runnable() {
446 <                public void run(){
446 >                public void run() {
447                      try {
448                          q.take();
449 <                        threadFail("Should block");
449 >                        threadShouldThrow();
450                      } catch (InterruptedException success){ }                
451                  }
452              });
# Line 323 | Line 456 | public class DelayQueueTest extends JSR1
456              t.interrupt();
457              t.join();
458          } catch (Exception e){
459 <            fail("Unexpected exception");
459 >            unexpectedException();
460          }
461      }
462  
463 <    public void testBlockingTake(){
463 >    /**
464 >     * Take removes existing elements until empty, then blocks interruptibly
465 >     */
466 >    public void testBlockingTake() {
467          Thread t = new Thread(new Runnable() {
468                  public void run() {
469                      try {
# Line 336 | Line 472 | public class DelayQueueTest extends JSR1
472                              threadAssertEquals(new PDelay(i), ((PDelay)q.take()));
473                          }
474                          q.take();
475 <                        threadFail("take should block");
475 >                        threadShouldThrow();
476                      } catch (InterruptedException success){
477                      }  
478                  }});
# Line 347 | Line 483 | public class DelayQueueTest extends JSR1
483             t.join();
484          }
485          catch (InterruptedException ie) {
486 <            fail("Unexpected exception");
486 >            unexpectedException();
487          }
488      }
489  
490  
491 <    public void testPoll(){
491 >    /**
492 >     * poll succeeds unless empty
493 >     */
494 >    public void testPoll() {
495          DelayQueue q = populatedQueue(SIZE);
496          for (int i = 0; i < SIZE; ++i) {
497              assertEquals(new PDelay(i), ((PDelay)q.poll()));
# Line 360 | Line 499 | public class DelayQueueTest extends JSR1
499          assertNull(q.poll());
500      }
501  
502 +    /**
503 +     * timed pool with zero timeout succeeds when non-empty, else times out
504 +     */
505      public void testTimedPoll0() {
506          try {
507              DelayQueue q = populatedQueue(SIZE);
# Line 368 | Line 510 | public class DelayQueueTest extends JSR1
510              }
511              assertNull(q.poll(0, TimeUnit.MILLISECONDS));
512          } catch (InterruptedException e){
513 <            fail("Unexpected exception");
513 >            unexpectedException();
514          }  
515      }
516  
517 +    /**
518 +     * timed pool with nonzero timeout succeeds when non-empty, else times out
519 +     */
520      public void testTimedPoll() {
521          try {
522              DelayQueue q = populatedQueue(SIZE);
# Line 380 | Line 525 | public class DelayQueueTest extends JSR1
525              }
526              assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
527          } catch (InterruptedException e){
528 <            fail("Unexpected exception");
528 >            unexpectedException();
529          }  
530      }
531  
532 <    public void testInterruptedTimedPoll(){
532 >    /**
533 >     * Interrupted timed poll throws InterruptedException instead of
534 >     * returning timeout status
535 >     */
536 >    public void testInterruptedTimedPoll() {
537          Thread t = new Thread(new Runnable() {
538                  public void run() {
539                      try {
# Line 403 | Line 552 | public class DelayQueueTest extends JSR1
552             t.join();
553          }
554          catch (InterruptedException ie) {
555 <            fail("Unexpected exception");
555 >            unexpectedException();
556          }
557      }
558  
559 <    public void testTimedPollWithOffer(){
559 >    /**
560 >     *  timed poll before a delayed offer fails; after offer succeeds;
561 >     *  on interruption throws
562 >     */
563 >    public void testTimedPollWithOffer() {
564          final DelayQueue q = new DelayQueue();
565          Thread t = new Thread(new Runnable() {
566 <                public void run(){
566 >                public void run() {
567                      try {
568                          threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
569                          q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
# Line 426 | Line 579 | public class DelayQueueTest extends JSR1
579              t.interrupt();
580              t.join();
581          } catch (Exception e){
582 <            fail("Unexpected exception");
582 >            unexpectedException();
583          }
584      }  
585  
586  
587 <    public void testPeek(){
587 >    /**
588 >     * peek returns next element, or null if empty
589 >     */
590 >    public void testPeek() {
591          DelayQueue q = populatedQueue(SIZE);
592          for (int i = 0; i < SIZE; ++i) {
593              assertEquals(new PDelay(i), ((PDelay)q.peek()));
# Line 442 | Line 598 | public class DelayQueueTest extends JSR1
598          assertNull(q.peek());
599      }
600  
601 <    public void testElement(){
601 >    /**
602 >     * element returns next element, or throws NSEE if empty
603 >     */
604 >    public void testElement() {
605          DelayQueue q = populatedQueue(SIZE);
606          for (int i = 0; i < SIZE; ++i) {
607              assertEquals(new PDelay(i), ((PDelay)q.element()));
# Line 450 | Line 609 | public class DelayQueueTest extends JSR1
609          }
610          try {
611              q.element();
612 <            fail("no such element");
612 >            shouldThrow();
613          }
614          catch (NoSuchElementException success) {}
615      }
616  
617 <    public void testRemove(){
617 >    /**
618 >     * remove removes next element, or throws NSEE if empty
619 >     */
620 >    public void testRemove() {
621          DelayQueue q = populatedQueue(SIZE);
622          for (int i = 0; i < SIZE; ++i) {
623              assertEquals(new PDelay(i), ((PDelay)q.remove()));
624          }
625          try {
626              q.remove();
627 <            fail("remove should throw");
627 >            shouldThrow();
628          } catch (NoSuchElementException success){
629          }  
630      }
631  
632 <    public void testRemoveElement(){
632 >    /**
633 >     * remove(x) removes x and returns true if present
634 >     */
635 >    public void testRemoveElement() {
636          DelayQueue q = populatedQueue(SIZE);
637          for (int i = 1; i < SIZE; i+=2) {
638              assertTrue(q.remove(new PDelay(i)));
# Line 479 | Line 644 | public class DelayQueueTest extends JSR1
644          assertTrue(q.isEmpty());
645      }
646          
647 <    public void testContains(){
647 >    /**
648 >     * contains(x) reports true when elements added but not yet removed
649 >     */
650 >    public void testContains() {
651          DelayQueue q = populatedQueue(SIZE);
652          for (int i = 0; i < SIZE; ++i) {
653              assertTrue(q.contains(new PDelay(i)));
# Line 488 | Line 656 | public class DelayQueueTest extends JSR1
656          }
657      }
658  
659 <    public void testClear(){
659 >    /**
660 >     * clear removes all elements
661 >     */
662 >    public void testClear() {
663          DelayQueue q = populatedQueue(SIZE);
664          q.clear();
665          assertTrue(q.isEmpty());
# Line 500 | Line 671 | public class DelayQueueTest extends JSR1
671          assertTrue(q.isEmpty());
672      }
673  
674 <    public void testContainsAll(){
674 >    /**
675 >     * containsAll(c) is true when c contains a subset of elements
676 >     */
677 >    public void testContainsAll() {
678          DelayQueue q = populatedQueue(SIZE);
679          DelayQueue p = new DelayQueue();
680          for (int i = 0; i < SIZE; ++i) {
# Line 511 | Line 685 | public class DelayQueueTest extends JSR1
685          assertTrue(p.containsAll(q));
686      }
687  
688 <    public void testRetainAll(){
688 >    /**
689 >     * retainAll(c) retains only those elements of c and reports true if changed
690 >     */
691 >    public void testRetainAll() {
692          DelayQueue q = populatedQueue(SIZE);
693          DelayQueue p = populatedQueue(SIZE);
694          for (int i = 0; i < SIZE; ++i) {
# Line 527 | Line 704 | public class DelayQueueTest extends JSR1
704          }
705      }
706  
707 <    public void testRemoveAll(){
707 >    /**
708 >     * removeAll(c) removes only those elements of c and reports true if changed
709 >     */
710 >    public void testRemoveAll() {
711          for (int i = 1; i < SIZE; ++i) {
712              DelayQueue q = populatedQueue(SIZE);
713              DelayQueue p = populatedQueue(i);
# Line 540 | Line 720 | public class DelayQueueTest extends JSR1
720          }
721      }
722  
723 <    public void testToArray(){
723 >    /**
724 >     * toArray contains all elements
725 >     */
726 >    public void testToArray() {
727          DelayQueue q = populatedQueue(SIZE);
728          Object[] o = q.toArray();
729          Arrays.sort(o);
# Line 548 | Line 731 | public class DelayQueueTest extends JSR1
731          for(int i = 0; i < o.length; i++)
732              assertEquals(o[i], q.take());
733          } catch (InterruptedException e){
734 <            fail("Unexpected exception");
734 >            unexpectedException();
735          }    
736      }
737  
738 <    public void testToArray2(){
738 >    /**
739 >     * toArray(a) contains all elements
740 >     */
741 >    public void testToArray2() {
742          DelayQueue q = populatedQueue(SIZE);
743          PDelay[] ints = new PDelay[SIZE];
744          ints = (PDelay[])q.toArray(ints);
# Line 561 | Line 747 | public class DelayQueueTest extends JSR1
747              for(int i = 0; i < ints.length; i++)
748                  assertEquals(ints[i], q.take());
749          } catch (InterruptedException e){
750 <            fail("Unexpected exception");
750 >            unexpectedException();
751          }    
752      }
753 +
754 +
755 +    /**
756 +     * toArray(null) throws NPE
757 +     */
758 +    public void testToArray_BadArg() {
759 +        try {
760 +            DelayQueue q = populatedQueue(SIZE);
761 +            Object o[] = q.toArray(null);
762 +            shouldThrow();
763 +        } catch(NullPointerException success){}
764 +    }
765 +
766 +    /**
767 +     * toArray with incompatible array type throws CCE
768 +     */
769 +    public void testToArray1_BadArg() {
770 +        try {
771 +            DelayQueue q = populatedQueue(SIZE);
772 +            Object o[] = q.toArray(new String[10] );
773 +            shouldThrow();
774 +        } catch(ArrayStoreException  success){}
775 +    }
776      
777 <    public void testIterator(){
777 >    /**
778 >     * iterator iterates through all elements
779 >     */
780 >    public void testIterator() {
781          DelayQueue q = populatedQueue(SIZE);
782          int i = 0;
783          Iterator it = q.iterator();
# Line 576 | Line 788 | public class DelayQueueTest extends JSR1
788          assertEquals(i, SIZE);
789      }
790  
791 +    /**
792 +     * iterator.remove removes current element
793 +     */
794      public void testIteratorRemove () {
580
795          final DelayQueue q = new DelayQueue();
582
796          q.add(new PDelay(2));
797          q.add(new PDelay(1));
798          q.add(new PDelay(3));
586
799          Iterator it = q.iterator();
800          it.next();
801          it.remove();
590
802          it = q.iterator();
803          assertEquals(it.next(), new PDelay(2));
804          assertEquals(it.next(), new PDelay(3));
# Line 595 | Line 806 | public class DelayQueueTest extends JSR1
806      }
807  
808  
809 <    public void testToString(){
809 >    /**
810 >     * toString contains toStrings of elements
811 >     */
812 >    public void testToString() {
813          DelayQueue q = populatedQueue(SIZE);
814          String s = q.toString();
815          for (int i = 0; i < SIZE; ++i) {
# Line 603 | Line 817 | public class DelayQueueTest extends JSR1
817          }
818      }        
819  
820 +    /**
821 +     * offer transfers elements across Executor tasks
822 +     */
823      public void testPollInExecutor() {
607
824          final DelayQueue q = new DelayQueue();
609
825          ExecutorService executor = Executors.newFixedThreadPool(2);
611
826          executor.execute(new Runnable() {
827              public void run() {
828                  threadAssertNull(q.poll());
# Line 617 | Line 831 | public class DelayQueueTest extends JSR1
831                      threadAssertTrue(q.isEmpty());
832                  }
833                  catch (InterruptedException e) {
834 <                    threadFail("should not be interrupted");
834 >                    threadUnexpectedException();
835                  }
836              }
837          });
# Line 629 | Line 843 | public class DelayQueueTest extends JSR1
843                      q.put(new PDelay(1));
844                  }
845                  catch (InterruptedException e) {
846 <                    threadFail("should not be interrupted");
846 >                    threadUnexpectedException();
847                  }
848              }
849          });
636        
850          joinPool(executor);
851  
852      }
853  
641    static class NanoDelay implements Delayed {
642        long trigger;
643        NanoDelay(long i) {
644            trigger = System.nanoTime() + i;
645        }
646        public int compareTo(Object y) {
647            long i = trigger;
648            long j = ((NanoDelay)y).trigger;
649            if (i < j) return -1;
650            if (i > j) return 1;
651            return 0;
652        }
653
654        public int compareTo(NanoDelay y) {
655            long i = trigger;
656            long j = ((NanoDelay)y).trigger;
657            if (i < j) return -1;
658            if (i > j) return 1;
659            return 0;
660        }
661
662        public boolean equals(Object other) {
663            return ((NanoDelay)other).trigger == trigger;
664        }
665        public boolean equals(NanoDelay other) {
666            return ((NanoDelay)other).trigger == trigger;
667        }
668
669        public long getDelay(TimeUnit unit) {
670            long n = trigger - System.nanoTime();
671            return unit.convert(n, TimeUnit.NANOSECONDS);
672        }
673
674        public long getTriggerTime() {
675            return trigger;
676        }
677
678        public String toString() {
679            return String.valueOf(trigger);
680        }
681    }
854  
855 +    /**
856 +     * Delayed actions do not occur until their delay elapses
857 +     */
858      public void testDelay() {
859          DelayQueue q = new DelayQueue();
860          NanoDelay[] elements = new NanoDelay[SIZE];
# Line 702 | Line 877 | public class DelayQueueTest extends JSR1
877              }
878          }
879          catch(InterruptedException ie) {
880 <            fail("Unexpected Exception");
880 >            unexpectedException();
881 >        }
882 >    }
883 >
884 >
885 >    /**
886 >     * drainTo(null) throws NPE
887 >     */
888 >    public void testDrainToNull() {
889 >        DelayQueue q = populatedQueue(SIZE);
890 >        try {
891 >            q.drainTo(null);
892 >            shouldThrow();
893 >        } catch(NullPointerException success) {
894 >        }
895 >    }
896 >
897 >    /**
898 >     * drainTo(this) throws IAE
899 >     */
900 >    public void testDrainToSelf() {
901 >        DelayQueue q = populatedQueue(SIZE);
902 >        try {
903 >            q.drainTo(q);
904 >            shouldThrow();
905 >        } catch(IllegalArgumentException success) {
906          }
907      }
908  
909 +    /**
910 +     * drainTo(c) empties queue into another collection c
911 +     */
912 +    public void testDrainTo() {
913 +        DelayQueue q = populatedQueue(SIZE);
914 +        ArrayList l = new ArrayList();
915 +        q.drainTo(l);
916 +        assertEquals(q.size(), 0);
917 +        assertEquals(l.size(), SIZE);
918 +    }
919 +
920 +    /**
921 +     * drainTo empties queue
922 +     */
923 +    public void testDrainToWithActivePut() {
924 +        final DelayQueue q = populatedQueue(SIZE);
925 +        Thread t = new Thread(new Runnable() {
926 +                public void run() {
927 +                    q.put(new PDelay(SIZE+1));
928 +                }
929 +            });
930 +        try {
931 +            t.start();
932 +            ArrayList l = new ArrayList();
933 +            q.drainTo(l);
934 +            assertTrue(l.size() >= SIZE);
935 +            t.join();
936 +            assertTrue(q.size() + l.size() >= SIZE);
937 +        } catch(Exception e){
938 +            unexpectedException();
939 +        }
940 +    }
941 +
942 +    /**
943 +     * drainTo(null, n) throws NPE
944 +     */
945 +    public void testDrainToNullN() {
946 +        DelayQueue q = populatedQueue(SIZE);
947 +        try {
948 +            q.drainTo(null, 0);
949 +            shouldThrow();
950 +        } catch(NullPointerException success) {
951 +        }
952 +    }
953 +
954 +    /**
955 +     * drainTo(this, n) throws IAE
956 +     */
957 +    public void testDrainToSelfN() {
958 +        DelayQueue q = populatedQueue(SIZE);
959 +        try {
960 +            q.drainTo(q, 0);
961 +            shouldThrow();
962 +        } catch(IllegalArgumentException success) {
963 +        }
964 +    }
965 +
966 +    /**
967 +     * drainTo(c, n) empties first max {n, size} elements of queue into c
968 +     */
969 +    public void testDrainToN() {
970 +        for (int i = 0; i < SIZE + 2; ++i) {
971 +            DelayQueue q = populatedQueue(SIZE);
972 +            ArrayList l = new ArrayList();
973 +            q.drainTo(l, i);
974 +            int k = (i < SIZE)? i : SIZE;
975 +            assertEquals(q.size(), SIZE-k);
976 +            assertEquals(l.size(), k);
977 +        }
978 +    }
979 +
980 +
981   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines