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.34 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.37 by jsr166, Wed Jun 1 16:08:04 2016 UTC

#	Line 38 | Line 38 | public class PriorityQueueTest extends J
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)
44		assertTrue(q.offer(new Integer(i)));
#	Line 89 | Line 89 | public class PriorityQueueTest extends J
89		*/
90		public void testConstructor5() {
91		Integer[] ints = new Integer[SIZE];
92	<	for (int i = 0; i < SIZE-1; ++i)
92	>	for (int i = 0; i < SIZE - 1; ++i)
93		ints[i] = new Integer(i);
94		try {
95		new PriorityQueue(Arrays.asList(ints));
#	Line 120 | Line 120 | public class PriorityQueueTest extends J
120		for (int i = 0; i < SIZE; ++i)
121		ints[i] = new Integer(i);
122		q.addAll(Arrays.asList(ints));
123	<	for (int i = SIZE-1; i >= 0; --i)
123	>	for (int i = SIZE - 1; i >= 0; --i)
124		assertEquals(ints[i], q.poll());
125		}
126
#	Line 144 | Line 144 | public class PriorityQueueTest extends J
144		public void testSize() {
145		PriorityQueue q = populatedQueue(SIZE);
146		for (int i = 0; i < SIZE; ++i) {
147	<	assertEquals(SIZE-i, q.size());
147	>	assertEquals(SIZE - i, q.size());
148		q.remove();
149		}
150		for (int i = 0; i < SIZE; ++i) {
#	Line 191 | Line 191 | public class PriorityQueueTest extends J
191		PriorityQueue q = new PriorityQueue(1);
192		try {
193		q.offer(new Object());
194	–	q.offer(new Object());
194		shouldThrow();
195	<	} catch (ClassCastException success) {}
195	>	} catch (ClassCastException success) {
196	>	assertTrue(q.isEmpty());
197	>	assertEquals(0, q.size());
198	>	assertNull(q.poll());
199	>	}
200		}
201
202		/**
#	Line 236 | Line 239 | public class PriorityQueueTest extends J
239		public void testAddAll3() {
240		PriorityQueue q = new PriorityQueue(SIZE);
241		Integer[] ints = new Integer[SIZE];
242	<	for (int i = 0; i < SIZE-1; ++i)
242	>	for (int i = 0; i < SIZE - 1; ++i)
243		ints[i] = new Integer(i);
244		try {
245		q.addAll(Arrays.asList(ints));
#	Line 251 | Line 254 | public class PriorityQueueTest extends J
254		Integer[] empty = new Integer[0];
255		Integer[] ints = new Integer[SIZE];
256		for (int i = 0; i < SIZE; ++i)
257	<	ints[i] = new Integer(SIZE-1-i);
257	>	ints[i] = new Integer(SIZE - 1 - i);
258		PriorityQueue q = new PriorityQueue(SIZE);
259		assertFalse(q.addAll(Arrays.asList(empty)));
260		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 322 | Line 325 | public class PriorityQueueTest extends J
325		assertTrue(q.contains(i));
326		assertTrue(q.remove(i));
327		assertFalse(q.contains(i));
328	<	assertTrue(q.contains(i-1));
328	>	assertTrue(q.contains(i - 1));
329		}
330		for (int i = 0; i < SIZE; i += 2) {
331		assertTrue(q.contains(i));
332		assertTrue(q.remove(i));
333		assertFalse(q.contains(i));
334	<	assertFalse(q.remove(i+1));
335	<	assertFalse(q.contains(i+1));
334	>	assertFalse(q.remove(i + 1));
335	>	assertFalse(q.contains(i + 1));
336		}
337		assertTrue(q.isEmpty());
338		}
#	Line 388 | Line 391 | public class PriorityQueueTest extends J
391		assertTrue(changed);
392
393		assertTrue(q.containsAll(p));
394	<	assertEquals(SIZE-i, q.size());
394	>	assertEquals(SIZE - i, q.size());
395		p.remove();
396		}
397		}
#	Line 401 | Line 404 | public class PriorityQueueTest extends J
404		PriorityQueue q = populatedQueue(SIZE);
405		PriorityQueue p = populatedQueue(i);
406		assertTrue(q.removeAll(p));
407	<	assertEquals(SIZE-i, q.size());
407	>	assertEquals(SIZE - i, q.size());
408		for (int j = 0; j < i; ++j) {
409		Integer x = (Integer)(p.remove());
410		assertFalse(q.contains(x));

Diff Legend

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