ViewVC Help

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

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

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.33 by jsr166, Wed Dec 31 21:45:16 2014 UTC vs.
Revision 1.36 by jsr166, Sat Feb 28 18:18:56 2015 UTC

#	Line 81 | Line 81 | public class TreeSetTest extends JSR166T
81		*/
82		public void testConstructor3() {
83		try {
84	<	TreeSet q = new TreeSet((Collection)null);
84	>	new TreeSet((Collection)null);
85		shouldThrow();
86		} catch (NullPointerException success) {}
87		}
#	Line 92 | Line 92 | public class TreeSetTest extends JSR166T
92		public void testConstructor4() {
93		try {
94		Integer[] ints = new Integer[SIZE];
95	<	TreeSet q = new TreeSet(Arrays.asList(ints));
95	>	new TreeSet(Arrays.asList(ints));
96		shouldThrow();
97		} catch (NullPointerException success) {}
98		}
#	Line 105 | Line 105 | public class TreeSetTest extends JSR166T
105		Integer[] ints = new Integer[SIZE];
106		for (int i = 0; i < SIZE-1; ++i)
107		ints[i] = new Integer(i);
108	<	TreeSet q = new TreeSet(Arrays.asList(ints));
108	>	new TreeSet(Arrays.asList(ints));
109		shouldThrow();
110		} catch (NullPointerException success) {}
111		}
#	Line 170 | Line 170 | public class TreeSetTest extends JSR166T
170		* add(null) throws NPE if nonempty
171		*/
172		public void testAddNull() {
173	+	TreeSet q = populatedSet(SIZE);
174		try {
174	–	TreeSet q = populatedSet(SIZE);
175		q.add(null);
176		shouldThrow();
177		} catch (NullPointerException success) {}
#	Line 199 | Line 199 | public class TreeSetTest extends JSR166T
199		* Add of non-Comparable throws CCE
200		*/
201		public void testAddNonComparable() {
202	+	TreeSet q = new TreeSet();
203		try {
203	–	TreeSet q = new TreeSet();
204		q.add(new Object());
205		q.add(new Object());
206		q.add(new Object());
#	Line 212 | Line 212 | public class TreeSetTest extends JSR166T
212		* addAll(null) throws NPE
213		*/
214		public void testAddAll1() {
215	+	TreeSet q = new TreeSet();
216		try {
216	–	TreeSet q = new TreeSet();
217		q.addAll(null);
218		shouldThrow();
219		} catch (NullPointerException success) {}
#	Line 223 | Line 223 | public class TreeSetTest extends JSR166T
223		* addAll of a collection with null elements throws NPE
224		*/
225		public void testAddAll2() {
226	+	TreeSet q = new TreeSet();
227	+	Integer[] ints = new Integer[SIZE];
228		try {
227	–	TreeSet q = new TreeSet();
228	–	Integer[] ints = new Integer[SIZE];
229		q.addAll(Arrays.asList(ints));
230		shouldThrow();
231		} catch (NullPointerException success) {}
#	Line 236 | Line 236 | public class TreeSetTest extends JSR166T
236		* possibly adding some elements
237		*/
238		public void testAddAll3() {
239	+	TreeSet q = new TreeSet();
240	+	Integer[] ints = new Integer[SIZE];
241	+	for (int i = 0; i < SIZE-1; ++i)
242	+	ints[i] = new Integer(i);
243		try {
240	–	TreeSet q = new TreeSet();
241	–	Integer[] ints = new Integer[SIZE];
242	–	for (int i = 0; i < SIZE-1; ++i)
243	–	ints[i] = new Integer(i);
244		q.addAll(Arrays.asList(ints));
245		shouldThrow();
246		} catch (NullPointerException success) {}
#	Line 478 | Line 478 | public class TreeSetTest extends JSR166T
478		*/
479		public void testIterator() {
480		TreeSet q = populatedSet(SIZE);
481	–	int i = 0;
481		Iterator it = q.iterator();
482	<	while (it.hasNext()) {
482	>	int i;
483	>	for (i = 0; it.hasNext(); i++)
484		assertTrue(q.contains(it.next()));
485	–	++i;
486	–	}
485		assertEquals(i, SIZE);
486	+	assertIteratorExhausted(it);
487		}
488
489		/**
490		* iterator of empty set has no elements
491		*/
492		public void testEmptyIterator() {
493	<	TreeSet q = new TreeSet();
495	<	int i = 0;
496	<	Iterator it = q.iterator();
497	<	while (it.hasNext()) {
498	<	assertTrue(q.contains(it.next()));
499	<	++i;
500	<	}
501	<	assertEquals(0, i);
493	>	assertIteratorExhausted(new TreeSet().iterator());
494		}
495
496		/**

Diff Legend

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