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.28 by jsr166, Wed Dec 31 20:09:09 2014 UTC vs.
Revision 1.34 by jsr166, Fri May 15 18:21:19 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 59 | Line 59 | public class PriorityQueueTest extends J
59		*/
60		public void testConstructor2() {
61		try {
62	<	PriorityQueue q = new PriorityQueue(0);
62	>	new PriorityQueue(0);
63		shouldThrow();
64		} catch (IllegalArgumentException success) {}
65		}
#	Line 69 | Line 69 | public class PriorityQueueTest extends J
69		*/
70		public void testConstructor3() {
71		try {
72	<	PriorityQueue q = new PriorityQueue((Collection)null);
72	>	new PriorityQueue((Collection)null);
73		shouldThrow();
74		} catch (NullPointerException success) {}
75		}
#	Line 79 | Line 79 | public class PriorityQueueTest extends J
79		*/
80		public void testConstructor4() {
81		try {
82	<	Integer[] ints = new Integer[SIZE];
83	<	PriorityQueue q = 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 {
95	<	Integer[] ints = new Integer[SIZE];
94	<	for (int i = 0; i < SIZE-1; ++i)
95	<	ints[i] = new Integer(i);
96	<	PriorityQueue q = new PriorityQueue(Arrays.asList(ints));
95	>	new PriorityQueue(Arrays.asList(ints));
96		shouldThrow();
97		} catch (NullPointerException success) {}
98		}
#	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 189 | Line 188 | public class PriorityQueueTest extends J
188		* Offer of non-Comparable throws CCE
189		*/
190		public void testOfferNonComparable() {
191	+	PriorityQueue q = new PriorityQueue(1);
192		try {
193	–	PriorityQueue q = new PriorityQueue(1);
194	–	q.offer(new Object());
193		q.offer(new Object());
194		q.offer(new Object());
195		shouldThrow();
#	Line 213 | 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 {
217	–	PriorityQueue q = new PriorityQueue(1);
216		q.addAll(null);
217		shouldThrow();
218		} catch (NullPointerException success) {}
#	Line 224 | 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);
229	<	Integer[] ints = new Integer[SIZE];
230	<	q.addAll(Arrays.asList(ints));
227	>	q.addAll(Arrays.asList(new Integer[SIZE]));
228		shouldThrow();
229		} catch (NullPointerException success) {}
230		}
#	Line 237 | 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 {
241	–	PriorityQueue q = new PriorityQueue(SIZE);
242	–	Integer[] ints = new Integer[SIZE];
243	–	for (int i = 0; i < SIZE-1; ++i)
244	–	ints[i] = new Integer(i);
242		q.addAll(Arrays.asList(ints));
243		shouldThrow();
244		} catch (NullPointerException success) {}
#	Line 406 | Line 403 | public class PriorityQueueTest extends J
403		assertTrue(q.removeAll(p));
404		assertEquals(SIZE-i, q.size());
405		for (int j = 0; j < i; ++j) {
406	<	Integer I = (Integer)(p.remove());
407	<	assertFalse(q.contains(I));
406	>	Integer x = (Integer)(p.remove());
407	>	assertFalse(q.contains(x));
408		}
409		}
410		}
#	Line 441 | Line 438 | public class PriorityQueueTest extends J
438		*/
439		public void testIterator() {
440		PriorityQueue q = populatedQueue(SIZE);
444	–	int i = 0;
441		Iterator it = q.iterator();
442	<	while (it.hasNext()) {
442	>	int i;
443	>	for (i = 0; it.hasNext(); i++)
444		assertTrue(q.contains(it.next()));
448	–	++i;
449	–	}
445		assertEquals(i, SIZE);
446	+	assertIteratorExhausted(it);
447	+	}
448	+
449	+	/**
450	+	* iterator of empty collection has no elements
451	+	*/
452	+	public void testEmptyIterator() {
453	+	assertIteratorExhausted(new PriorityQueue().iterator());
454		}
455
456		/**

Diff Legend

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