ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java (file contents):
Revision 1.30 by jsr166, Sat Feb 28 18:10:55 2015 UTC vs.
Revision 1.37 by jsr166, Fri Aug 4 03:30:21 2017 UTC

#	Line 16 | Line 16 | import junit.framework.TestSuite;
16
17		public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
18		public static void main(String[] args) {
19	<	junit.textui.TestRunner.run(suite());
19	>	main(suite(), args);
20		}
21		public static Test suite() {
22		return new TestSuite(ConcurrentSkipListSubSetTest.class);
#	Line 30 | Line 30 | public class ConcurrentSkipListSubSetTes
30
31		/**
32		* Returns a new set of given size containing consecutive
33	<	* Integers 0 ... n.
33	>	* Integers 0 ... n - 1.
34		*/
35	<	private NavigableSet<Integer> populatedSet(int n) {
35	>	private static NavigableSet<Integer> populatedSet(int n) {
36		ConcurrentSkipListSet<Integer> q =
37		new ConcurrentSkipListSet<Integer>();
38		assertTrue(q.isEmpty());
39
40	<	for (int i = n-1; i >= 0; i -= 2)
40	>	for (int i = n - 1; i >= 0; i -= 2)
41		assertTrue(q.add(new Integer(i)));
42		for (int i = (n & 1); i < n; i += 2)
43		assertTrue(q.add(new Integer(i)));
#	Line 52 | Line 52 | public class ConcurrentSkipListSubSetTes
52		/**
53		* Returns a new set of first 5 ints.
54		*/
55	<	private NavigableSet set5() {
55	>	private static NavigableSet set5() {
56		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
57		assertTrue(q.isEmpty());
58		q.add(one);
#	Line 70 | Line 70 | public class ConcurrentSkipListSubSetTes
70		/**
71		* Returns a new set of first 5 negative ints.
72		*/
73	<	private NavigableSet dset5() {
73	>	private static NavigableSet dset5() {
74		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
75		assertTrue(q.isEmpty());
76		q.add(m1);
#	Line 122 | Line 122 | public class ConcurrentSkipListSubSetTes
122		public void testSize() {
123		NavigableSet q = populatedSet(SIZE);
124		for (int i = 0; i < SIZE; ++i) {
125	<	assertEquals(SIZE-i, q.size());
125	>	assertEquals(SIZE - i, q.size());
126		q.pollFirst();
127		}
128		for (int i = 0; i < SIZE; ++i) {
#	Line 167 | Line 167 | public class ConcurrentSkipListSubSetTes
167		try {
168		q.add(new Object());
169		q.add(new Object());
170	–	q.add(new Object());
170		shouldThrow();
171		} catch (ClassCastException success) {}
172		}
#	Line 202 | Line 201 | public class ConcurrentSkipListSubSetTes
201		public void testAddAll3() {
202		NavigableSet q = set0();
203		Integer[] ints = new Integer[SIZE];
204	<	for (int i = 0; i < SIZE-1; ++i)
205	<	ints[i] = new Integer(i+SIZE);
204	>	for (int i = 0; i < SIZE - 1; ++i)
205	>	ints[i] = new Integer(i + SIZE);
206		try {
207		q.addAll(Arrays.asList(ints));
208		shouldThrow();
#	Line 217 | Line 216 | public class ConcurrentSkipListSubSetTes
216		Integer[] empty = new Integer[0];
217		Integer[] ints = new Integer[SIZE];
218		for (int i = 0; i < SIZE; ++i)
219	<	ints[i] = new Integer(SIZE-1- i);
219	>	ints[i] = new Integer(SIZE - 1 - i);
220		NavigableSet q = set0();
221		assertFalse(q.addAll(Arrays.asList(empty)));
222		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 245 | Line 244 | public class ConcurrentSkipListSubSetTes
244		assertTrue(q.contains(i));
245		assertTrue(q.remove(i));
246		assertFalse(q.contains(i));
247	<	assertTrue(q.contains(i-1));
247	>	assertTrue(q.contains(i - 1));
248		}
249		for (int i = 0; i < SIZE; i += 2) {
250		assertTrue(q.contains(i));
251		assertTrue(q.remove(i));
252		assertFalse(q.contains(i));
253	<	assertFalse(q.remove(i+1));
254	<	assertFalse(q.contains(i+1));
253	>	assertFalse(q.remove(i + 1));
254	>	assertFalse(q.contains(i + 1));
255		}
256		assertTrue(q.isEmpty());
257		}
#	Line 311 | Line 310 | public class ConcurrentSkipListSubSetTes
310		assertTrue(changed);
311
312		assertTrue(q.containsAll(p));
313	<	assertEquals(SIZE-i, q.size());
313	>	assertEquals(SIZE - i, q.size());
314		p.pollFirst();
315		}
316		}
#	Line 324 | Line 323 | public class ConcurrentSkipListSubSetTes
323		NavigableSet q = populatedSet(SIZE);
324		NavigableSet p = populatedSet(i);
325		assertTrue(q.removeAll(p));
326	<	assertEquals(SIZE-i, q.size());
326	>	assertEquals(SIZE - i, q.size());
327		for (int j = 0; j < i; ++j) {
328		Integer x = (Integer)(p.pollFirst());
329		assertFalse(q.contains(x));
#	Line 477 | Line 476 | public class ConcurrentSkipListSubSetTes
476		}
477
478		/**
479	<	* A deserialized serialized set has same elements
479	>	* A deserialized/reserialized set equals original
480		*/
481		public void testSerialization() throws Exception {
482		NavigableSet x = populatedSet(SIZE);
#	Line 619 | Line 618 | public class ConcurrentSkipListSubSetTes
618		public void testDescendingSize() {
619		NavigableSet q = populatedSet(SIZE);
620		for (int i = 0; i < SIZE; ++i) {
621	<	assertEquals(SIZE-i, q.size());
621	>	assertEquals(SIZE - i, q.size());
622		q.pollFirst();
623		}
624		for (int i = 0; i < SIZE; ++i) {
#	Line 664 | Line 663 | public class ConcurrentSkipListSubSetTes
663		try {
664		q.add(new Object());
665		q.add(new Object());
667	–	q.add(new Object());
666		shouldThrow();
667		} catch (ClassCastException success) {}
668		}
#	Line 699 | Line 697 | public class ConcurrentSkipListSubSetTes
697		public void testDescendingAddAll3() {
698		NavigableSet q = dset0();
699		Integer[] ints = new Integer[SIZE];
700	<	for (int i = 0; i < SIZE-1; ++i)
701	<	ints[i] = new Integer(i+SIZE);
700	>	for (int i = 0; i < SIZE - 1; ++i)
701	>	ints[i] = new Integer(i + SIZE);
702		try {
703		q.addAll(Arrays.asList(ints));
704		shouldThrow();
#	Line 714 | Line 712 | public class ConcurrentSkipListSubSetTes
712		Integer[] empty = new Integer[0];
713		Integer[] ints = new Integer[SIZE];
714		for (int i = 0; i < SIZE; ++i)
715	<	ints[i] = new Integer(SIZE-1- i);
715	>	ints[i] = new Integer(SIZE - 1 - i);
716		NavigableSet q = dset0();
717		assertFalse(q.addAll(Arrays.asList(empty)));
718		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 743 | Line 741 | public class ConcurrentSkipListSubSetTes
741		}
742		for (int i = 0; i < SIZE; i += 2 ) {
743		assertTrue(q.remove(new Integer(i)));
744	<	assertFalse(q.remove(new Integer(i+1)));
744	>	assertFalse(q.remove(new Integer(i + 1)));
745		}
746		assertTrue(q.isEmpty());
747		}
#	Line 802 | Line 800 | public class ConcurrentSkipListSubSetTes
800		assertTrue(changed);
801
802		assertTrue(q.containsAll(p));
803	<	assertEquals(SIZE-i, q.size());
803	>	assertEquals(SIZE - i, q.size());
804		p.pollFirst();
805		}
806		}
#	Line 815 | Line 813 | public class ConcurrentSkipListSubSetTes
813		NavigableSet q = populatedSet(SIZE);
814		NavigableSet p = populatedSet(i);
815		assertTrue(q.removeAll(p));
816	<	assertEquals(SIZE-i, q.size());
816	>	assertEquals(SIZE - i, q.size());
817		for (int j = 0; j < i; ++j) {
818		Integer x = (Integer)(p.pollFirst());
819		assertFalse(q.contains(x));
#	Line 977 | Line 975 | public class ConcurrentSkipListSubSetTes
975		}
976
977		/**
978	<	* A deserialized serialized set has same elements
978	>	* A deserialized/reserialized set equals original
979		*/
980		public void testDescendingSerialization() throws Exception {
981		NavigableSet x = dset5();

Diff Legend

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