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.32 by jsr166, Sat Feb 28 20:13:46 2015 UTC vs.
Revision 1.37 by jsr166, Wed Jun 1 16:08:04 2016 UTC

#	Line 19 | Line 19 | import junit.framework.TestSuite;
19
20		public class PriorityQueueTest extends JSR166TestCase {
21		public static void main(String[] args) {
22	<	junit.textui.TestRunner.run(suite());
22	>	main(suite(), args);
23		}
24		public static Test suite() {
25		return new TestSuite(PriorityQueueTest.class);
#	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 79 | Line 79 | public class PriorityQueueTest extends J
79		*/
80		public void testConstructor4() {
81		try {
82	<	Integer[] ints = new Integer[SIZE];
83	<	new PriorityQueue(Arrays.asList(ints));
82	>	new PriorityQueue(Arrays.asList(new Integer[SIZE]));
83		shouldThrow();
84		} catch (NullPointerException success) {}
85		}
#	Line 89 | Line 88 | public class PriorityQueueTest extends J
88		* Initializing from Collection with some null elements throws NPE
89		*/
90		public void testConstructor5() {
91	+	Integer[] ints = new Integer[SIZE];
92	+	for (int i = 0; i < SIZE - 1; ++i)
93	+	ints[i] = new Integer(i);
94		try {
93	–	Integer[] ints = new Integer[SIZE];
94	–	for (int i = 0; i < SIZE-1; ++i)
95	–	ints[i] = new Integer(i);
95		new PriorityQueue(Arrays.asList(ints));
96		shouldThrow();
97		} catch (NullPointerException success) {}
#	Line 121 | 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 145 | 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 158 | Line 157 | public class PriorityQueueTest extends J
157		* offer(null) throws NPE
158		*/
159		public void testOfferNull() {
160	+	PriorityQueue q = new PriorityQueue(1);
161		try {
162	–	PriorityQueue q = new PriorityQueue(1);
162		q.offer(null);
163		shouldThrow();
164		} catch (NullPointerException success) {}
#	Line 169 | Line 168 | public class PriorityQueueTest extends J
168		* add(null) throws NPE
169		*/
170		public void testAddNull() {
171	+	PriorityQueue q = new PriorityQueue(1);
172		try {
173	–	PriorityQueue q = new PriorityQueue(1);
173		q.add(null);
174		shouldThrow();
175		} catch (NullPointerException success) {}
#	Line 192 | Line 191 | public class PriorityQueueTest extends J
191		PriorityQueue q = new PriorityQueue(1);
192		try {
193		q.offer(new Object());
195	–	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 212 | Line 214 | public class PriorityQueueTest extends J
214		* addAll(null) throws NPE
215		*/
216		public void testAddAll1() {
217	+	PriorityQueue q = new PriorityQueue(1);
218		try {
216	–	PriorityQueue q = new PriorityQueue(1);
219		q.addAll(null);
220		shouldThrow();
221		} catch (NullPointerException success) {}
#	Line 223 | Line 225 | public class PriorityQueueTest extends J
225		* addAll of a collection with null elements throws NPE
226		*/
227		public void testAddAll2() {
228	+	PriorityQueue q = new PriorityQueue(SIZE);
229		try {
230	<	PriorityQueue q = new PriorityQueue(SIZE);
228	<	Integer[] ints = new Integer[SIZE];
229	<	q.addAll(Arrays.asList(ints));
230	>	q.addAll(Arrays.asList(new Integer[SIZE]));
231		shouldThrow();
232		} catch (NullPointerException success) {}
233		}
#	Line 236 | Line 237 | public class PriorityQueueTest extends J
237		* possibly adding some elements
238		*/
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)
243	+	ints[i] = new Integer(i);
244		try {
240	–	PriorityQueue q = new PriorityQueue(SIZE);
241	–	Integer[] ints = new Integer[SIZE];
242	–	for (int i = 0; i < SIZE-1; ++i)
243	–	ints[i] = new Integer(i);
245		q.addAll(Arrays.asList(ints));
246		shouldThrow();
247		} catch (NullPointerException success) {}
#	Line 253 | 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 324 | 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 390 | 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 403 | 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