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.29 by jsr166, Tue Apr 2 22:18:25 2013 UTC vs.
Revision 1.46 by jsr166, Sat Mar 11 18:20:46 2017 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	–	import junit.framework.*;
7		import java.util.Arrays;
8		import java.util.BitSet;
9		import java.util.Collection;
#	Line 17 | Line 16 | import java.util.Set;
16		import java.util.SortedSet;
17		import java.util.concurrent.ConcurrentSkipListSet;
18
19	+	import junit.framework.Test;
20	+	import junit.framework.TestSuite;
21	+
22		public class ConcurrentSkipListSetTest extends JSR166TestCase {
23		public static void main(String[] args) {
24	<	junit.textui.TestRunner.run(suite());
24	>	main(suite(), args);
25		}
26		public static Test suite() {
27		return new TestSuite(ConcurrentSkipListSetTest.class);
#	Line 33 | Line 35 | public class ConcurrentSkipListSetTest e
35
36		/**
37		* Returns a new set of given size containing consecutive
38	<	* Integers 0 ... n.
38	>	* Integers 0 ... n - 1.
39		*/
40	<	private ConcurrentSkipListSet<Integer> populatedSet(int n) {
40	>	private static ConcurrentSkipListSet<Integer> populatedSet(int n) {
41		ConcurrentSkipListSet<Integer> q =
42		new ConcurrentSkipListSet<Integer>();
43		assertTrue(q.isEmpty());
44	<	for (int i = n-1; i >= 0; i-=2)
44	>	for (int i = n - 1; i >= 0; i -= 2)
45		assertTrue(q.add(new Integer(i)));
46	<	for (int i = (n & 1); i < n; i+=2)
46	>	for (int i = (n & 1); i < n; i += 2)
47		assertTrue(q.add(new Integer(i)));
48		assertFalse(q.isEmpty());
49		assertEquals(n, q.size());
#	Line 51 | Line 53 | public class ConcurrentSkipListSetTest e
53		/**
54		* Returns a new set of first 5 ints.
55		*/
56	<	private ConcurrentSkipListSet set5() {
56	>	private static ConcurrentSkipListSet set5() {
57		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
58		assertTrue(q.isEmpty());
59		q.add(one);
#	Line 75 | 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 85 | Line 87 | public class ConcurrentSkipListSetTest e
87		*/
88		public void testConstructor4() {
89		try {
90	<	Integer[] ints = new Integer[SIZE];
89	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
90	>	new ConcurrentSkipListSet(Arrays.asList(new Integer[SIZE]));
91		shouldThrow();
92		} catch (NullPointerException success) {}
93		}
#	Line 95 | Line 96 | public class ConcurrentSkipListSetTest e
96		* Initializing from Collection with some null elements throws NPE
97		*/
98		public void testConstructor5() {
99	+	Integer[] ints = new Integer[SIZE];
100	+	for (int i = 0; i < SIZE - 1; ++i)
101	+	ints[i] = new Integer(i);
102		try {
103	<	Integer[] ints = new Integer[SIZE];
100	<	for (int i = 0; i < SIZE-1; ++i)
101	<	ints[i] = new Integer(i);
102	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
103	>	new ConcurrentSkipListSet(Arrays.asList(ints));
104		shouldThrow();
105		} catch (NullPointerException success) {}
106		}
#	Line 127 | Line 128 | public class ConcurrentSkipListSetTest e
128		for (int i = 0; i < SIZE; ++i)
129		ints[i] = new Integer(i);
130		q.addAll(Arrays.asList(ints));
131	<	for (int i = SIZE-1; i >= 0; --i)
131	>	for (int i = SIZE - 1; i >= 0; --i)
132		assertEquals(ints[i], q.pollFirst());
133		}
134
#	Line 151 | Line 152 | public class ConcurrentSkipListSetTest e
152		public void testSize() {
153		ConcurrentSkipListSet q = populatedSet(SIZE);
154		for (int i = 0; i < SIZE; ++i) {
155	<	assertEquals(SIZE-i, q.size());
155	>	assertEquals(SIZE - i, q.size());
156		q.pollFirst();
157		}
158		for (int i = 0; i < SIZE; ++i) {
#	Line 164 | Line 165 | public class ConcurrentSkipListSetTest e
165		* add(null) throws NPE
166		*/
167		public void testAddNull() {
168	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
169		try {
168	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
170		q.add(null);
171		shouldThrow();
172		} catch (NullPointerException success) {}
#	Line 193 | Line 194 | public class ConcurrentSkipListSetTest e
194		* Add of non-Comparable throws CCE
195		*/
196		public void testAddNonComparable() {
197	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
198		try {
197	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
198	–	q.add(new Object());
199		q.add(new Object());
200		q.add(new Object());
201		shouldThrow();
202	<	} catch (ClassCastException success) {}
202	>	} catch (ClassCastException success) {
203	>	assertTrue(q.size() < 2);
204	>	for (int i = 0, size = q.size(); i < size; i++)
205	>	assertTrue(q.pollFirst().getClass() == Object.class);
206	>	assertNull(q.pollFirst());
207	>	assertTrue(q.isEmpty());
208	>	assertEquals(0, q.size());
209	>	}
210		}
211
212		/**
213		* addAll(null) throws NPE
214		*/
215		public void testAddAll1() {
216	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
217		try {
210	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
218		q.addAll(null);
219		shouldThrow();
220		} catch (NullPointerException success) {}
#	Line 217 | Line 224 | public class ConcurrentSkipListSetTest e
224		* addAll of a collection with null elements throws NPE
225		*/
226		public void testAddAll2() {
227	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
228	+	Integer[] ints = new Integer[SIZE];
229		try {
221	–	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
222	–	Integer[] ints = new Integer[SIZE];
230		q.addAll(Arrays.asList(ints));
231		shouldThrow();
232		} catch (NullPointerException success) {}
#	Line 230 | Line 237 | public class ConcurrentSkipListSetTest e
237		* possibly adding some elements
238		*/
239		public void testAddAll3() {
240	+	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
241	+	Integer[] ints = new Integer[SIZE];
242	+	for (int i = 0; i < SIZE - 1; ++i)
243	+	ints[i] = new Integer(i);
244		try {
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);
245		q.addAll(Arrays.asList(ints));
246		shouldThrow();
247		} catch (NullPointerException success) {}
#	Line 247 | Line 254 | public class ConcurrentSkipListSetTest e
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		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
259		assertFalse(q.addAll(Arrays.asList(empty)));
260		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 271 | Line 278 | public class ConcurrentSkipListSetTest e
278		*/
279		public void testPollLast() {
280		ConcurrentSkipListSet q = populatedSet(SIZE);
281	<	for (int i = SIZE-1; i >= 0; --i) {
281	>	for (int i = SIZE - 1; i >= 0; --i) {
282		assertEquals(i, q.pollLast());
283		}
284		assertNull(q.pollFirst());
#	Line 282 | Line 289 | public class ConcurrentSkipListSetTest e
289		*/
290		public void testRemoveElement() {
291		ConcurrentSkipListSet q = populatedSet(SIZE);
292	<	for (int i = 1; i < SIZE; i+=2) {
292	>	for (int i = 1; i < SIZE; i += 2) {
293		assertTrue(q.contains(i));
294		assertTrue(q.remove(i));
295		assertFalse(q.contains(i));
296	<	assertTrue(q.contains(i-1));
296	>	assertTrue(q.contains(i - 1));
297		}
298	<	for (int i = 0; i < SIZE; i+=2) {
298	>	for (int i = 0; i < SIZE; i += 2) {
299		assertTrue(q.contains(i));
300		assertTrue(q.remove(i));
301		assertFalse(q.contains(i));
302	<	assertFalse(q.remove(i+1));
303	<	assertFalse(q.contains(i+1));
302	>	assertFalse(q.remove(i + 1));
303	>	assertFalse(q.contains(i + 1));
304		}
305		assertTrue(q.isEmpty());
306		}
#	Line 352 | Line 359 | public class ConcurrentSkipListSetTest e
359		assertTrue(changed);
360
361		assertTrue(q.containsAll(p));
362	<	assertEquals(SIZE-i, q.size());
362	>	assertEquals(SIZE - i, q.size());
363		p.pollFirst();
364		}
365		}
#	Line 365 | Line 372 | public class ConcurrentSkipListSetTest e
372		ConcurrentSkipListSet q = populatedSet(SIZE);
373		ConcurrentSkipListSet p = populatedSet(i);
374		assertTrue(q.removeAll(p));
375	<	assertEquals(SIZE-i, q.size());
375	>	assertEquals(SIZE - i, q.size());
376		for (int j = 0; j < i; ++j) {
377	<	Integer I = (Integer)(p.pollFirst());
378	<	assertFalse(q.contains(I));
377	>	Integer x = (Integer)(p.pollFirst());
378	>	assertFalse(q.contains(x));
379		}
380		}
381		}
#	Line 471 | Line 478 | public class ConcurrentSkipListSetTest e
478		*/
479		public void testIterator() {
480		ConcurrentSkipListSet q = populatedSet(SIZE);
474	–	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()));
478	–	++i;
479	–	}
485		assertEquals(i, SIZE);
486	+	assertIteratorExhausted(it);
487		}
488
489		/**
490		* iterator of empty set has no elements
491		*/
492		public void testEmptyIterator() {
493	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
494	<	int i = 0;
495	<	Iterator it = q.iterator();
490	<	while (it.hasNext()) {
491	<	assertTrue(q.contains(it.next()));
492	<	++i;
493	<	}
494	<	assertEquals(0, i);
493	>	NavigableSet s = new ConcurrentSkipListSet();
494	>	assertIteratorExhausted(s.iterator());
495	>	assertIteratorExhausted(s.descendingSet().iterator());
496		}
497
498		/**
#	Line 531 | Line 532 | public class ConcurrentSkipListSetTest e
532		NavigableSet x = populatedSet(SIZE);
533		NavigableSet y = serialClone(x);
534
535	<	assertTrue(x != y);
535	>	assertNotSame(x, y);
536		assertEquals(x.size(), y.size());
537		assertEquals(x, y);
538		assertEquals(y, x);
#	Line 697 | Line 698 | public class ConcurrentSkipListSetTest e
698		}
699
700		static NavigableSet<Integer> newSet(Class cl) throws Exception {
701	<	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
701	>	NavigableSet<Integer> result =
702	>	(NavigableSet<Integer>) cl.getConstructor().newInstance();
703		assertEquals(0, result.size());
704		assertFalse(result.iterator().hasNext());
705		return result;
#	Line 730 | Line 732 | public class ConcurrentSkipListSetTest e
732		// Add entries till we're back to original size
733		while (set.size() < size) {
734		int element = min + rnd.nextInt(rangeSize);
735	<	assertTrue(element >= min && element<= max);
735	>	assertTrue(element >= min && element <= max);
736		put(set, element, bs);
737		}
738		}
#	Line 756 | Line 758 | public class ConcurrentSkipListSetTest e
758		// Add entries till we're back to original size
759		while (set.size() < size) {
760		int element = min - 5 + rnd.nextInt(rangeSize + 10);
761	<	if (element >= min && element<= max) {
761	>	if (element >= min && element <= max) {
762		put(set, element, bs);
763		} else {
764		try {
#	Line 980 | Line 982 | public class ConcurrentSkipListSetTest e
982		}
983
984		static boolean eq(Integer i, int j) {
985	<	return i == null ? j == -1 : i == j;
985	>	return (i == null) ? j == -1 : i == j;
986		}
987
988		}

Diff Legend

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