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.5 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.35 by jsr166, Sat Jan 17 22:55:06 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import junit.framework.*;
8	<	import java.util.*;
9	<	import java.util.concurrent.*;
10	<	import java.io.*;
7	>	import java.util.Arrays;
8	>	import java.util.BitSet;
9	>	import java.util.Collection;
10	>	import java.util.Comparator;
11	>	import java.util.Iterator;
12	>	import java.util.NavigableSet;
13	>	import java.util.NoSuchElementException;
14	>	import java.util.Random;
15	>	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	>	junit.textui.TestRunner.run(suite());
25		}
26		public static Test suite() {
27	<	return new TestSuite(ConcurrentSkipListSetTest.class);
27	>	return new TestSuite(ConcurrentSkipListSetTest.class);
28		}
29
30		static class MyReverseComparator implements Comparator {
31		public int compare(Object x, Object y) {
32	<	int i = ((Integer)x).intValue();
23	<	int j = ((Integer)y).intValue();
24	<	if (i < j) return 1;
25	<	if (i > j) return -1;
26	<	return 0;
32	>	return ((Comparable)y).compareTo(x);
33		}
34		}
35
36		/**
37	<	* Create a set of given size containing consecutive
37	>	* Returns a new set of given size containing consecutive
38		* Integers 0 ... n.
39		*/
40	<	private ConcurrentSkipListSet populatedSet(int n) {
41	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
40	>	private 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)
45	<	assertTrue(q.add(new Integer(i)));
46	<	for (int i = (n & 1); i < n; i+=2)
47	<	assertTrue(q.add(new Integer(i)));
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)
47	>	assertTrue(q.add(new Integer(i)));
48		assertFalse(q.isEmpty());
49	<	assertEquals(n, q.size());
49	>	assertEquals(n, q.size());
50		return q;
51		}
52
53		/**
54	<	* Create set of first 5 ints
54	>	* Returns a new set of first 5 ints.
55		*/
56		private ConcurrentSkipListSet set5() {
57		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
#	Line 54 | Line 61 | public class ConcurrentSkipListSetTest e
61		q.add(three);
62		q.add(four);
63		q.add(five);
64	<	assertEquals(5, q.size());
64	>	assertEquals(5, q.size());
65		return q;
66		}
67
#	Line 72 | Line 79 | public class ConcurrentSkipListSetTest e
79		try {
80		ConcurrentSkipListSet q = new ConcurrentSkipListSet((Collection)null);
81		shouldThrow();
82	<	}
76	<	catch (NullPointerException success) {}
82	>	} catch (NullPointerException success) {}
83		}
84
85		/**
#	Line 84 | Line 90 | public class ConcurrentSkipListSetTest e
90		Integer[] ints = new Integer[SIZE];
91		ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
92		shouldThrow();
93	<	}
88	<	catch (NullPointerException success) {}
93	>	} catch (NullPointerException success) {}
94		}
95
96		/**
#	Line 98 | Line 103 | public class ConcurrentSkipListSetTest e
103		ints[i] = new Integer(i);
104		ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
105		shouldThrow();
106	<	}
102	<	catch (NullPointerException success) {}
106	>	} catch (NullPointerException success) {}
107		}
108
109		/**
110		* Set contains all elements of collection used to initialize
111		*/
112		public void testConstructor6() {
113	<	try {
114	<	Integer[] ints = new Integer[SIZE];
115	<	for (int i = 0; i < SIZE; ++i)
116	<	ints[i] = new Integer(i);
117	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
118	<	for (int i = 0; i < SIZE; ++i)
115	<	assertEquals(ints[i], q.pollFirst());
116	<	}
117	<	finally {}
113	>	Integer[] ints = new Integer[SIZE];
114	>	for (int i = 0; i < SIZE; ++i)
115	>	ints[i] = new Integer(i);
116	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
117	>	for (int i = 0; i < SIZE; ++i)
118	>	assertEquals(ints[i], q.pollFirst());
119		}
120
121		/**
122		* The comparator used in constructor is used
123		*/
124		public void testConstructor7() {
125	<	try {
126	<	MyReverseComparator cmp = new MyReverseComparator();
127	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
128	<	assertEquals(cmp, q.comparator());
129	<	Integer[] ints = new Integer[SIZE];
130	<	for (int i = 0; i < SIZE; ++i)
131	<	ints[i] = new Integer(i);
132	<	q.addAll(Arrays.asList(ints));
133	<	for (int i = SIZE-1; i >= 0; --i)
133	<	assertEquals(ints[i], q.pollFirst());
134	<	}
135	<	finally {}
125	>	MyReverseComparator cmp = new MyReverseComparator();
126	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
127	>	assertEquals(cmp, q.comparator());
128	>	Integer[] ints = new Integer[SIZE];
129	>	for (int i = 0; i < SIZE; ++i)
130	>	ints[i] = new Integer(i);
131	>	q.addAll(Arrays.asList(ints));
132	>	for (int i = SIZE-1; i >= 0; --i)
133	>	assertEquals(ints[i], q.pollFirst());
134		}
135
136		/**
#	Line 168 | Line 166 | public class ConcurrentSkipListSetTest e
166		* add(null) throws NPE
167		*/
168		public void testAddNull() {
169	<	try {
169	>	try {
170		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
171		q.add(null);
172		shouldThrow();
173	<	} catch (NullPointerException success) { }
173	>	} catch (NullPointerException success) {}
174		}
175
176		/**
#	Line 203 | Line 201 | public class ConcurrentSkipListSetTest e
201		q.add(new Object());
202		q.add(new Object());
203		shouldThrow();
204	<	}
207	<	catch (ClassCastException success) {}
204	>	} catch (ClassCastException success) {}
205		}
206
207		/**
#	Line 215 | Line 212 | public class ConcurrentSkipListSetTest e
212		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
213		q.addAll(null);
214		shouldThrow();
215	<	}
219	<	catch (NullPointerException success) {}
215	>	} catch (NullPointerException success) {}
216		}
217	+
218		/**
219		* addAll of a collection with null elements throws NPE
220		*/
#	Line 227 | Line 224 | public class ConcurrentSkipListSetTest e
224		Integer[] ints = new Integer[SIZE];
225		q.addAll(Arrays.asList(ints));
226		shouldThrow();
227	<	}
231	<	catch (NullPointerException success) {}
227	>	} catch (NullPointerException success) {}
228		}
229	+
230		/**
231		* addAll of a collection with any null elements throws NPE after
232		* possibly adding some elements
#	Line 242 | Line 239 | public class ConcurrentSkipListSetTest e
239		ints[i] = new Integer(i);
240		q.addAll(Arrays.asList(ints));
241		shouldThrow();
242	<	}
246	<	catch (NullPointerException success) {}
242	>	} catch (NullPointerException success) {}
243		}
244
245		/**
246		* Set contains all elements of successful addAll
247		*/
248		public void testAddAll5() {
249	<	try {
250	<	Integer[] empty = new Integer[0];
251	<	Integer[] ints = new Integer[SIZE];
252	<	for (int i = 0; i < SIZE; ++i)
253	<	ints[i] = new Integer(SIZE-1-i);
254	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
255	<	assertFalse(q.addAll(Arrays.asList(empty)));
256	<	assertTrue(q.addAll(Arrays.asList(ints)));
257	<	for (int i = 0; i < SIZE; ++i)
262	<	assertEquals(new Integer(i), q.pollFirst());
263	<	}
264	<	finally {}
249	>	Integer[] empty = new Integer[0];
250	>	Integer[] ints = new Integer[SIZE];
251	>	for (int i = 0; i < SIZE; ++i)
252	>	ints[i] = new Integer(SIZE-1-i);
253	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
254	>	assertFalse(q.addAll(Arrays.asList(empty)));
255	>	assertTrue(q.addAll(Arrays.asList(ints)));
256	>	for (int i = 0; i < SIZE; ++i)
257	>	assertEquals(i, q.pollFirst());
258		}
259
260		/**
#	Line 270 | Line 263 | public class ConcurrentSkipListSetTest e
263		public void testPollFirst() {
264		ConcurrentSkipListSet q = populatedSet(SIZE);
265		for (int i = 0; i < SIZE; ++i) {
266	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
266	>	assertEquals(i, q.pollFirst());
267		}
268	<	assertNull(q.pollFirst());
268	>	assertNull(q.pollFirst());
269		}
270
271		/**
#	Line 281 | Line 274 | public class ConcurrentSkipListSetTest e
274		public void testPollLast() {
275		ConcurrentSkipListSet q = populatedSet(SIZE);
276		for (int i = SIZE-1; i >= 0; --i) {
277	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
277	>	assertEquals(i, q.pollLast());
278		}
279	<	assertNull(q.pollFirst());
279	>	assertNull(q.pollFirst());
280		}
281
289	–
282		/**
283		* remove(x) removes x and returns true if present
284		*/
285		public void testRemoveElement() {
286		ConcurrentSkipListSet q = populatedSet(SIZE);
287	<	for (int i = 1; i < SIZE; i+=2) {
288	<	assertTrue(q.remove(new Integer(i)));
289	<	}
290	<	for (int i = 0; i < SIZE; i+=2) {
291	<	assertTrue(q.remove(new Integer(i)));
292	<	assertFalse(q.remove(new Integer(i+1)));
287	>	for (int i = 1; i < SIZE; i += 2) {
288	>	assertTrue(q.contains(i));
289	>	assertTrue(q.remove(i));
290	>	assertFalse(q.contains(i));
291	>	assertTrue(q.contains(i-1));
292	>	}
293	>	for (int i = 0; i < SIZE; i += 2) {
294	>	assertTrue(q.contains(i));
295	>	assertTrue(q.remove(i));
296	>	assertFalse(q.contains(i));
297	>	assertFalse(q.remove(i+1));
298	>	assertFalse(q.contains(i+1));
299		}
300		assertTrue(q.isEmpty());
301		}
#	Line 371 | Line 369 | public class ConcurrentSkipListSetTest e
369		assertTrue(q.removeAll(p));
370		assertEquals(SIZE-i, q.size());
371		for (int j = 0; j < i; ++j) {
372	<	Integer I = (Integer)(p.pollFirst());
373	<	assertFalse(q.contains(I));
372	>	Integer x = (Integer)(p.pollFirst());
373	>	assertFalse(q.contains(x));
374		}
375		}
376		}
377
380	–
381	–
378		/**
379		* lower returns preceding element
380		*/
#	Line 395 | Line 391 | public class ConcurrentSkipListSetTest e
391
392		Object e4 = q.lower(zero);
393		assertNull(e4);
398	–
394		}
395
396		/**
#	Line 414 | Line 409 | public class ConcurrentSkipListSetTest e
409
410		Object e4 = q.higher(six);
411		assertNull(e4);
417	–
412		}
413
414		/**
#	Line 433 | Line 427 | public class ConcurrentSkipListSetTest e
427
428		Object e4 = q.floor(zero);
429		assertNull(e4);
436	–
430		}
431
432		/**
#	Line 452 | Line 445 | public class ConcurrentSkipListSetTest e
445
446		Object e4 = q.ceiling(six);
447		assertNull(e4);
455	–
448		}
449
450		/**
451	<	* toArray contains all elements
451	>	* toArray contains all elements in sorted order
452		*/
453		public void testToArray() {
454		ConcurrentSkipListSet q = populatedSet(SIZE);
455	<	Object[] o = q.toArray();
456	<	Arrays.sort(o);
457	<	for (int i = 0; i < o.length; i++)
466	<	assertEquals(o[i], q.pollFirst());
455	>	Object[] o = q.toArray();
456	>	for (int i = 0; i < o.length; i++)
457	>	assertSame(o[i], q.pollFirst());
458		}
459
460		/**
461	<	* toArray(a) contains all elements
461	>	* toArray(a) contains all elements in sorted order
462		*/
463		public void testToArray2() {
464	<	ConcurrentSkipListSet q = populatedSet(SIZE);
465	<	Integer[] ints = new Integer[SIZE];
466	<	ints = (Integer[])q.toArray(ints);
476	<	Arrays.sort(ints);
464	>	ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
465	>	Integer[] ints = new Integer[SIZE];
466	>	assertSame(ints, q.toArray(ints));
467		for (int i = 0; i < ints.length; i++)
468	<	assertEquals(ints[i], q.pollFirst());
468	>	assertSame(ints[i], q.pollFirst());
469		}
470
471		/**
#	Line 483 | Line 473 | public class ConcurrentSkipListSetTest e
473		*/
474		public void testIterator() {
475		ConcurrentSkipListSet q = populatedSet(SIZE);
476	<	int i = 0;
477	<	Iterator it = q.iterator();
478	<	while (it.hasNext()) {
476	>	Iterator it = q.iterator();
477	>	int i;
478	>	for (i = 0; it.hasNext(); i++)
479		assertTrue(q.contains(it.next()));
490	–	++i;
491	–	}
480		assertEquals(i, SIZE);
481	+	assertIteratorExhausted(it);
482		}
483
484		/**
485		* iterator of empty set has no elements
486		*/
487		public void testEmptyIterator() {
488	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
489	<	int i = 0;
490	<	Iterator it = q.iterator();
502	<	while (it.hasNext()) {
503	<	assertTrue(q.contains(it.next()));
504	<	++i;
505	<	}
506	<	assertEquals(i, 0);
488	>	NavigableSet s = new ConcurrentSkipListSet();
489	>	assertIteratorExhausted(s.iterator());
490	>	assertIteratorExhausted(s.descendingSet().iterator());
491		}
492
493		/**
494		* iterator.remove removes current element
495		*/
496	<	public void testIteratorRemove () {
496	>	public void testIteratorRemove() {
497		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
498		q.add(new Integer(2));
499		q.add(new Integer(1));
#	Line 525 | Line 509 | public class ConcurrentSkipListSetTest e
509		assertFalse(it.hasNext());
510		}
511
528	–
512		/**
513		* toString contains toStrings of elements
514		*/
#	Line 533 | Line 516 | public class ConcurrentSkipListSetTest e
516		ConcurrentSkipListSet q = populatedSet(SIZE);
517		String s = q.toString();
518		for (int i = 0; i < SIZE; ++i) {
519	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
519	>	assertTrue(s.contains(String.valueOf(i)));
520		}
521		}
522
523		/**
524		* A deserialized serialized set has same elements
525		*/
526	<	public void testSerialization() {
527	<	ConcurrentSkipListSet q = populatedSet(SIZE);
528	<	try {
529	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
530	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
531	<	out.writeObject(q);
532	<	out.close();
533	<
534	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
535	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
536	<	ConcurrentSkipListSet r = (ConcurrentSkipListSet)in.readObject();
554	<	assertEquals(q.size(), r.size());
555	<	while (!q.isEmpty())
556	<	assertEquals(q.pollFirst(), r.pollFirst());
557	<	} catch (Exception e){
558	<	e.printStackTrace();
559	<	unexpectedException();
526	>	public void testSerialization() throws Exception {
527	>	NavigableSet x = populatedSet(SIZE);
528	>	NavigableSet y = serialClone(x);
529	>
530	>	assertNotSame(x, y);
531	>	assertEquals(x.size(), y.size());
532	>	assertEquals(x, y);
533	>	assertEquals(y, x);
534	>	while (!x.isEmpty()) {
535	>	assertFalse(y.isEmpty());
536	>	assertEquals(x.pollFirst(), y.pollFirst());
537		}
538	+	assertTrue(y.isEmpty());
539		}
540
541		/**
#	Line 680 | Line 658 | public class ConcurrentSkipListSetTest e
658		}
659
660		Random rnd = new Random(666);
683	–	BitSet bs;
661
662		/**
663		* Subsets of subsets subdivide correctly
664		*/
665	<	public void testRecursiveSubSets() {
666	<	int setSize = 1000;
667	<	Class cl = ConcurrentSkipListSet.class;
665	>	public void testRecursiveSubSets() throws Exception {
666	>	int setSize = expensiveTests ? 1000 : 100;
667	>	Class cl = ConcurrentSkipListSet.class;
668
669		NavigableSet<Integer> set = newSet(cl);
670	<	bs = new BitSet(setSize);
670	>	BitSet bs = new BitSet(setSize);
671
672	<	populate(set, setSize);
673	<	check(set,                 0, setSize - 1, true);
674	<	check(set.descendingSet(), 0, setSize - 1, false);
675	<
676	<	mutateSet(set, 0, setSize - 1);
677	<	check(set,                 0, setSize - 1, true);
678	<	check(set.descendingSet(), 0, setSize - 1, false);
672	>	populate(set, setSize, bs);
673	>	check(set,                 0, setSize - 1, true, bs);
674	>	check(set.descendingSet(), 0, setSize - 1, false, bs);
675	>
676	>	mutateSet(set, 0, setSize - 1, bs);
677	>	check(set,                 0, setSize - 1, true, bs);
678	>	check(set.descendingSet(), 0, setSize - 1, false, bs);
679
680		bashSubSet(set.subSet(0, true, setSize, false),
681	<	0, setSize - 1, true);
681	>	0, setSize - 1, true, bs);
682		}
683
684	<	static NavigableSet<Integer> newSet(Class cl) {
685	<	NavigableSet<Integer> result = null;
686	<	try {
687	<	result = (NavigableSet<Integer>) cl.newInstance();
688	<	} catch (Exception e) {
689	<	fail();
690	<	}
691	<	assertEquals(result.size(), 0);
684	>	/**
685	>	* addAll is idempotent
686	>	*/
687	>	public void testAddAll_idempotent() throws Exception {
688	>	Set x = populatedSet(SIZE);
689	>	Set y = new ConcurrentSkipListSet(x);
690	>	y.addAll(x);
691	>	assertEquals(x, y);
692	>	assertEquals(y, x);
693	>	}
694	>
695	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
696	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
697	>	assertEquals(0, result.size());
698		assertFalse(result.iterator().hasNext());
699		return result;
700		}
701
702	<	void populate(NavigableSet<Integer> set, int limit) {
702	>	void populate(NavigableSet<Integer> set, int limit, BitSet bs) {
703		for (int i = 0, n = 2 * limit / 3; i < n; i++) {
704		int element = rnd.nextInt(limit);
705	<	put(set, element);
705	>	put(set, element, bs);
706		}
707		}
708
709	<	void mutateSet(NavigableSet<Integer> set, int min, int max) {
709	>	void mutateSet(NavigableSet<Integer> set, int min, int max, BitSet bs) {
710		int size = set.size();
711		int rangeSize = max - min + 1;
712
713		// Remove a bunch of entries directly
714		for (int i = 0, n = rangeSize / 2; i < n; i++) {
715	<	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
715	>	remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs);
716		}
717
718		// Remove a bunch of entries with iterator
#	Line 743 | Line 726 | public class ConcurrentSkipListSetTest e
726		// Add entries till we're back to original size
727		while (set.size() < size) {
728		int element = min + rnd.nextInt(rangeSize);
729	<	assertTrue(element >= min && element<= max);
730	<	put(set, element);
729	>	assertTrue(element >= min && element <= max);
730	>	put(set, element, bs);
731		}
732		}
733
734	<	void mutateSubSet(NavigableSet<Integer> set, int min, int max) {
734	>	void mutateSubSet(NavigableSet<Integer> set, int min, int max,
735	>	BitSet bs) {
736		int size = set.size();
737		int rangeSize = max - min + 1;
738
739		// Remove a bunch of entries directly
740		for (int i = 0, n = rangeSize / 2; i < n; i++) {
741	<	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
741	>	remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs);
742		}
743
744		// Remove a bunch of entries with iterator
#	Line 768 | Line 752 | public class ConcurrentSkipListSetTest e
752		// Add entries till we're back to original size
753		while (set.size() < size) {
754		int element = min - 5 + rnd.nextInt(rangeSize + 10);
755	<	if (element >= min && element<= max) {
756	<	put(set, element);
755	>	if (element >= min && element <= max) {
756	>	put(set, element, bs);
757		} else {
758		try {
759		set.add(element);
760	<	fail();
761	<	} catch (IllegalArgumentException e) {
778	<	// expected
779	<	}
760	>	shouldThrow();
761	>	} catch (IllegalArgumentException success) {}
762		}
763		}
764		}
765
766	<	void put(NavigableSet<Integer> set, int element) {
766	>	void put(NavigableSet<Integer> set, int element, BitSet bs) {
767		if (set.add(element))
768		bs.set(element);
769		}
770
771	<	void remove(NavigableSet<Integer> set, int element) {
771	>	void remove(NavigableSet<Integer> set, int element, BitSet bs) {
772		if (set.remove(element))
773		bs.clear(element);
774		}
775
776		void bashSubSet(NavigableSet<Integer> set,
777	<	int min, int max, boolean ascending) {
778	<	check(set, min, max, ascending);
779	<	check(set.descendingSet(), min, max, !ascending);
780	<
781	<	mutateSubSet(set, min, max);
782	<	check(set, min, max, ascending);
783	<	check(set.descendingSet(), min, max, !ascending);
777	>	int min, int max, boolean ascending,
778	>	BitSet bs) {
779	>	check(set, min, max, ascending, bs);
780	>	check(set.descendingSet(), min, max, !ascending, bs);
781	>
782	>	mutateSubSet(set, min, max, bs);
783	>	check(set, min, max, ascending, bs);
784	>	check(set.descendingSet(), min, max, !ascending, bs);
785
786		// Recurse
787		if (max - min < 2)
#	Line 810 | Line 793 | public class ConcurrentSkipListSetTest e
793		NavigableSet<Integer> hm = set.headSet(midPoint, incl);
794		if (ascending) {
795		if (rnd.nextBoolean())
796	<	bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
796	>	bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true, bs);
797		else
798		bashSubSet(hm.descendingSet(), min, midPoint - (incl ? 0 : 1),
799	<	false);
799	>	false, bs);
800		} else {
801		if (rnd.nextBoolean())
802	<	bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false);
802	>	bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false, bs);
803		else
804		bashSubSet(hm.descendingSet(), midPoint + (incl ? 0 : 1), max,
805	<	true);
805	>	true, bs);
806		}
807
808		// tailSet - pick direction and endpoint inclusion randomly
#	Line 827 | Line 810 | public class ConcurrentSkipListSetTest e
810		NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
811		if (ascending) {
812		if (rnd.nextBoolean())
813	<	bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
813	>	bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true, bs);
814		else
815		bashSubSet(tm.descendingSet(), midPoint + (incl ? 0 : 1), max,
816	<	false);
816	>	false, bs);
817		} else {
818		if (rnd.nextBoolean()) {
819	<	bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false);
819	>	bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false, bs);
820		} else {
821		bashSubSet(tm.descendingSet(), min, midPoint - (incl ? 0 : 1),
822	<	true);
822	>	true, bs);
823		}
824		}
825
#	Line 853 | Line 836 | public class ConcurrentSkipListSetTest e
836		endpoints[0], lowIncl, endpoints[1], highIncl);
837		if (rnd.nextBoolean())
838		bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
839	<	endpoints[1] - (highIncl ? 0 : 1), true);
839	>	endpoints[1] - (highIncl ? 0 : 1), true, bs);
840		else
841		bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
842	<	endpoints[1] - (highIncl ? 0 : 1), false);
842	>	endpoints[1] - (highIncl ? 0 : 1), false, bs);
843		} else {
844		NavigableSet<Integer> sm = set.subSet(
845		endpoints[1], highIncl, endpoints[0], lowIncl);
846		if (rnd.nextBoolean())
847		bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
848	<	endpoints[1] - (highIncl ? 0 : 1), false);
848	>	endpoints[1] - (highIncl ? 0 : 1), false, bs);
849		else
850		bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
851	<	endpoints[1] - (highIncl ? 0 : 1), true);
851	>	endpoints[1] - (highIncl ? 0 : 1), true, bs);
852		}
853		}
854
#	Line 873 | Line 856 | public class ConcurrentSkipListSetTest e
856		* min and max are both inclusive.  If max < min, interval is empty.
857		*/
858		void check(NavigableSet<Integer> set,
859	<	final int min, final int max, final boolean ascending) {
860	<	class ReferenceSet {
859	>	final int min, final int max, final boolean ascending,
860	>	final BitSet bs) {
861	>	class ReferenceSet {
862		int lower(int element) {
863		return ascending ?
864		lowerAscending(element) : higherAscending(element);
#	Line 909 | Line 893 | public class ConcurrentSkipListSetTest e
893		// BitSet should support this! Test would run much faster
894		while (element >= min) {
895		if (bs.get(element))
896	<	return(element);
896	>	return element;
897		element--;
898		}
899		return -1;
#	Line 944 | Line 928 | public class ConcurrentSkipListSetTest e
928		if (bsContainsI)
929		size++;
930		}
931	<	assertEquals(set.size(), size);
931	>	assertEquals(size, set.size());
932
933		// Test contents using contains elementSet iterator
934		int size2 = 0;
#	Line 975 | Line 959 | public class ConcurrentSkipListSetTest e
959		assertEq(rs.last(),  -1);
960		try {
961		set.first();
962	<	fail();
963	<	} catch (NoSuchElementException e) {
980	<	// expected
981	<	}
962	>	shouldThrow();
963	>	} catch (NoSuchElementException success) {}
964		try {
965		set.last();
966	<	fail();
967	<	} catch (NoSuchElementException e) {
986	<	// expected
987	<	}
966	>	shouldThrow();
967	>	} catch (NoSuchElementException success) {}
968		}
969		}
970

Diff Legend

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