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.22 by jsr166, Fri May 27 19:21:27 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.*;
#	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);
#	Line 19 | Line 19 | public class ConcurrentSkipListSetTest e
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)));
#	Line 207 | Line 204 | public class ConcurrentSkipListSetTest e
204		shouldThrow();
205		} catch (NullPointerException success) {}
206		}
207	+
208		/**
209		* addAll of a collection with null elements throws NPE
210		*/
#	Line 218 | Line 216 | public class ConcurrentSkipListSetTest e
216		shouldThrow();
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 245 | Line 244 | public class ConcurrentSkipListSetTest e
244		assertFalse(q.addAll(Arrays.asList(empty)));
245		assertTrue(q.addAll(Arrays.asList(ints)));
246		for (int i = 0; i < SIZE; ++i)
247	<	assertEquals(new Integer(i), q.pollFirst());
247	>	assertEquals(i, q.pollFirst());
248		}
249
250		/**
#	Line 254 | 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());
259		}
#	Line 265 | 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());
270		}
271
273	–
272		/**
273		* remove(x) removes x and returns true if present
274		*/
275		public void testRemoveElement() {
276		ConcurrentSkipListSet q = populatedSet(SIZE);
277		for (int i = 1; i < SIZE; i+=2) {
278	<	assertTrue(q.remove(new Integer(i)));
278	>	assertTrue(q.contains(i));
279	>	assertTrue(q.remove(i));
280	>	assertFalse(q.contains(i));
281	>	assertTrue(q.contains(i-1));
282		}
283		for (int i = 0; i < SIZE; i+=2) {
284	<	assertTrue(q.remove(new Integer(i)));
285	<	assertFalse(q.remove(new Integer(i+1)));
284	>	assertTrue(q.contains(i));
285	>	assertTrue(q.remove(i));
286	>	assertFalse(q.contains(i));
287	>	assertFalse(q.remove(i+1));
288	>	assertFalse(q.contains(i+1));
289		}
290		assertTrue(q.isEmpty());
291		}
#	Line 361 | Line 365 | public class ConcurrentSkipListSetTest e
365		}
366		}
367
364	–
365	–
368		/**
369		* lower returns preceding element
370		*/
#	Line 379 | Line 381 | public class ConcurrentSkipListSetTest e
381
382		Object e4 = q.lower(zero);
383		assertNull(e4);
382	–
384		}
385
386		/**
#	Line 398 | Line 399 | public class ConcurrentSkipListSetTest e
399
400		Object e4 = q.higher(six);
401		assertNull(e4);
401	–
402		}
403
404		/**
#	Line 417 | Line 417 | public class ConcurrentSkipListSetTest e
417
418		Object e4 = q.floor(zero);
419		assertNull(e4);
420	–
420		}
421
422		/**
#	Line 436 | Line 435 | public class ConcurrentSkipListSetTest e
435
436		Object e4 = q.ceiling(six);
437		assertNull(e4);
439	–
438		}
439
440		/**
441	<	* toArray contains all elements
441	>	* toArray contains all elements in sorted order
442		*/
443		public void testToArray() {
444		ConcurrentSkipListSet q = populatedSet(SIZE);
445		Object[] o = q.toArray();
448	–	Arrays.sort(o);
446		for (int i = 0; i < o.length; i++)
447	<	assertEquals(o[i], q.pollFirst());
447	>	assertSame(o[i], q.pollFirst());
448		}
449
450		/**
451	<	* toArray(a) contains all elements
451	>	* toArray(a) contains all elements in sorted order
452		*/
453		public void testToArray2() {
454	<	ConcurrentSkipListSet q = populatedSet(SIZE);
454	>	ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
455		Integer[] ints = new Integer[SIZE];
456	<	ints = (Integer[])q.toArray(ints);
457	<	Arrays.sort(ints);
456	>	Integer[] array = q.toArray(ints);
457	>	assertSame(ints, array);
458		for (int i = 0; i < ints.length; i++)
459	<	assertEquals(ints[i], q.pollFirst());
459	>	assertSame(ints[i], q.pollFirst());
460		}
461
462		/**
#	Line 493 | Line 490 | public class ConcurrentSkipListSetTest e
490		/**
491		* iterator.remove removes current element
492		*/
493	<	public void testIteratorRemove () {
493	>	public void testIteratorRemove() {
494		final ConcurrentSkipListSet q = new ConcurrentSkipListSet();
495		q.add(new Integer(2));
496		q.add(new Integer(1));
#	Line 509 | Line 506 | public class ConcurrentSkipListSetTest e
506		assertFalse(it.hasNext());
507		}
508
512	–
509		/**
510		* toString contains toStrings of elements
511		*/
#	Line 517 | Line 513 | public class ConcurrentSkipListSetTest e
513		ConcurrentSkipListSet q = populatedSet(SIZE);
514		String s = q.toString();
515		for (int i = 0; i < SIZE; ++i) {
516	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
516	>	assertTrue(s.contains(String.valueOf(i)));
517		}
518		}
519
#	Line 664 | Line 660 | public class ConcurrentSkipListSetTest e
660		/**
661		* Subsets of subsets subdivide correctly
662		*/
663	<	public void testRecursiveSubSets() {
664	<	int setSize = 1000;
663	>	public void testRecursiveSubSets() throws Exception {
664	>	int setSize = expensiveTests ? 1000 : 100;
665		Class cl = ConcurrentSkipListSet.class;
666
667		NavigableSet<Integer> set = newSet(cl);
#	Line 683 | Line 679 | public class ConcurrentSkipListSetTest e
679		0, setSize - 1, true);
680		}
681
682	<	static NavigableSet<Integer> newSet(Class cl) {
683	<	NavigableSet<Integer> result = null;
688	<	try {
689	<	result = (NavigableSet<Integer>) cl.newInstance();
690	<	} catch (Exception e) {
691	<	fail();
692	<	}
682	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
683	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
684		assertEquals(result.size(), 0);
685		assertFalse(result.iterator().hasNext());
686		return result;
#	Line 752 | Line 743 | public class ConcurrentSkipListSetTest e
743		} else {
744		try {
745		set.add(element);
746	<	fail();
747	<	} catch (IllegalArgumentException e) {
757	<	// expected
758	<	}
746	>	shouldThrow();
747	>	} catch (IllegalArgumentException success) {}
748		}
749		}
750		}
#	Line 853 | Line 842 | public class ConcurrentSkipListSetTest e
842		*/
843		void check(NavigableSet<Integer> set,
844		final int min, final int max, final boolean ascending) {
845	<	class ReferenceSet {
845	>	class ReferenceSet {
846		int lower(int element) {
847		return ascending ?
848		lowerAscending(element) : higherAscending(element);
#	Line 888 | Line 877 | public class ConcurrentSkipListSetTest e
877		// BitSet should support this! Test would run much faster
878		while (element >= min) {
879		if (bs.get(element))
880	<	return(element);
880	>	return element;
881		element--;
882		}
883		return -1;
#	Line 954 | Line 943 | public class ConcurrentSkipListSetTest e
943		assertEq(rs.last(),  -1);
944		try {
945		set.first();
946	<	fail();
947	<	} catch (NoSuchElementException e) {
959	<	// expected
960	<	}
946	>	shouldThrow();
947	>	} catch (NoSuchElementException success) {}
948		try {
949		set.last();
950	<	fail();
951	<	} catch (NoSuchElementException e) {
965	<	// expected
966	<	}
950	>	shouldThrow();
951	>	} catch (NoSuchElementException success) {}
952		}
953		}
954

Diff Legend

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