ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSetTest.java (file contents):
Revision 1.32 by jsr166, Wed Dec 31 20:09:08 2014 UTC vs.
Revision 1.37 by jsr166, Sat Feb 28 20:13:46 2015 UTC

#	Line 77 | Line 77 | public class ConcurrentSkipListSetTest e
77		*/
78		public void testConstructor3() {
79		try {
80	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet((Collection)null);
80	>	new ConcurrentSkipListSet((Collection)null);
81		shouldThrow();
82		} catch (NullPointerException success) {}
83		}
#	Line 88 | Line 88 | public class ConcurrentSkipListSetTest e
88		public void testConstructor4() {
89		try {
90		Integer[] ints = new Integer[SIZE];
91	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
91	>	new ConcurrentSkipListSet(Arrays.asList(ints));
92		shouldThrow();
93		} catch (NullPointerException success) {}
94		}
#	Line 101 | Line 101 | public class ConcurrentSkipListSetTest e
101		Integer[] ints = new Integer[SIZE];
102		for (int i = 0; i < SIZE-1; ++i)
103		ints[i] = new Integer(i);
104	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
104	>	new ConcurrentSkipListSet(Arrays.asList(ints));
105		shouldThrow();
106		} catch (NullPointerException success) {}
107		}
#	Line 166 | Line 166 | public class ConcurrentSkipListSetTest e
166		* add(null) throws NPE
167		*/
168		public void testAddNull() {
169	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
170		try {
170	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
171		q.add(null);
172		shouldThrow();
173		} catch (NullPointerException success) {}
#	Line 195 | Line 195 | public class ConcurrentSkipListSetTest e
195		* Add of non-Comparable throws CCE
196		*/
197		public void testAddNonComparable() {
198	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
199		try {
199	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
200	–	q.add(new Object());
200		q.add(new Object());
201		q.add(new Object());
202		shouldThrow();
#	Line 208 | Line 207 | public class ConcurrentSkipListSetTest e
207		* addAll(null) throws NPE
208		*/
209		public void testAddAll1() {
210	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
211		try {
212	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
212		q.addAll(null);
213		shouldThrow();
214		} catch (NullPointerException success) {}
#	Line 219 | Line 218 | public class ConcurrentSkipListSetTest e
218		* addAll of a collection with null elements throws NPE
219		*/
220		public void testAddAll2() {
221	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
222	+	Integer[] ints = new Integer[SIZE];
223		try {
223	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
224	–	Integer[] ints = new Integer[SIZE];
224		q.addAll(Arrays.asList(ints));
225		shouldThrow();
226		} catch (NullPointerException success) {}
#	Line 232 | Line 231 | public class ConcurrentSkipListSetTest e
231		* possibly adding some elements
232		*/
233		public void testAddAll3() {
234	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
235	+	Integer[] ints = new Integer[SIZE];
236	+	for (int i = 0; i < SIZE-1; ++i)
237	+	ints[i] = new Integer(i);
238		try {
236	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
237	–	Integer[] ints = new Integer[SIZE];
238	–	for (int i = 0; i < SIZE-1; ++i)
239	–	ints[i] = new Integer(i);
239		q.addAll(Arrays.asList(ints));
240		shouldThrow();
241		} catch (NullPointerException success) {}
#	Line 369 | Line 368 | public class ConcurrentSkipListSetTest e
368		assertTrue(q.removeAll(p));
369		assertEquals(SIZE-i, q.size());
370		for (int j = 0; j < i; ++j) {
371	<	Integer I = (Integer)(p.pollFirst());
372	<	assertFalse(q.contains(I));
371	>	Integer x = (Integer)(p.pollFirst());
372	>	assertFalse(q.contains(x));
373		}
374		}
375		}
#	Line 473 | Line 472 | public class ConcurrentSkipListSetTest e
472		*/
473		public void testIterator() {
474		ConcurrentSkipListSet q = populatedSet(SIZE);
476	–	int i = 0;
475		Iterator it = q.iterator();
476	<	while (it.hasNext()) {
476	>	int i;
477	>	for (i = 0; it.hasNext(); i++)
478		assertTrue(q.contains(it.next()));
480	–	++i;
481	–	}
479		assertEquals(i, SIZE);
480	+	assertIteratorExhausted(it);
481		}
482
483		/**
484		* iterator of empty set has no elements
485		*/
486		public void testEmptyIterator() {
487	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
488	<	int i = 0;
489	<	Iterator it = q.iterator();
492	<	while (it.hasNext()) {
493	<	assertTrue(q.contains(it.next()));
494	<	++i;
495	<	}
496	<	assertEquals(0, i);
487	>	NavigableSet s = new ConcurrentSkipListSet();
488	>	assertIteratorExhausted(s.iterator());
489	>	assertIteratorExhausted(s.descendingSet().iterator());
490		}
491
492		/**
#	Line 732 | Line 725 | public class ConcurrentSkipListSetTest e
725		// Add entries till we're back to original size
726		while (set.size() < size) {
727		int element = min + rnd.nextInt(rangeSize);
728	<	assertTrue(element >= min && element<= max);
728	>	assertTrue(element >= min && element <= max);
729		put(set, element, bs);
730		}
731		}
#	Line 758 | Line 751 | public class ConcurrentSkipListSetTest e
751		// Add entries till we're back to original size
752		while (set.size() < size) {
753		int element = min - 5 + rnd.nextInt(rangeSize + 10);
754	<	if (element >= min && element<= max) {
754	>	if (element >= min && element <= max) {
755		put(set, element, bs);
756		} else {
757		try {

Diff Legend

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