ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/PriorityQueueTest.java

Comparing jsr166/src/test/tck/PriorityQueueTest.java (file contents):
Revision 1.18 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.20 by jsr166, Thu Nov 18 20:21:53 2010 UTC

#	Line 29 | Line 29 | public class PriorityQueueTest extends J
29		* Create a queue of given size containing consecutive
30		* Integers 0 ... n.
31		*/
32	<	private PriorityQueue populatedQueue(int n) {
33	<	PriorityQueue q = new PriorityQueue(n);
32	>	private PriorityQueue<Integer> populatedQueue(int n) {
33	>	PriorityQueue<Integer> q = new PriorityQueue<Integer>(n);
34		assertTrue(q.isEmpty());
35		for (int i = n-1; i >= 0; i-=2)
36		assertTrue(q.offer(new Integer(i)));
#	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 415 | Line 421 | public class PriorityQueueTest extends J
421		* toArray(a) contains all elements
422		*/
423		public void testToArray2() {
424	<	PriorityQueue q = populatedQueue(SIZE);
424	>	PriorityQueue<Integer> q = populatedQueue(SIZE);
425		Integer[] ints = new Integer[SIZE];
426	<	assertSame(ints, q.toArray(ints));
426	>	Integer[] array = q.toArray(ints);
427	>	assertSame(ints, array);
428		Arrays.sort(ints);
429		for (int i = 0; i < ints.length; i++)
430		assertSame(ints[i], q.poll());

Diff Legend

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