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.9 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.19 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 ConcurrentSkipListSubSetTest 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(ConcurrentSkipListSubSetTest.class);
#	Line 19 | Line 19 | public class ConcurrentSkipListSubSetTes
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 ConcurrentSkipListSubSetTes
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private NavigableSet populatedSet(int n) {
31	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
30	>	private NavigableSet<Integer> populatedSet(int n) {
31	>	ConcurrentSkipListSet<Integer> q =
32	>	new ConcurrentSkipListSet<Integer>();
33		assertTrue(q.isEmpty());
34
35		for (int i = n-1; i >= 0; i-=2)
#	Line 100 | Line 97 | public class ConcurrentSkipListSubSetTes
97		assertEquals(0, set0().size());
98		}
99
103	–
100		/**
101		* isEmpty is true before add, false after
102		*/
#	Line 171 | Line 167 | public class ConcurrentSkipListSubSetTes
167		} catch (ClassCastException success) {}
168		}
169
174	–
170		/**
171		* addAll(null) throws NPE
172		*/
#	Line 182 | Line 177 | public class ConcurrentSkipListSubSetTes
177		shouldThrow();
178		} catch (NullPointerException success) {}
179		}
180	+
181		/**
182		* addAll of a collection with null elements throws NPE
183		*/
#	Line 193 | Line 189 | public class ConcurrentSkipListSubSetTes
189		shouldThrow();
190		} catch (NullPointerException success) {}
191		}
192	+
193		/**
194		* addAll of a collection with any null elements throws NPE after
195		* possibly adding some elements
#	Line 212 | Line 209 | public class ConcurrentSkipListSubSetTes
209		* Set contains all elements of successful addAll
210		*/
211		public void testAddAll5() {
212	<	try {
213	<	Integer[] empty = new Integer[0];
214	<	Integer[] ints = new Integer[SIZE];
215	<	for (int i = 0; i < SIZE; ++i)
216	<	ints[i] = new Integer(SIZE-1- i);
217	<	NavigableSet q = set0();
218	<	assertFalse(q.addAll(Arrays.asList(empty)));
219	<	assertTrue(q.addAll(Arrays.asList(ints)));
220	<	for (int i = 0; i < SIZE; ++i)
224	<	assertEquals(new Integer(i), q.pollFirst());
225	<	}
226	<	finally {}
212	>	Integer[] empty = new Integer[0];
213	>	Integer[] ints = new Integer[SIZE];
214	>	for (int i = 0; i < SIZE; ++i)
215	>	ints[i] = new Integer(SIZE-1- i);
216	>	NavigableSet q = set0();
217	>	assertFalse(q.addAll(Arrays.asList(empty)));
218	>	assertTrue(q.addAll(Arrays.asList(ints)));
219	>	for (int i = 0; i < SIZE; ++i)
220	>	assertEquals(new Integer(i), q.pollFirst());
221		}
222
223		/**
#	Line 232 | Line 226 | public class ConcurrentSkipListSubSetTes
226		public void testPoll() {
227		NavigableSet q = populatedSet(SIZE);
228		for (int i = 0; i < SIZE; ++i) {
229	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
229	>	assertEquals(i, q.pollFirst());
230		}
231		assertNull(q.pollFirst());
232		}
#	Line 243 | Line 237 | public class ConcurrentSkipListSubSetTes
237		public void testRemoveElement() {
238		NavigableSet q = populatedSet(SIZE);
239		for (int i = 1; i < SIZE; i+=2) {
240	<	assertTrue(q.remove(new Integer(i)));
240	>	assertTrue(q.contains(i));
241	>	assertTrue(q.remove(i));
242	>	assertFalse(q.contains(i));
243	>	assertTrue(q.contains(i-1));
244		}
245		for (int i = 0; i < SIZE; i+=2) {
246	<	assertTrue(q.remove(new Integer(i)));
247	<	assertFalse(q.remove(new Integer(i+1)));
246	>	assertTrue(q.contains(i));
247	>	assertTrue(q.remove(i));
248	>	assertFalse(q.contains(i));
249	>	assertFalse(q.remove(i+1));
250	>	assertFalse(q.contains(i+1));
251		}
252		assertTrue(q.isEmpty());
253		}
#	Line 327 | Line 327 | public class ConcurrentSkipListSubSetTes
327		}
328		}
329
330	–
331	–
330		/**
331		* lower returns preceding element
332		*/
#	Line 345 | Line 343 | public class ConcurrentSkipListSubSetTes
343
344		Object e4 = q.lower(zero);
345		assertNull(e4);
348	–
346		}
347
348		/**
#	Line 364 | Line 361 | public class ConcurrentSkipListSubSetTes
361
362		Object e4 = q.higher(six);
363		assertNull(e4);
367	–
364		}
365
366		/**
#	Line 383 | Line 379 | public class ConcurrentSkipListSubSetTes
379
380		Object e4 = q.floor(zero);
381		assertNull(e4);
386	–
382		}
383
384		/**
#	Line 402 | Line 397 | public class ConcurrentSkipListSubSetTes
397
398		Object e4 = q.ceiling(six);
399		assertNull(e4);
405	–
400		}
401
402		/**
403	<	* toArray contains all elements
403	>	* toArray contains all elements in sorted order
404		*/
405		public void testToArray() {
406		NavigableSet q = populatedSet(SIZE);
407		Object[] o = q.toArray();
414	–	Arrays.sort(o);
408		for (int i = 0; i < o.length; i++)
409	<	assertEquals(o[i], q.pollFirst());
409	>	assertSame(o[i], q.pollFirst());
410		}
411
412		/**
413	<	* toArray(a) contains all elements
413	>	* toArray(a) contains all elements in sorted order
414		*/
415		public void testToArray2() {
416	<	NavigableSet q = populatedSet(SIZE);
416	>	NavigableSet<Integer> q = populatedSet(SIZE);
417		Integer[] ints = new Integer[SIZE];
418	<	ints = (Integer[])q.toArray(ints);
419	<	Arrays.sort(ints);
418	>	Integer[] array = q.toArray(ints);
419	>	assertSame(ints, array);
420		for (int i = 0; i < ints.length; i++)
421	<	assertEquals(ints[i], q.pollFirst());
421	>	assertSame(ints[i], q.pollFirst());
422		}
423
424		/**
#	Line 459 | Line 452 | public class ConcurrentSkipListSubSetTes
452		/**
453		* iterator.remove removes current element
454		*/
455	<	public void testIteratorRemove () {
455	>	public void testIteratorRemove() {
456		final NavigableSet q = set0();
457		q.add(new Integer(2));
458		q.add(new Integer(1));
#	Line 475 | Line 468 | public class ConcurrentSkipListSubSetTes
468		assertFalse(it.hasNext());
469		}
470
478	–
471		/**
472		* toString contains toStrings of elements
473		*/
#	Line 483 | Line 475 | public class ConcurrentSkipListSubSetTes
475		NavigableSet q = populatedSet(SIZE);
476		String s = q.toString();
477		for (int i = 0; i < SIZE; ++i) {
478	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
478	>	assertTrue(s.contains(String.valueOf(i)));
479		}
480		}
481
#	Line 680 | Line 672 | public class ConcurrentSkipListSubSetTes
672		} catch (ClassCastException success) {}
673		}
674
683	–
675		/**
676		* addAll(null) throws NPE
677		*/
#	Line 691 | Line 682 | public class ConcurrentSkipListSubSetTes
682		shouldThrow();
683		} catch (NullPointerException success) {}
684		}
685	+
686		/**
687		* addAll of a collection with null elements throws NPE
688		*/
#	Line 702 | Line 694 | public class ConcurrentSkipListSubSetTes
694		shouldThrow();
695		} catch (NullPointerException success) {}
696		}
697	+
698		/**
699		* addAll of a collection with any null elements throws NPE after
700		* possibly adding some elements
#	Line 721 | Line 714 | public class ConcurrentSkipListSubSetTes
714		* Set contains all elements of successful addAll
715		*/
716		public void testDescendingAddAll5() {
717	<	try {
718	<	Integer[] empty = new Integer[0];
719	<	Integer[] ints = new Integer[SIZE];
720	<	for (int i = 0; i < SIZE; ++i)
721	<	ints[i] = new Integer(SIZE-1- i);
722	<	NavigableSet q = dset0();
723	<	assertFalse(q.addAll(Arrays.asList(empty)));
724	<	assertTrue(q.addAll(Arrays.asList(ints)));
725	<	for (int i = 0; i < SIZE; ++i)
733	<	assertEquals(new Integer(i), q.pollFirst());
734	<	}
735	<	finally {}
717	>	Integer[] empty = new Integer[0];
718	>	Integer[] ints = new Integer[SIZE];
719	>	for (int i = 0; i < SIZE; ++i)
720	>	ints[i] = new Integer(SIZE-1- i);
721	>	NavigableSet q = dset0();
722	>	assertFalse(q.addAll(Arrays.asList(empty)));
723	>	assertTrue(q.addAll(Arrays.asList(ints)));
724	>	for (int i = 0; i < SIZE; ++i)
725	>	assertEquals(new Integer(i), q.pollFirst());
726		}
727
728		/**
#	Line 741 | Line 731 | public class ConcurrentSkipListSubSetTes
731		public void testDescendingPoll() {
732		NavigableSet q = populatedSet(SIZE);
733		for (int i = 0; i < SIZE; ++i) {
734	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
734	>	assertEquals(i, q.pollFirst());
735		}
736		assertNull(q.pollFirst());
737		}
#	Line 836 | Line 826 | public class ConcurrentSkipListSubSetTes
826		}
827		}
828
839	–
840	–
829		/**
830		* lower returns preceding element
831		*/
#	Line 854 | Line 842 | public class ConcurrentSkipListSubSetTes
842
843		Object e4 = q.lower(zero);
844		assertNull(e4);
857	–
845		}
846
847		/**
#	Line 873 | Line 860 | public class ConcurrentSkipListSubSetTes
860
861		Object e4 = q.higher(m6);
862		assertNull(e4);
876	–
863		}
864
865		/**
#	Line 892 | Line 878 | public class ConcurrentSkipListSubSetTes
878
879		Object e4 = q.floor(zero);
880		assertNull(e4);
895	–
881		}
882
883		/**
#	Line 911 | Line 896 | public class ConcurrentSkipListSubSetTes
896
897		Object e4 = q.ceiling(m6);
898		assertNull(e4);
914	–
899		}
900
901		/**
#	Line 931 | Line 915 | public class ConcurrentSkipListSubSetTes
915		public void testDescendingToArray2() {
916		NavigableSet q = populatedSet(SIZE);
917		Integer[] ints = new Integer[SIZE];
918	<	ints = (Integer[])q.toArray(ints);
918	>	assertSame(ints, q.toArray(ints));
919		Arrays.sort(ints);
920		for (int i = 0; i < ints.length; i++)
921		assertEquals(ints[i], q.pollFirst());
#	Line 968 | Line 952 | public class ConcurrentSkipListSubSetTes
952		/**
953		* iterator.remove removes current element
954		*/
955	<	public void testDescendingIteratorRemove () {
955	>	public void testDescendingIteratorRemove() {
956		final NavigableSet q = dset0();
957		q.add(new Integer(2));
958		q.add(new Integer(1));
#	Line 984 | Line 968 | public class ConcurrentSkipListSubSetTes
968		assertFalse(it.hasNext());
969		}
970
987	–
971		/**
972		* toString contains toStrings of elements
973		*/
#	Line 992 | Line 975 | public class ConcurrentSkipListSubSetTes
975		NavigableSet q = populatedSet(SIZE);
976		String s = q.toString();
977		for (int i = 0; i < SIZE; ++i) {
978	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
978	>	assertTrue(s.contains(String.valueOf(i)));
979		}
980		}
981

Diff Legend

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