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

Comparing jsr166/src/test/tck/PriorityQueueTest.java (file contents):
Revision 1.23 by jsr166, Tue May 31 16:16:24 2011 UTC vs.
Revision 1.32 by jsr166, Sat Feb 28 20:13:46 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 – import junit.framework.*;
9   import java.util.Arrays;
10   import java.util.Collection;
11   import java.util.Comparator;
# Line 15 | Line 14 | import java.util.NoSuchElementException;
14   import java.util.PriorityQueue;
15   import java.util.Queue;
16  
17 + import junit.framework.Test;
18 + import junit.framework.TestSuite;
19 +
20   public class PriorityQueueTest extends JSR166TestCase {
21      public static void main(String[] args) {
22          junit.textui.TestRunner.run(suite());
# Line 30 | Line 32 | public class PriorityQueueTest extends J
32      }
33  
34      /**
35 <     * Create a queue of given size containing consecutive
35 >     * Returns a new queue of given size containing consecutive
36       * Integers 0 ... n.
37       */
38      private PriorityQueue<Integer> populatedQueue(int n) {
39          PriorityQueue<Integer> q = new PriorityQueue<Integer>(n);
40          assertTrue(q.isEmpty());
41 <        for (int i = n-1; i >= 0; i-=2)
41 >        for (int i = n-1; i >= 0; i -= 2)
42              assertTrue(q.offer(new Integer(i)));
43 <        for (int i = (n & 1); i < n; i+=2)
43 >        for (int i = (n & 1); i < n; i += 2)
44              assertTrue(q.offer(new Integer(i)));
45          assertFalse(q.isEmpty());
46          assertEquals(n, q.size());
# Line 57 | Line 59 | public class PriorityQueueTest extends J
59       */
60      public void testConstructor2() {
61          try {
62 <            PriorityQueue q = new PriorityQueue(0);
62 >            new PriorityQueue(0);
63              shouldThrow();
64          } catch (IllegalArgumentException success) {}
65      }
# Line 67 | Line 69 | public class PriorityQueueTest extends J
69       */
70      public void testConstructor3() {
71          try {
72 <            PriorityQueue q = new PriorityQueue((Collection)null);
72 >            new PriorityQueue((Collection)null);
73              shouldThrow();
74          } catch (NullPointerException success) {}
75      }
# Line 78 | Line 80 | public class PriorityQueueTest extends J
80      public void testConstructor4() {
81          try {
82              Integer[] ints = new Integer[SIZE];
83 <            PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
83 >            new PriorityQueue(Arrays.asList(ints));
84              shouldThrow();
85          } catch (NullPointerException success) {}
86      }
# Line 91 | Line 93 | public class PriorityQueueTest extends J
93              Integer[] ints = new Integer[SIZE];
94              for (int i = 0; i < SIZE-1; ++i)
95                  ints[i] = new Integer(i);
96 <            PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
96 >            new PriorityQueue(Arrays.asList(ints));
97              shouldThrow();
98          } catch (NullPointerException success) {}
99      }
# Line 187 | Line 189 | public class PriorityQueueTest extends J
189       * Offer of non-Comparable throws CCE
190       */
191      public void testOfferNonComparable() {
192 +        PriorityQueue q = new PriorityQueue(1);
193          try {
191 –            PriorityQueue q = new PriorityQueue(1);
192 –            q.offer(new Object());
194              q.offer(new Object());
195              q.offer(new Object());
196              shouldThrow();
# Line 319 | Line 320 | public class PriorityQueueTest extends J
320       */
321      public void testRemoveElement() {
322          PriorityQueue q = populatedQueue(SIZE);
323 <        for (int i = 1; i < SIZE; i+=2) {
323 >        for (int i = 1; i < SIZE; i += 2) {
324              assertTrue(q.contains(i));
325              assertTrue(q.remove(i));
326              assertFalse(q.contains(i));
327              assertTrue(q.contains(i-1));
328          }
329 <        for (int i = 0; i < SIZE; i+=2) {
329 >        for (int i = 0; i < SIZE; i += 2) {
330              assertTrue(q.contains(i));
331              assertTrue(q.remove(i));
332              assertFalse(q.contains(i));
# Line 404 | Line 405 | public class PriorityQueueTest extends J
405              assertTrue(q.removeAll(p));
406              assertEquals(SIZE-i, q.size());
407              for (int j = 0; j < i; ++j) {
408 <                Integer I = (Integer)(p.remove());
409 <                assertFalse(q.contains(I));
408 >                Integer x = (Integer)(p.remove());
409 >                assertFalse(q.contains(x));
410              }
411          }
412      }
# Line 439 | Line 440 | public class PriorityQueueTest extends J
440       */
441      public void testIterator() {
442          PriorityQueue q = populatedQueue(SIZE);
442 –        int i = 0;
443          Iterator it = q.iterator();
444 <        while (it.hasNext()) {
444 >        int i;
445 >        for (i = 0; it.hasNext(); i++)
446              assertTrue(q.contains(it.next()));
446 –            ++i;
447 –        }
447          assertEquals(i, SIZE);
448 +        assertIteratorExhausted(it);
449 +    }
450 +
451 +    /**
452 +     * iterator of empty collection has no elements
453 +     */
454 +    public void testEmptyIterator() {
455 +        assertIteratorExhausted(new PriorityQueue().iterator());
456      }
457  
458      /**
# Line 485 | Line 492 | public class PriorityQueueTest extends J
492          Queue x = populatedQueue(SIZE);
493          Queue y = serialClone(x);
494  
495 <        assertTrue(x != y);
495 >        assertNotSame(x, y);
496          assertEquals(x.size(), y.size());
497          while (!x.isEmpty()) {
498              assertFalse(y.isEmpty());

Diff Legend

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