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.19 by jsr166, Fri Nov 5 00:17:22 2010 UTC vs.
Revision 1.22 by jsr166, Fri May 27 19:52:35 2011 UTC

# Line 1 | Line 1
1   /*
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
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
# Line 316 | Line 316 | public class PriorityQueueTest extends J
316      public void testRemoveElement() {
317          PriorityQueue q = populatedQueue(SIZE);
318          for (int i = 1; i < SIZE; i+=2) {
319 <            assertTrue(q.remove(new Integer(i)));
319 >            assertTrue(q.contains(i));
320 >            assertTrue(q.remove(i));
321 >            assertFalse(q.contains(i));
322 >            assertTrue(q.contains(i-1));
323          }
324          for (int i = 0; i < SIZE; i+=2) {
325 <            assertTrue(q.remove(new Integer(i)));
326 <            assertFalse(q.remove(new Integer(i+1)));
325 >            assertTrue(q.contains(i));
326 >            assertTrue(q.remove(i));
327 >            assertFalse(q.contains(i));
328 >            assertFalse(q.remove(i+1));
329 >            assertFalse(q.contains(i+1));
330          }
331          assertTrue(q.isEmpty());
332      }
# Line 457 | Line 463 | public class PriorityQueueTest extends J
463          assertFalse(it.hasNext());
464      }
465  
460
466      /**
467       * toString contains toStrings of elements
468       */
# Line 465 | Line 470 | public class PriorityQueueTest extends J
470          PriorityQueue q = populatedQueue(SIZE);
471          String s = q.toString();
472          for (int i = 0; i < SIZE; ++i) {
473 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
473 >            assertTrue(s.contains(String.valueOf(i)));
474          }
475      }
476  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines