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.35 by jsr166, Sat May 23 00:53:08 2015 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 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 212 | Line 211 | public class PriorityQueueTest extends J
211		* addAll(null) throws NPE
212		*/
213		public void testAddAll1() {
214	+	PriorityQueue q = new PriorityQueue(1);
215		try {
216	–	PriorityQueue q = new PriorityQueue(1);
216		q.addAll(null);
217		shouldThrow();
218		} catch (NullPointerException success) {}
#	Line 223 | Line 222 | public class PriorityQueueTest extends J
222		* addAll of a collection with null elements throws NPE
223		*/
224		public void testAddAll2() {
225	+	PriorityQueue q = new PriorityQueue(SIZE);
226		try {
227	<	PriorityQueue q = new PriorityQueue(SIZE);
228	<	Integer[] ints = new Integer[SIZE];
229	<	q.addAll(Arrays.asList(ints));
227	>	q.addAll(Arrays.asList(new Integer[SIZE]));
228		shouldThrow();
229		} catch (NullPointerException success) {}
230		}
#	Line 236 | Line 234 | public class PriorityQueueTest extends J
234		* possibly adding some elements
235		*/
236		public void testAddAll3() {
237	+	PriorityQueue q = new PriorityQueue(SIZE);
238	+	Integer[] ints = new Integer[SIZE];
239	+	for (int i = 0; i < SIZE - 1; ++i)
240	+	ints[i] = new Integer(i);
241		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);
242		q.addAll(Arrays.asList(ints));
243		shouldThrow();
244		} catch (NullPointerException success) {}
#	Line 253 | Line 251 | public class PriorityQueueTest extends J
251		Integer[] empty = new Integer[0];
252		Integer[] ints = new Integer[SIZE];
253		for (int i = 0; i < SIZE; ++i)
254	<	ints[i] = new Integer(SIZE-1-i);
254	>	ints[i] = new Integer(SIZE - 1 - i);
255		PriorityQueue q = new PriorityQueue(SIZE);
256		assertFalse(q.addAll(Arrays.asList(empty)));
257		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 390 | Line 388 | public class PriorityQueueTest extends J
388		assertTrue(changed);
389
390		assertTrue(q.containsAll(p));
391	<	assertEquals(SIZE-i, q.size());
391	>	assertEquals(SIZE - i, q.size());
392		p.remove();
393		}
394		}
#	Line 403 | Line 401 | public class PriorityQueueTest extends J
401		PriorityQueue q = populatedQueue(SIZE);
402		PriorityQueue p = populatedQueue(i);
403		assertTrue(q.removeAll(p));
404	<	assertEquals(SIZE-i, q.size());
404	>	assertEquals(SIZE - i, q.size());
405		for (int j = 0; j < i; ++j) {
406		Integer x = (Integer)(p.remove());
407		assertFalse(q.contains(x));

Diff Legend

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