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.6 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.18 by jsr166, Fri Nov 5 00:17:22 2010 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class ConcurrentSkipListSetTest extends JSR166TestCase {
13		public static void main(String[] args) {
14	<	junit.textui.TestRunner.run (suite());
14	>	junit.textui.TestRunner.run(suite());
15		}
16		public static Test suite() {
17	<	return new TestSuite(ConcurrentSkipListSetTest.class);
17	>	return new TestSuite(ConcurrentSkipListSetTest.class);
18		}
19
20		static class MyReverseComparator implements Comparator {
21		public int compare(Object x, Object y) {
22	<	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;
22	>	return ((Comparable)y).compareTo(x);
23		}
24		}
25
#	Line 31 | Line 27 | public class ConcurrentSkipListSetTest e
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private ConcurrentSkipListSet populatedSet(int n) {
31	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
30	>	private ConcurrentSkipListSet<Integer> populatedSet(int n) {
31	>	ConcurrentSkipListSet<Integer> q =
32	>	new ConcurrentSkipListSet<Integer>();
33		assertTrue(q.isEmpty());
34	<	for (int i = n-1; i >= 0; i-=2)
35	<	assertTrue(q.add(new Integer(i)));
36	<	for (int i = (n & 1); i < n; i+=2)
37	<	assertTrue(q.add(new Integer(i)));
34	>	for (int i = n-1; i >= 0; i-=2)
35	>	assertTrue(q.add(new Integer(i)));
36	>	for (int i = (n & 1); i < n; i+=2)
37	>	assertTrue(q.add(new Integer(i)));
38		assertFalse(q.isEmpty());
39	<	assertEquals(n, q.size());
39	>	assertEquals(n, q.size());
40		return q;
41		}
42
#	Line 54 | Line 51 | public class ConcurrentSkipListSetTest e
51		q.add(three);
52		q.add(four);
53		q.add(five);
54	<	assertEquals(5, q.size());
54	>	assertEquals(5, q.size());
55		return q;
56		}
57
#	Line 72 | Line 69 | public class ConcurrentSkipListSetTest e
69		try {
70		ConcurrentSkipListSet q = new ConcurrentSkipListSet((Collection)null);
71		shouldThrow();
72	<	}
76	<	catch (NullPointerException success) {}
72	>	} catch (NullPointerException success) {}
73		}
74
75		/**
#	Line 84 | Line 80 | public class ConcurrentSkipListSetTest e
80		Integer[] ints = new Integer[SIZE];
81		ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
82		shouldThrow();
83	<	}
88	<	catch (NullPointerException success) {}
83	>	} catch (NullPointerException success) {}
84		}
85
86		/**
#	Line 98 | Line 93 | public class ConcurrentSkipListSetTest e
93		ints[i] = new Integer(i);
94		ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
95		shouldThrow();
96	<	}
102	<	catch (NullPointerException success) {}
96	>	} catch (NullPointerException success) {}
97		}
98
99		/**
100		* Set contains all elements of collection used to initialize
101		*/
102		public void testConstructor6() {
103	<	try {
104	<	Integer[] ints = new Integer[SIZE];
105	<	for (int i = 0; i < SIZE; ++i)
106	<	ints[i] = new Integer(i);
107	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
108	<	for (int i = 0; i < SIZE; ++i)
115	<	assertEquals(ints[i], q.pollFirst());
116	<	}
117	<	finally {}
103	>	Integer[] ints = new Integer[SIZE];
104	>	for (int i = 0; i < SIZE; ++i)
105	>	ints[i] = new Integer(i);
106	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(ints));
107	>	for (int i = 0; i < SIZE; ++i)
108	>	assertEquals(ints[i], q.pollFirst());
109		}
110
111		/**
112		* The comparator used in constructor is used
113		*/
114		public void testConstructor7() {
115	<	try {
116	<	MyReverseComparator cmp = new MyReverseComparator();
117	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
118	<	assertEquals(cmp, q.comparator());
119	<	Integer[] ints = new Integer[SIZE];
120	<	for (int i = 0; i < SIZE; ++i)
121	<	ints[i] = new Integer(i);
122	<	q.addAll(Arrays.asList(ints));
123	<	for (int i = SIZE-1; i >= 0; --i)
133	<	assertEquals(ints[i], q.pollFirst());
134	<	}
135	<	finally {}
115	>	MyReverseComparator cmp = new MyReverseComparator();
116	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
117	>	assertEquals(cmp, q.comparator());
118	>	Integer[] ints = new Integer[SIZE];
119	>	for (int i = 0; i < SIZE; ++i)
120	>	ints[i] = new Integer(i);
121	>	q.addAll(Arrays.asList(ints));
122	>	for (int i = SIZE-1; i >= 0; --i)
123	>	assertEquals(ints[i], q.pollFirst());
124		}
125
126		/**
#	Line 168 | Line 156 | public class ConcurrentSkipListSetTest e
156		* add(null) throws NPE
157		*/
158		public void testAddNull() {
159	<	try {
159	>	try {
160		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
161		q.add(null);
162		shouldThrow();
163	<	} catch (NullPointerException success) { }
163	>	} catch (NullPointerException success) {}
164		}
165
166		/**
#	Line 203 | Line 191 | public class ConcurrentSkipListSetTest e
191		q.add(new Object());
192		q.add(new Object());
193		shouldThrow();
194	<	}
207	<	catch (ClassCastException success) {}
194	>	} catch (ClassCastException success) {}
195		}
196
197		/**
#	Line 215 | Line 202 | public class ConcurrentSkipListSetTest e
202		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
203		q.addAll(null);
204		shouldThrow();
205	<	}
219	<	catch (NullPointerException success) {}
205	>	} catch (NullPointerException success) {}
206		}
207	+
208		/**
209		* addAll of a collection with null elements throws NPE
210		*/
#	Line 227 | Line 214 | public class ConcurrentSkipListSetTest e
214		Integer[] ints = new Integer[SIZE];
215		q.addAll(Arrays.asList(ints));
216		shouldThrow();
217	<	}
231	<	catch (NullPointerException success) {}
217	>	} catch (NullPointerException success) {}
218		}
219	+
220		/**
221		* addAll of a collection with any null elements throws NPE after
222		* possibly adding some elements
#	Line 242 | Line 229 | public class ConcurrentSkipListSetTest e
229		ints[i] = new Integer(i);
230		q.addAll(Arrays.asList(ints));
231		shouldThrow();
232	<	}
246	<	catch (NullPointerException success) {}
232	>	} catch (NullPointerException success) {}
233		}
234
235		/**
236		* Set contains all elements of successful addAll
237		*/
238		public void testAddAll5() {
239	<	try {
240	<	Integer[] empty = new Integer[0];
241	<	Integer[] ints = new Integer[SIZE];
242	<	for (int i = 0; i < SIZE; ++i)
243	<	ints[i] = new Integer(SIZE-1-i);
244	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
245	<	assertFalse(q.addAll(Arrays.asList(empty)));
246	<	assertTrue(q.addAll(Arrays.asList(ints)));
247	<	for (int i = 0; i < SIZE; ++i)
262	<	assertEquals(new Integer(i), q.pollFirst());
263	<	}
264	<	finally {}
239	>	Integer[] empty = new Integer[0];
240	>	Integer[] ints = new Integer[SIZE];
241	>	for (int i = 0; i < SIZE; ++i)
242	>	ints[i] = new Integer(SIZE-1-i);
243	>	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
244	>	assertFalse(q.addAll(Arrays.asList(empty)));
245	>	assertTrue(q.addAll(Arrays.asList(ints)));
246	>	for (int i = 0; i < SIZE; ++i)
247	>	assertEquals(i, q.pollFirst());
248		}
249
250		/**
#	Line 270 | Line 253 | public class ConcurrentSkipListSetTest e
253		public void testPollFirst() {
254		ConcurrentSkipListSet q = populatedSet(SIZE);
255		for (int i = 0; i < SIZE; ++i) {
256	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
256	>	assertEquals(i, q.pollFirst());
257		}
258	<	assertNull(q.pollFirst());
258	>	assertNull(q.pollFirst());
259		}
260
261		/**
#	Line 281 | Line 264 | public class ConcurrentSkipListSetTest e
264		public void testPollLast() {
265		ConcurrentSkipListSet q = populatedSet(SIZE);
266		for (int i = SIZE-1; i >= 0; --i) {
267	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
267	>	assertEquals(i, q.pollLast());
268		}
269	<	assertNull(q.pollFirst());
269	>	assertNull(q.pollFirst());
270		}
271
272
#	Line 395 | Line 378 | public class ConcurrentSkipListSetTest e
378
379		Object e4 = q.lower(zero);
380		assertNull(e4);
398	–
381		}
382
383		/**
#	Line 414 | Line 396 | public class ConcurrentSkipListSetTest e
396
397		Object e4 = q.higher(six);
398		assertNull(e4);
417	–
399		}
400
401		/**
#	Line 433 | Line 414 | public class ConcurrentSkipListSetTest e
414
415		Object e4 = q.floor(zero);
416		assertNull(e4);
436	–
417		}
418
419		/**
#	Line 452 | Line 432 | public class ConcurrentSkipListSetTest e
432
433		Object e4 = q.ceiling(six);
434		assertNull(e4);
455	–
435		}
436
437		/**
438	<	* toArray contains all elements
438	>	* toArray contains all elements in sorted order
439		*/
440		public void testToArray() {
441		ConcurrentSkipListSet q = populatedSet(SIZE);
442	<	Object[] o = q.toArray();
443	<	Arrays.sort(o);
444	<	for (int i = 0; i < o.length; i++)
466	<	assertEquals(o[i], q.pollFirst());
442	>	Object[] o = q.toArray();
443	>	for (int i = 0; i < o.length; i++)
444	>	assertSame(o[i], q.pollFirst());
445		}
446
447		/**
448	<	* toArray(a) contains all elements
448	>	* toArray(a) contains all elements in sorted order
449		*/
450		public void testToArray2() {
451	<	ConcurrentSkipListSet q = populatedSet(SIZE);
452	<	Integer[] ints = new Integer[SIZE];
453	<	ints = (Integer[])q.toArray(ints);
454	<	Arrays.sort(ints);
451	>	ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
452	>	Integer[] ints = new Integer[SIZE];
453	>	Integer[] array = q.toArray(ints);
454	>	assertSame(ints, array);
455		for (int i = 0; i < ints.length; i++)
456	<	assertEquals(ints[i], q.pollFirst());
456	>	assertSame(ints[i], q.pollFirst());
457		}
458
459		/**
#	Line 484 | Line 462 | public class ConcurrentSkipListSetTest e
462		public void testIterator() {
463		ConcurrentSkipListSet q = populatedSet(SIZE);
464		int i = 0;
465	<	Iterator it = q.iterator();
465	>	Iterator it = q.iterator();
466		while (it.hasNext()) {
467		assertTrue(q.contains(it.next()));
468		++i;
#	Line 498 | Line 476 | public class ConcurrentSkipListSetTest e
476		public void testEmptyIterator() {
477		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
478		int i = 0;
479	<	Iterator it = q.iterator();
479	>	Iterator it = q.iterator();
480		while (it.hasNext()) {
481		assertTrue(q.contains(it.next()));
482		++i;
#	Line 509 | Line 487 | public class ConcurrentSkipListSetTest e
487		/**
488		* iterator.remove removes current element
489		*/
490	<	public void testIteratorRemove () {
490	>	public void testIteratorRemove() {
491		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
492		q.add(new Integer(2));
493		q.add(new Integer(1));
#	Line 540 | Line 518 | public class ConcurrentSkipListSetTest e
518		/**
519		* A deserialized serialized set has same elements
520		*/
521	<	public void testSerialization() {
521	>	public void testSerialization() throws Exception {
522		ConcurrentSkipListSet q = populatedSet(SIZE);
523	<	try {
524	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
525	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
526	<	out.writeObject(q);
527	<	out.close();
528	<
529	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
530	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
531	<	ConcurrentSkipListSet r = (ConcurrentSkipListSet)in.readObject();
532	<	assertEquals(q.size(), r.size());
533	<	while (!q.isEmpty())
556	<	assertEquals(q.pollFirst(), r.pollFirst());
557	<	} catch (Exception e) {
558	<	e.printStackTrace();
559	<	unexpectedException();
560	<	}
523	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
524	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
525	>	out.writeObject(q);
526	>	out.close();
527	>
528	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
529	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
530	>	ConcurrentSkipListSet r = (ConcurrentSkipListSet)in.readObject();
531	>	assertEquals(q.size(), r.size());
532	>	while (!q.isEmpty())
533	>	assertEquals(q.pollFirst(), r.pollFirst());
534		}
535
536		/**
#	Line 685 | Line 658 | public class ConcurrentSkipListSetTest e
658		/**
659		* Subsets of subsets subdivide correctly
660		*/
661	<	public void testRecursiveSubSets() {
662	<	int setSize = 1000;
663	<	Class cl = ConcurrentSkipListSet.class;
661	>	public void testRecursiveSubSets() throws Exception {
662	>	int setSize = expensiveTests ? 1000 : 100;
663	>	Class cl = ConcurrentSkipListSet.class;
664
665		NavigableSet<Integer> set = newSet(cl);
666		bs = new BitSet(setSize);
#	Line 704 | Line 677 | public class ConcurrentSkipListSetTest e
677		0, setSize - 1, true);
678		}
679
680	<	static NavigableSet<Integer> newSet(Class cl) {
681	<	NavigableSet<Integer> result = null;
709	<	try {
710	<	result = (NavigableSet<Integer>) cl.newInstance();
711	<	} catch (Exception e) {
712	<	fail();
713	<	}
680	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
681	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
682		assertEquals(result.size(), 0);
683		assertFalse(result.iterator().hasNext());
684		return result;
#	Line 773 | Line 741 | public class ConcurrentSkipListSetTest e
741		} else {
742		try {
743		set.add(element);
744	<	fail();
745	<	} catch (IllegalArgumentException e) {
778	<	// expected
779	<	}
744	>	shouldThrow();
745	>	} catch (IllegalArgumentException success) {}
746		}
747		}
748		}
#	Line 909 | Line 875 | public class ConcurrentSkipListSetTest e
875		// BitSet should support this! Test would run much faster
876		while (element >= min) {
877		if (bs.get(element))
878	<	return(element);
878	>	return element;
879		element--;
880		}
881		return -1;
#	Line 975 | Line 941 | public class ConcurrentSkipListSetTest e
941		assertEq(rs.last(),  -1);
942		try {
943		set.first();
944	<	fail();
945	<	} catch (NoSuchElementException e) {
980	<	// expected
981	<	}
944	>	shouldThrow();
945	>	} catch (NoSuchElementException success) {}
946		try {
947		set.last();
948	<	fail();
949	<	} catch (NoSuchElementException e) {
986	<	// expected
987	<	}
948	>	shouldThrow();
949	>	} catch (NoSuchElementException success) {}
950		}
951		}
952

Diff Legend

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