ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/PriorityBlockingQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.52 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.66 by jsr166, Tue Oct 6 00:03:55 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.Comparator;
15   import java.util.Iterator;
16   import java.util.NoSuchElementException;
17   import java.util.Queue;
17 – import java.util.concurrent.PriorityBlockingQueue;
18   import java.util.concurrent.BlockingQueue;
19   import java.util.concurrent.CountDownLatch;
20   import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
22 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 > import java.util.concurrent.PriorityBlockingQueue;
23 >
24 > import junit.framework.Test;
25  
26   public class PriorityBlockingQueueTest extends JSR166TestCase {
27  
# Line 36 | Line 38 | public class PriorityBlockingQueueTest e
38      }
39  
40      public static void main(String[] args) {
41 <        junit.textui.TestRunner.run(suite());
41 >        main(suite(), args);
42      }
43  
44      public static Test suite() {
# Line 45 | Line 47 | public class PriorityBlockingQueueTest e
47                              new InitialCapacity().testSuite());
48      }
49  
48 –    private static final int NOCAP = Integer.MAX_VALUE;
49 –
50      /** Sample Comparator */
51      static class MyReverseComparator implements Comparator {
52          public int compare(Object x, Object y) {
# Line 62 | Line 62 | public class PriorityBlockingQueueTest e
62          PriorityBlockingQueue<Integer> q =
63              new PriorityBlockingQueue<Integer>(n);
64          assertTrue(q.isEmpty());
65 <        for (int i = n-1; i >= 0; i-=2)
65 >        for (int i = n - 1; i >= 0; i -= 2)
66              assertTrue(q.offer(new Integer(i)));
67 <        for (int i = (n & 1); i < n; i+=2)
67 >        for (int i = (n & 1); i < n; i += 2)
68              assertTrue(q.offer(new Integer(i)));
69          assertFalse(q.isEmpty());
70 <        assertEquals(NOCAP, q.remainingCapacity());
70 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
71          assertEquals(n, q.size());
72          return q;
73      }
# Line 76 | Line 76 | public class PriorityBlockingQueueTest e
76       * A new queue has unbounded capacity
77       */
78      public void testConstructor1() {
79 <        assertEquals(NOCAP, new PriorityBlockingQueue(SIZE).remainingCapacity());
79 >        assertEquals(Integer.MAX_VALUE,
80 >                     new PriorityBlockingQueue(SIZE).remainingCapacity());
81      }
82  
83      /**
# Line 115 | Line 116 | public class PriorityBlockingQueueTest e
116       */
117      public void testConstructor5() {
118          Integer[] ints = new Integer[SIZE];
119 <        for (int i = 0; i < SIZE-1; ++i)
119 >        for (int i = 0; i < SIZE - 1; ++i)
120              ints[i] = i;
121          Collection<Integer> elements = Arrays.asList(ints);
122          try {
# Line 147 | Line 148 | public class PriorityBlockingQueueTest e
148          for (int i = 0; i < SIZE; ++i)
149              ints[i] = new Integer(i);
150          q.addAll(Arrays.asList(ints));
151 <        for (int i = SIZE-1; i >= 0; --i)
151 >        for (int i = SIZE - 1; i >= 0; --i)
152              assertEquals(ints[i], q.poll());
153      }
154  
# Line 157 | Line 158 | public class PriorityBlockingQueueTest e
158      public void testEmpty() {
159          PriorityBlockingQueue q = new PriorityBlockingQueue(2);
160          assertTrue(q.isEmpty());
161 <        assertEquals(NOCAP, q.remainingCapacity());
161 >        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
162          q.add(one);
163          assertFalse(q.isEmpty());
164          q.add(two);
# Line 167 | Line 168 | public class PriorityBlockingQueueTest e
168      }
169  
170      /**
171 <     * remainingCapacity does not change when elements added or removed,
171 <     * but size does
171 >     * remainingCapacity() always returns Integer.MAX_VALUE
172       */
173      public void testRemainingCapacity() {
174 <        PriorityBlockingQueue q = populatedQueue(SIZE);
174 >        BlockingQueue q = populatedQueue(SIZE);
175          for (int i = 0; i < SIZE; ++i) {
176 <            assertEquals(NOCAP, q.remainingCapacity());
177 <            assertEquals(SIZE-i, q.size());
178 <            q.remove();
176 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
177 >            assertEquals(SIZE - i, q.size());
178 >            assertEquals(i, q.remove());
179          }
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(NOCAP, q.remainingCapacity());
181 >            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
182              assertEquals(i, q.size());
183 <            q.add(new Integer(i));
183 >            assertTrue(q.add(i));
184          }
185      }
186  
# Line 197 | Line 197 | public class PriorityBlockingQueueTest e
197       * Offer of non-Comparable throws CCE
198       */
199      public void testOfferNonComparable() {
200 +        PriorityBlockingQueue q = new PriorityBlockingQueue(1);
201          try {
201 –            PriorityBlockingQueue q = new PriorityBlockingQueue(1);
202 –            q.offer(new Object());
202              q.offer(new Object());
203              q.offer(new Object());
204              shouldThrow();
# Line 221 | Line 220 | public class PriorityBlockingQueueTest e
220       * addAll(this) throws IAE
221       */
222      public void testAddAllSelf() {
223 +        PriorityBlockingQueue q = populatedQueue(SIZE);
224          try {
225 –            PriorityBlockingQueue q = populatedQueue(SIZE);
225              q.addAll(q);
226              shouldThrow();
227          } catch (IllegalArgumentException success) {}
# Line 233 | Line 232 | public class PriorityBlockingQueueTest e
232       * possibly adding some elements
233       */
234      public void testAddAll3() {
235 +        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
236 +        Integer[] ints = new Integer[SIZE];
237 +        for (int i = 0; i < SIZE - 1; ++i)
238 +            ints[i] = new Integer(i);
239          try {
237 –            PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
238 –            Integer[] ints = new Integer[SIZE];
239 –            for (int i = 0; i < SIZE-1; ++i)
240 –                ints[i] = new Integer(i);
240              q.addAll(Arrays.asList(ints));
241              shouldThrow();
242          } catch (NullPointerException success) {}
# Line 249 | Line 248 | public class PriorityBlockingQueueTest e
248      public void testAddAll5() {
249          Integer[] empty = new Integer[0];
250          Integer[] ints = new Integer[SIZE];
251 <        for (int i = SIZE-1; i >= 0; --i)
251 >        for (int i = SIZE - 1; i >= 0; --i)
252              ints[i] = new Integer(i);
253          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
254          assertFalse(q.addAll(Arrays.asList(empty)));
# Line 264 | Line 263 | public class PriorityBlockingQueueTest e
263      public void testPut() {
264          PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
265          for (int i = 0; i < SIZE; ++i) {
266 <            Integer I = new Integer(i);
267 <            q.put(I);
268 <            assertTrue(q.contains(I));
266 >            Integer x = new Integer(i);
267 >            q.put(x);
268 >            assertTrue(q.contains(x));
269          }
270          assertEquals(SIZE, q.size());
271      }
# Line 394 | Line 393 | public class PriorityBlockingQueueTest e
393          final CountDownLatch aboutToWait = new CountDownLatch(1);
394          Thread t = newStartedThread(new CheckedRunnable() {
395              public void realRun() throws InterruptedException {
396 +                long startTime = System.nanoTime();
397                  for (int i = 0; i < SIZE; ++i) {
398 –                    long t0 = System.nanoTime();
398                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
400 –                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
399                  }
402 –                long t0 = System.nanoTime();
400                  aboutToWait.countDown();
401                  try {
402                      q.poll(LONG_DELAY_MS, MILLISECONDS);
403                      shouldThrow();
404                  } catch (InterruptedException success) {
405 <                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
405 >                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406                  }
407              }});
408  
409          aboutToWait.await();
410 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
410 >        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
411          t.interrupt();
412 <        awaitTermination(t, MEDIUM_DELAY_MS);
412 >        awaitTermination(t);
413      }
414  
415      /**
# Line 513 | Line 510 | public class PriorityBlockingQueueTest e
510                  assertTrue(changed);
511  
512              assertTrue(q.containsAll(p));
513 <            assertEquals(SIZE-i, q.size());
513 >            assertEquals(SIZE - i, q.size());
514              p.remove();
515          }
516      }
# Line 526 | Line 523 | public class PriorityBlockingQueueTest e
523              PriorityBlockingQueue q = populatedQueue(SIZE);
524              PriorityBlockingQueue p = populatedQueue(i);
525              assertTrue(q.removeAll(p));
526 <            assertEquals(SIZE-i, q.size());
526 >            assertEquals(SIZE - i, q.size());
527              for (int j = 0; j < i; ++j) {
528 <                Integer I = (Integer)(p.remove());
529 <                assertFalse(q.contains(I));
528 >                Integer x = (Integer)(p.remove());
529 >                assertFalse(q.contains(x));
530              }
531          }
532      }
# Line 574 | Line 571 | public class PriorityBlockingQueueTest e
571       */
572      public void testIterator() {
573          PriorityBlockingQueue q = populatedQueue(SIZE);
577 –        int i = 0;
574          Iterator it = q.iterator();
575 <        while (it.hasNext()) {
575 >        int i;
576 >        for (i = 0; it.hasNext(); i++)
577              assertTrue(q.contains(it.next()));
581 –            ++i;
582 –        }
578          assertEquals(i, SIZE);
579 +        assertIteratorExhausted(it);
580 +    }
581 +
582 +    /**
583 +     * iterator of empty collection has no elements
584 +     */
585 +    public void testEmptyIterator() {
586 +        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
587      }
588  
589      /**
# Line 619 | Line 622 | public class PriorityBlockingQueueTest e
622      public void testPollInExecutor() {
623          final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
624          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
625 <        ExecutorService executor = Executors.newFixedThreadPool(2);
626 <        executor.execute(new CheckedRunnable() {
627 <            public void realRun() throws InterruptedException {
628 <                assertNull(q.poll());
629 <                threadsStarted.await();
630 <                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
631 <                checkEmpty(q);
632 <            }});
633 <
634 <        executor.execute(new CheckedRunnable() {
635 <            public void realRun() throws InterruptedException {
636 <                threadsStarted.await();
637 <                q.put(one);
638 <            }});
639 <
640 <        joinPool(executor);
625 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
626 >        try (PoolCleaner cleaner = cleaner(executor)) {
627 >            executor.execute(new CheckedRunnable() {
628 >                public void realRun() throws InterruptedException {
629 >                    assertNull(q.poll());
630 >                    threadsStarted.await();
631 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
632 >                    checkEmpty(q);
633 >                }});
634 >
635 >            executor.execute(new CheckedRunnable() {
636 >                public void realRun() throws InterruptedException {
637 >                    threadsStarted.await();
638 >                    q.put(one);
639 >                }});
640 >        }
641      }
642  
643      /**
# Line 684 | Line 687 | public class PriorityBlockingQueueTest e
687          final PriorityBlockingQueue q = populatedQueue(SIZE);
688          Thread t = new Thread(new CheckedRunnable() {
689              public void realRun() {
690 <                q.put(new Integer(SIZE+1));
690 >                q.put(new Integer(SIZE + 1));
691              }});
692  
693          t.start();
# Line 701 | Line 704 | public class PriorityBlockingQueueTest e
704       * drainTo(c, n) empties first min(n, size) elements of queue into c
705       */
706      public void testDrainToN() {
707 <        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
707 >        PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE * 2);
708          for (int i = 0; i < SIZE + 2; ++i) {
709              for (int j = 0; j < SIZE; j++)
710                  assertTrue(q.offer(new Integer(j)));
# Line 709 | Line 712 | public class PriorityBlockingQueueTest e
712              q.drainTo(l, i);
713              int k = (i < SIZE) ? i : SIZE;
714              assertEquals(k, l.size());
715 <            assertEquals(SIZE-k, q.size());
715 >            assertEquals(SIZE - k, q.size());
716              for (int j = 0; j < k; ++j)
717                  assertEquals(l.get(j), new Integer(j));
718 <            while (q.poll() != null) ;
718 >            do {} while (q.poll() != null);
719 >        }
720 >    }
721 >
722 >    /**
723 >     * remove(null), contains(null) always return false
724 >     */
725 >    public void testNeverContainsNull() {
726 >        Collection<?>[] qs = {
727 >            new PriorityBlockingQueue<Object>(),
728 >            populatedQueue(2),
729 >        };
730 >
731 >        for (Collection<?> q : qs) {
732 >            assertFalse(q.contains(null));
733 >            assertFalse(q.remove(null));
734          }
735      }
736  

Diff Legend

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