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.37 by jsr166, Sat Feb 28 20:13:46 2015 UTC vs.
Revision 1.49 by jsr166, Sun Jan 7 22:59:18 2018 UTC

#	Line 21 | Line 21 | 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 35 | 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) {
41	<	ConcurrentSkipListSet<Integer> q =
42	<	new ConcurrentSkipListSet<Integer>();
40	>	private static ConcurrentSkipListSet<Integer> populatedSet(int n) {
41	>	ConcurrentSkipListSet<Integer> q = new ConcurrentSkipListSet<>();
42		assertTrue(q.isEmpty());
43	<	for (int i = n-1; i >= 0; i -= 2)
43	>	for (int i = n - 1; i >= 0; i -= 2)
44		assertTrue(q.add(new Integer(i)));
45		for (int i = (n & 1); i < n; i += 2)
46		assertTrue(q.add(new Integer(i)));
#	Line 53 | Line 52 | public class ConcurrentSkipListSetTest e
52		/**
53		* Returns a new set of first 5 ints.
54		*/
55	<	private ConcurrentSkipListSet set5() {
55	>	private static ConcurrentSkipListSet set5() {
56		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
57		assertTrue(q.isEmpty());
58		q.add(one);
#	Line 87 | Line 86 | public class ConcurrentSkipListSetTest e
86		*/
87		public void testConstructor4() {
88		try {
89	<	Integer[] ints = new Integer[SIZE];
91	<	new ConcurrentSkipListSet(Arrays.asList(ints));
89	>	new ConcurrentSkipListSet(Arrays.asList(new Integer[SIZE]));
90		shouldThrow();
91		} catch (NullPointerException success) {}
92		}
#	Line 97 | Line 95 | public class ConcurrentSkipListSetTest e
95		* Initializing from Collection with some null elements throws NPE
96		*/
97		public void testConstructor5() {
98	+	Integer[] ints = new Integer[SIZE];
99	+	for (int i = 0; i < SIZE - 1; ++i)
100	+	ints[i] = new Integer(i);
101		try {
101	–	Integer[] ints = new Integer[SIZE];
102	–	for (int i = 0; i < SIZE-1; ++i)
103	–	ints[i] = new Integer(i);
102		new ConcurrentSkipListSet(Arrays.asList(ints));
103		shouldThrow();
104		} catch (NullPointerException success) {}
#	Line 129 | Line 127 | public class ConcurrentSkipListSetTest e
127		for (int i = 0; i < SIZE; ++i)
128		ints[i] = new Integer(i);
129		q.addAll(Arrays.asList(ints));
130	<	for (int i = SIZE-1; i >= 0; --i)
130	>	for (int i = SIZE - 1; i >= 0; --i)
131		assertEquals(ints[i], q.pollFirst());
132		}
133
#	Line 153 | Line 151 | public class ConcurrentSkipListSetTest e
151		public void testSize() {
152		ConcurrentSkipListSet q = populatedSet(SIZE);
153		for (int i = 0; i < SIZE; ++i) {
154	<	assertEquals(SIZE-i, q.size());
154	>	assertEquals(SIZE - i, q.size());
155		q.pollFirst();
156		}
157		for (int i = 0; i < SIZE; ++i) {
#	Line 200 | Line 198 | public class ConcurrentSkipListSetTest e
198		q.add(new Object());
199		q.add(new Object());
200		shouldThrow();
201	<	} catch (ClassCastException success) {}
201	>	} catch (ClassCastException success) {
202	>	assertTrue(q.size() < 2);
203	>	for (int i = 0, size = q.size(); i < size; i++)
204	>	assertSame(Object.class, q.pollFirst().getClass());
205	>	assertNull(q.pollFirst());
206	>	assertTrue(q.isEmpty());
207	>	assertEquals(0, q.size());
208	>	}
209		}
210
211		/**
#	Line 233 | Line 238 | public class ConcurrentSkipListSetTest e
238		public void testAddAll3() {
239		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
240		Integer[] ints = new Integer[SIZE];
241	<	for (int i = 0; i < SIZE-1; ++i)
241	>	for (int i = 0; i < SIZE - 1; ++i)
242		ints[i] = new Integer(i);
243		try {
244		q.addAll(Arrays.asList(ints));
#	Line 248 | Line 253 | public class ConcurrentSkipListSetTest e
253		Integer[] empty = new Integer[0];
254		Integer[] ints = new Integer[SIZE];
255		for (int i = 0; i < SIZE; ++i)
256	<	ints[i] = new Integer(SIZE-1-i);
256	>	ints[i] = new Integer(SIZE - 1 - i);
257		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
258		assertFalse(q.addAll(Arrays.asList(empty)));
259		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 272 | Line 277 | public class ConcurrentSkipListSetTest e
277		*/
278		public void testPollLast() {
279		ConcurrentSkipListSet q = populatedSet(SIZE);
280	<	for (int i = SIZE-1; i >= 0; --i) {
280	>	for (int i = SIZE - 1; i >= 0; --i) {
281		assertEquals(i, q.pollLast());
282		}
283		assertNull(q.pollFirst());
#	Line 287 | Line 292 | public class ConcurrentSkipListSetTest e
292		assertTrue(q.contains(i));
293		assertTrue(q.remove(i));
294		assertFalse(q.contains(i));
295	<	assertTrue(q.contains(i-1));
295	>	assertTrue(q.contains(i - 1));
296		}
297		for (int i = 0; i < SIZE; i += 2) {
298		assertTrue(q.contains(i));
299		assertTrue(q.remove(i));
300		assertFalse(q.contains(i));
301	<	assertFalse(q.remove(i+1));
302	<	assertFalse(q.contains(i+1));
301	>	assertFalse(q.remove(i + 1));
302	>	assertFalse(q.contains(i + 1));
303		}
304		assertTrue(q.isEmpty());
305		}
#	Line 353 | Line 358 | public class ConcurrentSkipListSetTest e
358		assertTrue(changed);
359
360		assertTrue(q.containsAll(p));
361	<	assertEquals(SIZE-i, q.size());
361	>	assertEquals(SIZE - i, q.size());
362		p.pollFirst();
363		}
364		}
#	Line 366 | Line 371 | public class ConcurrentSkipListSetTest e
371		ConcurrentSkipListSet q = populatedSet(SIZE);
372		ConcurrentSkipListSet p = populatedSet(i);
373		assertTrue(q.removeAll(p));
374	<	assertEquals(SIZE-i, q.size());
374	>	assertEquals(SIZE - i, q.size());
375		for (int j = 0; j < i; ++j) {
376		Integer x = (Integer)(p.pollFirst());
377		assertFalse(q.contains(x));
#	Line 520 | Line 525 | public class ConcurrentSkipListSetTest e
525		}
526
527		/**
528	<	* A deserialized serialized set has same elements
528	>	* A cloned set equals original
529	>	*/
530	>	public void testClone() {
531	>	ConcurrentSkipListSet x = populatedSet(SIZE);
532	>	ConcurrentSkipListSet y = x.clone();
533	>
534	>	assertNotSame(x, y);
535	>	assertEquals(x.size(), y.size());
536	>	assertEquals(x, y);
537	>	assertEquals(y, x);
538	>	while (!x.isEmpty()) {
539	>	assertFalse(y.isEmpty());
540	>	assertEquals(x.pollFirst(), y.pollFirst());
541	>	}
542	>	assertTrue(y.isEmpty());
543	>	}
544	>
545	>	/**
546	>	* A deserialized/reserialized set equals original
547		*/
548		public void testSerialization() throws Exception {
549		NavigableSet x = populatedSet(SIZE);
#	Line 692 | Line 715 | public class ConcurrentSkipListSetTest e
715		}
716
717		static NavigableSet<Integer> newSet(Class cl) throws Exception {
718	<	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
718	>	NavigableSet<Integer> result =
719	>	(NavigableSet<Integer>) cl.getConstructor().newInstance();
720		assertEquals(0, result.size());
721		assertFalse(result.iterator().hasNext());
722		return result;
#	Line 975 | Line 999 | public class ConcurrentSkipListSetTest e
999		}
1000
1001		static boolean eq(Integer i, int j) {
1002	<	return i == null ? j == -1 : i == j;
1002	>	return (i == null) ? j == -1 : i == j;
1003		}
1004
1005		}

Diff Legend

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