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.9 by jsr166, Sat Nov 21 10:29:50 2009 UTC vs.
Revision 1.23 by jsr166, Tue May 31 16:16:23 2011 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.*;
8	>	import java.util.Arrays;
9	>	import java.util.BitSet;
10	>	import java.util.Collection;
11	>	import java.util.Comparator;
12	>	import java.util.Iterator;
13	>	import java.util.NavigableSet;
14	>	import java.util.NoSuchElementException;
15	>	import java.util.Random;
16	>	import java.util.Set;
17	>	import java.util.SortedSet;
18	>	import java.util.concurrent.ConcurrentSkipListSet;
19
20		public class ConcurrentSkipListSetTest extends JSR166TestCase {
21		public static void main(String[] args) {
22	<	junit.textui.TestRunner.run (suite());
22	>	junit.textui.TestRunner.run(suite());
23		}
24		public static Test suite() {
25		return new TestSuite(ConcurrentSkipListSetTest.class);
#	Line 19 | Line 27 | public class ConcurrentSkipListSetTest e
27
28		static class MyReverseComparator implements Comparator {
29		public int compare(Object x, Object y) {
30	<	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;
30	>	return ((Comparable)y).compareTo(x);
31		}
32		}
33
#	Line 31 | Line 35 | public class ConcurrentSkipListSetTest e
35		* Create a set of given size containing consecutive
36		* Integers 0 ... n.
37		*/
38	<	private ConcurrentSkipListSet populatedSet(int n) {
39	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
38	>	private ConcurrentSkipListSet<Integer> populatedSet(int n) {
39	>	ConcurrentSkipListSet<Integer> q =
40	>	new ConcurrentSkipListSet<Integer>();
41		assertTrue(q.isEmpty());
42		for (int i = n-1; i >= 0; i-=2)
43		assertTrue(q.add(new Integer(i)));
#	Line 207 | Line 212 | public class ConcurrentSkipListSetTest e
212		shouldThrow();
213		} catch (NullPointerException success) {}
214		}
215	+
216		/**
217		* addAll of a collection with null elements throws NPE
218		*/
#	Line 218 | Line 224 | public class ConcurrentSkipListSetTest e
224		shouldThrow();
225		} catch (NullPointerException success) {}
226		}
227	+
228		/**
229		* addAll of a collection with any null elements throws NPE after
230		* possibly adding some elements
#	Line 245 | Line 252 | public class ConcurrentSkipListSetTest e
252		assertFalse(q.addAll(Arrays.asList(empty)));
253		assertTrue(q.addAll(Arrays.asList(ints)));
254		for (int i = 0; i < SIZE; ++i)
255	<	assertEquals(new Integer(i), q.pollFirst());
255	>	assertEquals(i, q.pollFirst());
256		}
257
258		/**
#	Line 254 | Line 261 | public class ConcurrentSkipListSetTest e
261		public void testPollFirst() {
262		ConcurrentSkipListSet q = populatedSet(SIZE);
263		for (int i = 0; i < SIZE; ++i) {
264	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
264	>	assertEquals(i, q.pollFirst());
265		}
266		assertNull(q.pollFirst());
267		}
#	Line 265 | Line 272 | public class ConcurrentSkipListSetTest e
272		public void testPollLast() {
273		ConcurrentSkipListSet q = populatedSet(SIZE);
274		for (int i = SIZE-1; i >= 0; --i) {
275	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
275	>	assertEquals(i, q.pollLast());
276		}
277		assertNull(q.pollFirst());
278		}
279
273	–
280		/**
281		* remove(x) removes x and returns true if present
282		*/
283		public void testRemoveElement() {
284		ConcurrentSkipListSet q = populatedSet(SIZE);
285		for (int i = 1; i < SIZE; i+=2) {
286	<	assertTrue(q.remove(new Integer(i)));
286	>	assertTrue(q.contains(i));
287	>	assertTrue(q.remove(i));
288	>	assertFalse(q.contains(i));
289	>	assertTrue(q.contains(i-1));
290		}
291		for (int i = 0; i < SIZE; i+=2) {
292	<	assertTrue(q.remove(new Integer(i)));
293	<	assertFalse(q.remove(new Integer(i+1)));
292	>	assertTrue(q.contains(i));
293	>	assertTrue(q.remove(i));
294	>	assertFalse(q.contains(i));
295	>	assertFalse(q.remove(i+1));
296	>	assertFalse(q.contains(i+1));
297		}
298		assertTrue(q.isEmpty());
299		}
#	Line 361 | Line 373 | public class ConcurrentSkipListSetTest e
373		}
374		}
375
364	–
365	–
376		/**
377		* lower returns preceding element
378		*/
#	Line 379 | Line 389 | public class ConcurrentSkipListSetTest e
389
390		Object e4 = q.lower(zero);
391		assertNull(e4);
382	–
392		}
393
394		/**
#	Line 398 | Line 407 | public class ConcurrentSkipListSetTest e
407
408		Object e4 = q.higher(six);
409		assertNull(e4);
401	–
410		}
411
412		/**
#	Line 417 | Line 425 | public class ConcurrentSkipListSetTest e
425
426		Object e4 = q.floor(zero);
427		assertNull(e4);
420	–
428		}
429
430		/**
#	Line 436 | Line 443 | public class ConcurrentSkipListSetTest e
443
444		Object e4 = q.ceiling(six);
445		assertNull(e4);
439	–
446		}
447
448		/**
449	<	* toArray contains all elements
449	>	* toArray contains all elements in sorted order
450		*/
451		public void testToArray() {
452		ConcurrentSkipListSet q = populatedSet(SIZE);
453		Object[] o = q.toArray();
448	–	Arrays.sort(o);
454		for (int i = 0; i < o.length; i++)
455	<	assertEquals(o[i], q.pollFirst());
455	>	assertSame(o[i], q.pollFirst());
456		}
457
458		/**
459	<	* toArray(a) contains all elements
459	>	* toArray(a) contains all elements in sorted order
460		*/
461		public void testToArray2() {
462	<	ConcurrentSkipListSet q = populatedSet(SIZE);
462	>	ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
463		Integer[] ints = new Integer[SIZE];
464	<	ints = (Integer[])q.toArray(ints);
465	<	Arrays.sort(ints);
464	>	Integer[] array = q.toArray(ints);
465	>	assertSame(ints, array);
466		for (int i = 0; i < ints.length; i++)
467	<	assertEquals(ints[i], q.pollFirst());
467	>	assertSame(ints[i], q.pollFirst());
468		}
469
470		/**
#	Line 493 | Line 498 | public class ConcurrentSkipListSetTest e
498		/**
499		* iterator.remove removes current element
500		*/
501	<	public void testIteratorRemove () {
501	>	public void testIteratorRemove() {
502		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
503		q.add(new Integer(2));
504		q.add(new Integer(1));
#	Line 509 | Line 514 | public class ConcurrentSkipListSetTest e
514		assertFalse(it.hasNext());
515		}
516
512	–
517		/**
518		* toString contains toStrings of elements
519		*/
#	Line 517 | Line 521 | public class ConcurrentSkipListSetTest e
521		ConcurrentSkipListSet q = populatedSet(SIZE);
522		String s = q.toString();
523		for (int i = 0; i < SIZE; ++i) {
524	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
524	>	assertTrue(s.contains(String.valueOf(i)));
525		}
526		}
527
#	Line 525 | Line 529 | public class ConcurrentSkipListSetTest e
529		* A deserialized serialized set has same elements
530		*/
531		public void testSerialization() throws Exception {
532	<	ConcurrentSkipListSet q = populatedSet(SIZE);
533	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
534	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
535	<	out.writeObject(q);
536	<	out.close();
537	<
538	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
539	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
540	<	ConcurrentSkipListSet r = (ConcurrentSkipListSet)in.readObject();
541	<	assertEquals(q.size(), r.size());
542	<	while (!q.isEmpty())
543	<	assertEquals(q.pollFirst(), r.pollFirst());
532	>	NavigableSet x = populatedSet(SIZE);
533	>	NavigableSet y = serialClone(x);
534	>
535	>	assertTrue(x != y);
536	>	assertEquals(x.size(), y.size());
537	>	assertEquals(x, y);
538	>	assertEquals(y, x);
539	>	while (!x.isEmpty()) {
540	>	assertFalse(y.isEmpty());
541	>	assertEquals(x.pollFirst(), y.pollFirst());
542	>	}
543	>	assertTrue(y.isEmpty());
544		}
545
546		/**
#	Line 659 | Line 663 | public class ConcurrentSkipListSetTest e
663		}
664
665		Random rnd = new Random(666);
662	–	BitSet bs;
666
667		/**
668		* Subsets of subsets subdivide correctly
669		*/
670	<	public void testRecursiveSubSets() {
671	<	int setSize = 1000;
670	>	public void testRecursiveSubSets() throws Exception {
671	>	int setSize = expensiveTests ? 1000 : 100;
672		Class cl = ConcurrentSkipListSet.class;
673
674		NavigableSet<Integer> set = newSet(cl);
675	<	bs = new BitSet(setSize);
675	>	BitSet bs = new BitSet(setSize);
676
677	<	populate(set, setSize);
678	<	check(set,                 0, setSize - 1, true);
679	<	check(set.descendingSet(), 0, setSize - 1, false);
680	<
681	<	mutateSet(set, 0, setSize - 1);
682	<	check(set,                 0, setSize - 1, true);
683	<	check(set.descendingSet(), 0, setSize - 1, false);
677	>	populate(set, setSize, bs);
678	>	check(set,                 0, setSize - 1, true, bs);
679	>	check(set.descendingSet(), 0, setSize - 1, false, bs);
680	>
681	>	mutateSet(set, 0, setSize - 1, bs);
682	>	check(set,                 0, setSize - 1, true, bs);
683	>	check(set.descendingSet(), 0, setSize - 1, false, bs);
684
685		bashSubSet(set.subSet(0, true, setSize, false),
686	<	0, setSize - 1, true);
686	>	0, setSize - 1, true, bs);
687		}
688
689	<	static NavigableSet<Integer> newSet(Class cl) {
690	<	NavigableSet<Integer> result = null;
688	<	try {
689	<	result = (NavigableSet<Integer>) cl.newInstance();
690	<	} catch (Exception e) {
691	<	fail();
692	<	}
689	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
690	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
691		assertEquals(result.size(), 0);
692		assertFalse(result.iterator().hasNext());
693		return result;
694		}
695
696	<	void populate(NavigableSet<Integer> set, int limit) {
696	>	void populate(NavigableSet<Integer> set, int limit, BitSet bs) {
697		for (int i = 0, n = 2 * limit / 3; i < n; i++) {
698		int element = rnd.nextInt(limit);
699	<	put(set, element);
699	>	put(set, element, bs);
700		}
701		}
702
703	<	void mutateSet(NavigableSet<Integer> set, int min, int max) {
703	>	void mutateSet(NavigableSet<Integer> set, int min, int max, BitSet bs) {
704		int size = set.size();
705		int rangeSize = max - min + 1;
706
707		// Remove a bunch of entries directly
708		for (int i = 0, n = rangeSize / 2; i < n; i++) {
709	<	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
709	>	remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs);
710		}
711
712		// Remove a bunch of entries with iterator
#	Line 723 | Line 721 | public class ConcurrentSkipListSetTest e
721		while (set.size() < size) {
722		int element = min + rnd.nextInt(rangeSize);
723		assertTrue(element >= min && element<= max);
724	<	put(set, element);
724	>	put(set, element, bs);
725		}
726		}
727
728	<	void mutateSubSet(NavigableSet<Integer> set, int min, int max) {
728	>	void mutateSubSet(NavigableSet<Integer> set, int min, int max,
729	>	BitSet bs) {
730		int size = set.size();
731		int rangeSize = max - min + 1;
732
733		// Remove a bunch of entries directly
734		for (int i = 0, n = rangeSize / 2; i < n; i++) {
735	<	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
735	>	remove(set, min - 5 + rnd.nextInt(rangeSize + 10), bs);
736		}
737
738		// Remove a bunch of entries with iterator
#	Line 748 | Line 747 | public class ConcurrentSkipListSetTest e
747		while (set.size() < size) {
748		int element = min - 5 + rnd.nextInt(rangeSize + 10);
749		if (element >= min && element<= max) {
750	<	put(set, element);
750	>	put(set, element, bs);
751		} else {
752		try {
753		set.add(element);
754	<	fail();
755	<	} catch (IllegalArgumentException e) {
757	<	// expected
758	<	}
754	>	shouldThrow();
755	>	} catch (IllegalArgumentException success) {}
756		}
757		}
758		}
759
760	<	void put(NavigableSet<Integer> set, int element) {
760	>	void put(NavigableSet<Integer> set, int element, BitSet bs) {
761		if (set.add(element))
762		bs.set(element);
763		}
764
765	<	void remove(NavigableSet<Integer> set, int element) {
765	>	void remove(NavigableSet<Integer> set, int element, BitSet bs) {
766		if (set.remove(element))
767		bs.clear(element);
768		}
769
770		void bashSubSet(NavigableSet<Integer> set,
771	<	int min, int max, boolean ascending) {
772	<	check(set, min, max, ascending);
773	<	check(set.descendingSet(), min, max, !ascending);
774	<
775	<	mutateSubSet(set, min, max);
776	<	check(set, min, max, ascending);
777	<	check(set.descendingSet(), min, max, !ascending);
771	>	int min, int max, boolean ascending,
772	>	BitSet bs) {
773	>	check(set, min, max, ascending, bs);
774	>	check(set.descendingSet(), min, max, !ascending, bs);
775	>
776	>	mutateSubSet(set, min, max, bs);
777	>	check(set, min, max, ascending, bs);
778	>	check(set.descendingSet(), min, max, !ascending, bs);
779
780		// Recurse
781		if (max - min < 2)
#	Line 789 | Line 787 | public class ConcurrentSkipListSetTest e
787		NavigableSet<Integer> hm = set.headSet(midPoint, incl);
788		if (ascending) {
789		if (rnd.nextBoolean())
790	<	bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
790	>	bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true, bs);
791		else
792		bashSubSet(hm.descendingSet(), min, midPoint - (incl ? 0 : 1),
793	<	false);
793	>	false, bs);
794		} else {
795		if (rnd.nextBoolean())
796	<	bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false);
796	>	bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false, bs);
797		else
798		bashSubSet(hm.descendingSet(), midPoint + (incl ? 0 : 1), max,
799	<	true);
799	>	true, bs);
800		}
801
802		// tailSet - pick direction and endpoint inclusion randomly
#	Line 806 | Line 804 | public class ConcurrentSkipListSetTest e
804		NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
805		if (ascending) {
806		if (rnd.nextBoolean())
807	<	bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
807	>	bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true, bs);
808		else
809		bashSubSet(tm.descendingSet(), midPoint + (incl ? 0 : 1), max,
810	<	false);
810	>	false, bs);
811		} else {
812		if (rnd.nextBoolean()) {
813	<	bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false);
813	>	bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false, bs);
814		} else {
815		bashSubSet(tm.descendingSet(), min, midPoint - (incl ? 0 : 1),
816	<	true);
816	>	true, bs);
817		}
818		}
819
#	Line 832 | Line 830 | public class ConcurrentSkipListSetTest e
830		endpoints[0], lowIncl, endpoints[1], highIncl);
831		if (rnd.nextBoolean())
832		bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
833	<	endpoints[1] - (highIncl ? 0 : 1), true);
833	>	endpoints[1] - (highIncl ? 0 : 1), true, bs);
834		else
835		bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
836	<	endpoints[1] - (highIncl ? 0 : 1), false);
836	>	endpoints[1] - (highIncl ? 0 : 1), false, bs);
837		} else {
838		NavigableSet<Integer> sm = set.subSet(
839		endpoints[1], highIncl, endpoints[0], lowIncl);
840		if (rnd.nextBoolean())
841		bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
842	<	endpoints[1] - (highIncl ? 0 : 1), false);
842	>	endpoints[1] - (highIncl ? 0 : 1), false, bs);
843		else
844		bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
845	<	endpoints[1] - (highIncl ? 0 : 1), true);
845	>	endpoints[1] - (highIncl ? 0 : 1), true, bs);
846		}
847		}
848
#	Line 852 | Line 850 | public class ConcurrentSkipListSetTest e
850		* min and max are both inclusive.  If max < min, interval is empty.
851		*/
852		void check(NavigableSet<Integer> set,
853	<	final int min, final int max, final boolean ascending) {
854	<	class ReferenceSet {
853	>	final int min, final int max, final boolean ascending,
854	>	final BitSet bs) {
855	>	class ReferenceSet {
856		int lower(int element) {
857		return ascending ?
858		lowerAscending(element) : higherAscending(element);
#	Line 888 | Line 887 | public class ConcurrentSkipListSetTest e
887		// BitSet should support this! Test would run much faster
888		while (element >= min) {
889		if (bs.get(element))
890	<	return(element);
890	>	return element;
891		element--;
892		}
893		return -1;
#	Line 954 | Line 953 | public class ConcurrentSkipListSetTest e
953		assertEq(rs.last(),  -1);
954		try {
955		set.first();
956	<	fail();
957	<	} catch (NoSuchElementException e) {
959	<	// expected
960	<	}
956	>	shouldThrow();
957	>	} catch (NoSuchElementException success) {}
958		try {
959		set.last();
960	<	fail();
961	<	} catch (NoSuchElementException e) {
965	<	// expected
966	<	}
960	>	shouldThrow();
961	>	} catch (NoSuchElementException success) {}
962		}
963		}
964

Diff Legend

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