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.28 by jsr166, Wed Dec 31 20:09:09 2014 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 319 | Line 321 | public class PriorityQueueTest extends J
321       */
322      public void testRemoveElement() {
323          PriorityQueue q = populatedQueue(SIZE);
324 <        for (int i = 1; i < SIZE; i+=2) {
324 >        for (int i = 1; i < SIZE; i += 2) {
325              assertTrue(q.contains(i));
326              assertTrue(q.remove(i));
327              assertFalse(q.contains(i));
328              assertTrue(q.contains(i-1));
329          }
330 <        for (int i = 0; i < SIZE; i+=2) {
330 >        for (int i = 0; i < SIZE; i += 2) {
331              assertTrue(q.contains(i));
332              assertTrue(q.remove(i));
333              assertFalse(q.contains(i));
# Line 485 | Line 487 | public class PriorityQueueTest extends J
487          Queue x = populatedQueue(SIZE);
488          Queue y = serialClone(x);
489  
490 <        assertTrue(x != y);
490 >        assertNotSame(x, y);
491          assertEquals(x.size(), y.size());
492          while (!x.isEmpty()) {
493              assertFalse(y.isEmpty());

Diff Legend

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