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.12 by jsr166, Tue Dec 1 09:48:13 2009 UTC

#	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 212 | Line 208 | public class ConcurrentSkipListSubSetTes
208		* Set contains all elements of successful addAll
209		*/
210		public void testAddAll5() {
211	<	try {
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)
224	<	assertEquals(new Integer(i), q.pollFirst());
225	<	}
226	<	finally {}
211	>	Integer[] empty = new Integer[0];
212	>	Integer[] ints = new Integer[SIZE];
213	>	for (int i = 0; i < SIZE; ++i)
214	>	ints[i] = new Integer(SIZE-1- i);
215	>	NavigableSet q = set0();
216	>	assertFalse(q.addAll(Arrays.asList(empty)));
217	>	assertTrue(q.addAll(Arrays.asList(ints)));
218	>	for (int i = 0; i < SIZE; ++i)
219	>	assertEquals(new Integer(i), q.pollFirst());
220		}
221
222		/**
#	Line 232 | Line 225 | public class ConcurrentSkipListSubSetTes
225		public void testPoll() {
226		NavigableSet q = populatedSet(SIZE);
227		for (int i = 0; i < SIZE; ++i) {
228	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
228	>	assertEquals(i, q.pollFirst());
229		}
230		assertNull(q.pollFirst());
231		}
#	Line 345 | Line 338 | public class ConcurrentSkipListSubSetTes
338
339		Object e4 = q.lower(zero);
340		assertNull(e4);
348	–
341		}
342
343		/**
#	Line 364 | Line 356 | public class ConcurrentSkipListSubSetTes
356
357		Object e4 = q.higher(six);
358		assertNull(e4);
367	–
359		}
360
361		/**
#	Line 383 | Line 374 | public class ConcurrentSkipListSubSetTes
374
375		Object e4 = q.floor(zero);
376		assertNull(e4);
386	–
377		}
378
379		/**
#	Line 402 | Line 392 | public class ConcurrentSkipListSubSetTes
392
393		Object e4 = q.ceiling(six);
394		assertNull(e4);
405	–
395		}
396
397		/**
#	Line 721 | Line 710 | public class ConcurrentSkipListSubSetTes
710		* Set contains all elements of successful addAll
711		*/
712		public void testDescendingAddAll5() {
713	<	try {
714	<	Integer[] empty = new Integer[0];
715	<	Integer[] ints = new Integer[SIZE];
716	<	for (int i = 0; i < SIZE; ++i)
717	<	ints[i] = new Integer(SIZE-1- i);
718	<	NavigableSet q = dset0();
719	<	assertFalse(q.addAll(Arrays.asList(empty)));
720	<	assertTrue(q.addAll(Arrays.asList(ints)));
721	<	for (int i = 0; i < SIZE; ++i)
733	<	assertEquals(new Integer(i), q.pollFirst());
734	<	}
735	<	finally {}
713	>	Integer[] empty = new Integer[0];
714	>	Integer[] ints = new Integer[SIZE];
715	>	for (int i = 0; i < SIZE; ++i)
716	>	ints[i] = new Integer(SIZE-1- i);
717	>	NavigableSet q = dset0();
718	>	assertFalse(q.addAll(Arrays.asList(empty)));
719	>	assertTrue(q.addAll(Arrays.asList(ints)));
720	>	for (int i = 0; i < SIZE; ++i)
721	>	assertEquals(new Integer(i), q.pollFirst());
722		}
723
724		/**
#	Line 741 | Line 727 | public class ConcurrentSkipListSubSetTes
727		public void testDescendingPoll() {
728		NavigableSet q = populatedSet(SIZE);
729		for (int i = 0; i < SIZE; ++i) {
730	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
730	>	assertEquals(i, q.pollFirst());
731		}
732		assertNull(q.pollFirst());
733		}
#	Line 854 | Line 840 | public class ConcurrentSkipListSubSetTes
840
841		Object e4 = q.lower(zero);
842		assertNull(e4);
857	–
843		}
844
845		/**
#	Line 873 | Line 858 | public class ConcurrentSkipListSubSetTes
858
859		Object e4 = q.higher(m6);
860		assertNull(e4);
876	–
861		}
862
863		/**
#	Line 892 | Line 876 | public class ConcurrentSkipListSubSetTes
876
877		Object e4 = q.floor(zero);
878		assertNull(e4);
895	–
879		}
880
881		/**
#	Line 911 | Line 894 | public class ConcurrentSkipListSubSetTes
894
895		Object e4 = q.ceiling(m6);
896		assertNull(e4);
914	–
897		}
898
899		/**

Diff Legend

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