ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/TreeSetTest.java

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.37 by jsr166, Sat Feb 28 20:13:46 2015 UTC vs.
Revision 1.42 by jsr166, Sun May 24 01:42:14 2015 UTC

#	Line 21 | Line 21 | import junit.framework.TestSuite;
21
22		public class TreeSetTest extends JSR166TestCase {
23		public static void main(String[] args) {
24	<	junit.textui.TestRunner.run(suite());
24	>	main(suite(), args);
25		}
26		public static Test suite() {
27		return new TestSuite(TreeSetTest.class);
#	Line 45 | Line 45 | public class TreeSetTest extends JSR166T
45		private TreeSet<Integer> populatedSet(int n) {
46		TreeSet<Integer> q = new TreeSet<Integer>();
47		assertTrue(q.isEmpty());
48	<	for (int i = n-1; i >= 0; i -= 2)
48	>	for (int i = n - 1; i >= 0; i -= 2)
49		assertTrue(q.add(new Integer(i)));
50		for (int i = (n & 1); i < n; i += 2)
51		assertTrue(q.add(new Integer(i)));
#	Line 91 | Line 91 | public class TreeSetTest extends JSR166T
91		*/
92		public void testConstructor4() {
93		try {
94	<	Integer[] ints = new Integer[SIZE];
95	<	new TreeSet(Arrays.asList(ints));
94	>	new TreeSet(Arrays.asList(new Integer[SIZE]));
95		shouldThrow();
96		} catch (NullPointerException success) {}
97		}
#	Line 101 | Line 100 | public class TreeSetTest extends JSR166T
100		* Initializing from Collection with some null elements throws NPE
101		*/
102		public void testConstructor5() {
103	+	Integer[] ints = new Integer[SIZE];
104	+	for (int i = 0; i < SIZE - 1; ++i)
105	+	ints[i] = new Integer(i);
106		try {
105	–	Integer[] ints = new Integer[SIZE];
106	–	for (int i = 0; i < SIZE-1; ++i)
107	–	ints[i] = new Integer(i);
107		new TreeSet(Arrays.asList(ints));
108		shouldThrow();
109		} catch (NullPointerException success) {}
#	Line 133 | Line 132 | public class TreeSetTest extends JSR166T
132		for (int i = 0; i < SIZE; ++i)
133		ints[i] = new Integer(i);
134		q.addAll(Arrays.asList(ints));
135	<	for (int i = SIZE-1; i >= 0; --i)
135	>	for (int i = SIZE - 1; i >= 0; --i)
136		assertEquals(ints[i], q.pollFirst());
137		}
138
#	Line 157 | Line 156 | public class TreeSetTest extends JSR166T
156		public void testSize() {
157		TreeSet q = populatedSet(SIZE);
158		for (int i = 0; i < SIZE; ++i) {
159	<	assertEquals(SIZE-i, q.size());
159	>	assertEquals(SIZE - i, q.size());
160		q.pollFirst();
161		}
162		for (int i = 0; i < SIZE; ++i) {
#	Line 237 | Line 236 | public class TreeSetTest extends JSR166T
236		public void testAddAll3() {
237		TreeSet q = new TreeSet();
238		Integer[] ints = new Integer[SIZE];
239	<	for (int i = 0; i < SIZE-1; ++i)
239	>	for (int i = 0; i < SIZE - 1; ++i)
240		ints[i] = new Integer(i);
241		try {
242		q.addAll(Arrays.asList(ints));
#	Line 252 | Line 251 | public class TreeSetTest extends JSR166T
251		Integer[] empty = new Integer[0];
252		Integer[] ints = new Integer[SIZE];
253		for (int i = 0; i < SIZE; ++i)
254	<	ints[i] = new Integer(SIZE-1-i);
254	>	ints[i] = new Integer(SIZE - 1 - i);
255		TreeSet q = new TreeSet();
256		assertFalse(q.addAll(Arrays.asList(empty)));
257		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 276 | Line 275 | public class TreeSetTest extends JSR166T
275		*/
276		public void testPollLast() {
277		TreeSet q = populatedSet(SIZE);
278	<	for (int i = SIZE-1; i >= 0; --i) {
278	>	for (int i = SIZE - 1; i >= 0; --i) {
279		assertEquals(i, q.pollLast());
280		}
281		assertNull(q.pollFirst());
#	Line 291 | Line 290 | public class TreeSetTest extends JSR166T
290		assertTrue(q.contains(i));
291		assertTrue(q.remove(i));
292		assertFalse(q.contains(i));
293	<	assertTrue(q.contains(i-1));
293	>	assertTrue(q.contains(i - 1));
294		}
295		for (int i = 0; i < SIZE; i += 2) {
296		assertTrue(q.contains(i));
297		assertTrue(q.remove(i));
298		assertFalse(q.contains(i));
299	<	assertFalse(q.remove(i+1));
300	<	assertFalse(q.contains(i+1));
299	>	assertFalse(q.remove(i + 1));
300	>	assertFalse(q.contains(i + 1));
301		}
302		assertTrue(q.isEmpty());
303		}
#	Line 357 | Line 356 | public class TreeSetTest extends JSR166T
356		assertTrue(changed);
357
358		assertTrue(q.containsAll(p));
359	<	assertEquals(SIZE-i, q.size());
359	>	assertEquals(SIZE - i, q.size());
360		p.pollFirst();
361		}
362		}
#	Line 370 | Line 369 | public class TreeSetTest extends JSR166T
369		TreeSet q = populatedSet(SIZE);
370		TreeSet p = populatedSet(i);
371		assertTrue(q.removeAll(p));
372	<	assertEquals(SIZE-i, q.size());
372	>	assertEquals(SIZE - i, q.size());
373		for (int j = 0; j < i; ++j) {
374		Integer x = (Integer)(p.pollFirst());
375		assertFalse(q.contains(x));
#	Line 904 | Line 903 | public class TreeSetTest extends JSR166T
903		else if (element > max)
904		return -1;
905		int result = bs.nextSetBit(element);
906	<	return result > max ? -1 : result;
906	>	return (result > max) ? -1 : result;
907		}
908		int higherAscending(int element) {
909		return ceilingAscending(element + 1);
910		}
911		private int firstAscending() {
912		int result = ceilingAscending(min);
913	<	return result > max ? -1 : result;
913	>	return (result > max) ? -1 : result;
914		}
915		private int lastAscending() {
916		int result = floorAscending(max);
917	<	return result < min ? -1 : result;
917	>	return (result < min) ? -1 : result;
918		}
919		}
920		ReferenceSet rs = new ReferenceSet();
#	Line 976 | Line 975 | public class TreeSetTest extends JSR166T
975		}
976
977		static boolean eq(Integer i, int j) {
978	<	return i == null ? j == -1 : i == j;
978	>	return (i == null) ? j == -1 : i == j;
979		}
980
981		}

Diff Legend

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