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.62 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.73 by jsr166, Sat May 23 00:53:08 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.Arrays;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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;
# Line 18 | Line 20 | import java.util.concurrent.DelayQueue;
20   import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
22   import java.util.concurrent.TimeUnit;
23 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
23 >
24 > import junit.framework.Test;
25  
26   public class DelayQueueTest extends JSR166TestCase {
27  
# Line 32 | Line 35 | public class DelayQueueTest extends JSR1
35      }
36  
37      public static void main(String[] args) {
38 <        junit.textui.TestRunner.run(suite());
38 >        main(suite(), args);
39      }
40  
41      public static Test suite() {
# Line 40 | Line 43 | public class DelayQueueTest extends JSR1
43                              new Generic().testSuite());
44      }
45  
43 –    private static final int NOCAP = Integer.MAX_VALUE;
44 –
46      /**
47       * A delayed implementation for testing.
48       * Most tests use Pseudodelays, where delays are all elapsed
# Line 123 | Line 124 | public class DelayQueueTest extends JSR1
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 137 | 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 145 | 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 155 | Line 156 | public class DelayQueueTest extends JSR1
156       */
157      public void testConstructor4() {
158          try {
159 <            PDelay[] ints = new PDelay[SIZE];
159 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
159 >            new DelayQueue(Arrays.asList(new PDelay[SIZE]));
160              shouldThrow();
161          } catch (NullPointerException success) {}
162      }
# Line 165 | Line 165 | public class DelayQueueTest extends JSR1
165       * Initializing from Collection with some null elements throws NPE
166       */
167      public void testConstructor5() {
168 +        PDelay[] a = new PDelay[SIZE];
169 +        for (int i = 0; i < SIZE - 1; ++i)
170 +            a[i] = new PDelay(i);
171          try {
172 <            PDelay[] ints = new PDelay[SIZE];
170 <            for (int i = 0; i < SIZE-1; ++i)
171 <                ints[i] = new PDelay(i);
172 <            DelayQueue q = new DelayQueue(Arrays.asList(ints));
172 >            new DelayQueue(Arrays.asList(a));
173              shouldThrow();
174          } catch (NullPointerException success) {}
175      }
# Line 192 | Line 192 | public class DelayQueueTest extends JSR1
192      public void testEmpty() {
193          DelayQueue q = new DelayQueue();
194          assertTrue(q.isEmpty());
195 <        assertEquals(NOCAP, q.remainingCapacity());
195 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
196          q.add(new PDelay(1));
197          assertFalse(q.isEmpty());
198          q.add(new PDelay(2));
# Line 202 | Line 202 | public class DelayQueueTest extends JSR1
202      }
203  
204      /**
205 <     * remainingCapacity does not change when elements added or removed,
206 <     * but size does
205 >     * remainingCapacity() always returns Integer.MAX_VALUE
206       */
207      public void testRemainingCapacity() {
208 <        DelayQueue q = populatedQueue(SIZE);
208 >        BlockingQueue q = populatedQueue(SIZE);
209          for (int i = 0; i < SIZE; ++i) {
210 <            assertEquals(NOCAP, q.remainingCapacity());
211 <            assertEquals(SIZE-i, q.size());
212 <            q.remove();
210 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211 >            assertEquals(SIZE - i, q.size());
212 >            assertTrue(q.remove() instanceof PDelay);
213          }
214          for (int i = 0; i < SIZE; ++i) {
215 <            assertEquals(NOCAP, q.remainingCapacity());
215 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
216              assertEquals(i, q.size());
217 <            q.add(new PDelay(i));
217 >            assertTrue(q.add(new PDelay(i)));
218          }
219      }
220  
# Line 243 | Line 242 | public class DelayQueueTest extends JSR1
242       * addAll(this) throws IAE
243       */
244      public void testAddAllSelf() {
245 +        DelayQueue q = populatedQueue(SIZE);
246          try {
247 –            DelayQueue q = populatedQueue(SIZE);
247              q.addAll(q);
248              shouldThrow();
249          } catch (IllegalArgumentException success) {}
# Line 255 | Line 254 | public class DelayQueueTest extends JSR1
254       * possibly adding some elements
255       */
256      public void testAddAll3() {
257 +        DelayQueue q = new DelayQueue();
258 +        PDelay[] a = new PDelay[SIZE];
259 +        for (int i = 0; i < SIZE - 1; ++i)
260 +            a[i] = new PDelay(i);
261          try {
262 <            DelayQueue q = new DelayQueue();
260 <            PDelay[] ints = new PDelay[SIZE];
261 <            for (int i = 0; i < SIZE-1; ++i)
262 <                ints[i] = new PDelay(i);
263 <            q.addAll(Arrays.asList(ints));
262 >            q.addAll(Arrays.asList(a));
263              shouldThrow();
264          } catch (NullPointerException success) {}
265      }
# Line 271 | Line 270 | public class DelayQueueTest extends JSR1
270      public void testAddAll5() {
271          PDelay[] empty = new PDelay[0];
272          PDelay[] ints = new PDelay[SIZE];
273 <        for (int i = SIZE-1; i >= 0; --i)
273 >        for (int i = SIZE - 1; i >= 0; --i)
274              ints[i] = new PDelay(i);
275          DelayQueue q = new DelayQueue();
276          assertFalse(q.addAll(Arrays.asList(empty)));
# Line 286 | Line 285 | public class DelayQueueTest extends JSR1
285      public void testPut() {
286          DelayQueue q = new DelayQueue();
287          for (int i = 0; i < SIZE; ++i) {
288 <            PDelay I = new PDelay(i);
289 <            q.put(I);
290 <            assertTrue(q.contains(I));
288 >            PDelay x = new PDelay(i);
289 >            q.put(x);
290 >            assertTrue(q.contains(x));
291          }
292          assertEquals(SIZE, q.size());
293      }
# Line 332 | Line 331 | public class DelayQueueTest extends JSR1
331      public void testTake() throws InterruptedException {
332          DelayQueue q = populatedQueue(SIZE);
333          for (int i = 0; i < SIZE; ++i) {
334 <            assertEquals(new PDelay(i), ((PDelay)q.take()));
334 >            assertEquals(new PDelay(i), q.take());
335          }
336      }
337  
# Line 375 | Line 374 | public class DelayQueueTest extends JSR1
374      public void testPoll() {
375          DelayQueue q = populatedQueue(SIZE);
376          for (int i = 0; i < SIZE; ++i) {
377 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
377 >            assertEquals(new PDelay(i), q.poll());
378          }
379          assertNull(q.poll());
380      }
# Line 386 | Line 385 | public class DelayQueueTest extends JSR1
385      public void testTimedPoll0() throws InterruptedException {
386          DelayQueue q = populatedQueue(SIZE);
387          for (int i = 0; i < SIZE; ++i) {
388 <            assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
388 >            assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
389          }
390          assertNull(q.poll(0, MILLISECONDS));
391      }
# Line 398 | Line 397 | public class DelayQueueTest extends JSR1
397          DelayQueue q = populatedQueue(SIZE);
398          for (int i = 0; i < SIZE; ++i) {
399              long startTime = System.nanoTime();
400 <            assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
400 >            assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
401              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
402          }
403          long startTime = System.nanoTime();
# Line 447 | Line 446 | public class DelayQueueTest extends JSR1
446      public void testPeek() {
447          DelayQueue q = populatedQueue(SIZE);
448          for (int i = 0; i < SIZE; ++i) {
449 <            assertEquals(new PDelay(i), ((PDelay)q.peek()));
450 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
449 >            assertEquals(new PDelay(i), q.peek());
450 >            assertEquals(new PDelay(i), q.poll());
451              if (q.isEmpty())
452                  assertNull(q.peek());
453              else
# Line 463 | Line 462 | public class DelayQueueTest extends JSR1
462      public void testElement() {
463          DelayQueue q = populatedQueue(SIZE);
464          for (int i = 0; i < SIZE; ++i) {
465 <            assertEquals(new PDelay(i), ((PDelay)q.element()));
465 >            assertEquals(new PDelay(i), q.element());
466              q.poll();
467          }
468          try {
# Line 478 | Line 477 | public class DelayQueueTest extends JSR1
477      public void testRemove() {
478          DelayQueue q = populatedQueue(SIZE);
479          for (int i = 0; i < SIZE; ++i) {
480 <            assertEquals(new PDelay(i), ((PDelay)q.remove()));
480 >            assertEquals(new PDelay(i), q.remove());
481          }
482          try {
483              q.remove();
# Line 506 | Line 505 | public class DelayQueueTest extends JSR1
505          q.clear();
506          assertTrue(q.isEmpty());
507          assertEquals(0, q.size());
508 <        assertEquals(NOCAP, q.remainingCapacity());
508 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
509          PDelay x = new PDelay(1);
510          q.add(x);
511          assertFalse(q.isEmpty());
# Line 543 | Line 542 | public class DelayQueueTest extends JSR1
542                  assertTrue(changed);
543  
544              assertTrue(q.containsAll(p));
545 <            assertEquals(SIZE-i, q.size());
545 >            assertEquals(SIZE - i, q.size());
546              p.remove();
547          }
548      }
# Line 556 | Line 555 | public class DelayQueueTest extends JSR1
555              DelayQueue q = populatedQueue(SIZE);
556              DelayQueue p = populatedQueue(i);
557              assertTrue(q.removeAll(p));
558 <            assertEquals(SIZE-i, q.size());
558 >            assertEquals(SIZE - i, q.size());
559              for (int j = 0; j < i; ++j) {
560 <                PDelay I = (PDelay)(p.remove());
561 <                assertFalse(q.contains(I));
560 >                PDelay x = (PDelay)(p.remove());
561 >                assertFalse(q.contains(x));
562              }
563          }
564      }
# Line 611 | Line 610 | public class DelayQueueTest extends JSR1
610              ++i;
611          }
612          assertEquals(i, SIZE);
613 +        assertIteratorExhausted(it);
614 +    }
615 +
616 +    /**
617 +     * iterator of empty collection has no elements
618 +     */
619 +    public void testEmptyIterator() {
620 +        assertIteratorExhausted(new DelayQueue().iterator());
621      }
622  
623      /**
# Line 746 | Line 753 | public class DelayQueueTest extends JSR1
753          final DelayQueue q = populatedQueue(SIZE);
754          Thread t = new Thread(new CheckedRunnable() {
755              public void realRun() {
756 <                q.put(new PDelay(SIZE+1));
756 >                q.put(new PDelay(SIZE + 1));
757              }});
758  
759          t.start();
# Line 766 | Line 773 | public class DelayQueueTest extends JSR1
773              ArrayList l = new ArrayList();
774              q.drainTo(l, i);
775              int k = (i < SIZE) ? i : SIZE;
776 <            assertEquals(SIZE-k, q.size());
776 >            assertEquals(SIZE - k, q.size());
777              assertEquals(k, l.size());
778          }
779      }
780  
781 +    /**
782 +     * remove(null), contains(null) always return false
783 +     */
784 +    public void testNeverContainsNull() {
785 +        Collection<?> q = populatedQueue(SIZE);
786 +        assertFalse(q.contains(null));
787 +        assertFalse(q.remove(null));
788 +    }
789   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines