ViewVC Help

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

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

Comparing jsr166/src/test/tck/TreeSubSetTest.java (file contents):
Revision 1.7 by jsr166, Fri Nov 20 06:47:13 2009 UTC vs.
Revision 1.8 by jsr166, Sat Nov 21 02:07:27 2009 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class TreeSubSetTest 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(TreeSubSetTest.class);
17	>	return new TestSuite(TreeSubSetTest.class);
18		}
19
20		static class MyReverseComparator implements Comparator {
#	Line 35 | Line 35 | public class TreeSubSetTest extends JSR1
35		TreeSet q = new TreeSet();
36		assertTrue(q.isEmpty());
37
38	<	for (int i = n-1; i >= 0; i-=2)
39	<	assertTrue(q.add(new Integer(i)));
40	<	for (int i = (n & 1); i < n; i+=2)
41	<	assertTrue(q.add(new Integer(i)));
38	>	for (int i = n-1; i >= 0; i-=2)
39	>	assertTrue(q.add(new Integer(i)));
40	>	for (int i = (n & 1); i < n; i+=2)
41	>	assertTrue(q.add(new Integer(i)));
42		assertTrue(q.add(new Integer(-n)));
43		assertTrue(q.add(new Integer(n)));
44		NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
45		assertFalse(s.isEmpty());
46	<	assertEquals(n, s.size());
46	>	assertEquals(n, s.size());
47		return s;
48		}
49
#	Line 61 | Line 61 | public class TreeSubSetTest extends JSR1
61		q.add(zero);
62		q.add(seven);
63		NavigableSet s = q.subSet(one, true, seven, false);
64	<	assertEquals(5, s.size());
64	>	assertEquals(5, s.size());
65		return s;
66		}
67
#	Line 74 | Line 74 | public class TreeSubSetTest extends JSR1
74		q.add(m4);
75		q.add(m5);
76		NavigableSet s = q.descendingSet();
77	<	assertEquals(5, s.size());
77	>	assertEquals(5, s.size());
78		return s;
79		}
80
81		private static NavigableSet set0() {
82	<	TreeSet set = new TreeSet();
82	>	TreeSet set = new TreeSet();
83		assertTrue(set.isEmpty());
84		return set.tailSet(m1, false);
85		}
86
87		private static NavigableSet dset0() {
88	<	TreeSet set = new TreeSet();
88	>	TreeSet set = new TreeSet();
89		assertTrue(set.isEmpty());
90		return set;
91		}
#	Line 131 | Line 131 | public class TreeSubSetTest extends JSR1
131		* add(null) throws NPE
132		*/
133		public void testAddNull() {
134	<	try {
134	>	try {
135		NavigableSet q = set0();
136		q.add(null);
137		shouldThrow();
#	Line 231 | Line 231 | public class TreeSubSetTest extends JSR1
231		for (int i = 0; i < SIZE; ++i) {
232		assertEquals(i, ((Integer)q.pollFirst()).intValue());
233		}
234	<	assertNull(q.pollFirst());
234	>	assertNull(q.pollFirst());
235		}
236
237		/**
#	Line 407 | Line 407 | public class TreeSubSetTest extends JSR1
407		*/
408		public void testToArray() {
409		NavigableSet q = populatedSet(SIZE);
410	<	Object[] o = q.toArray();
410	>	Object[] o = q.toArray();
411		Arrays.sort(o);
412	<	for (int i = 0; i < o.length; i++)
413	<	assertEquals(o[i], q.pollFirst());
412	>	for (int i = 0; i < o.length; i++)
413	>	assertEquals(o[i], q.pollFirst());
414		}
415
416		/**
#	Line 418 | Line 418 | public class TreeSubSetTest extends JSR1
418		*/
419		public void testToArray2() {
420		NavigableSet q = populatedSet(SIZE);
421	<	Integer[] ints = new Integer[SIZE];
422	<	ints = (Integer[])q.toArray(ints);
421	>	Integer[] ints = new Integer[SIZE];
422	>	ints = (Integer[])q.toArray(ints);
423		Arrays.sort(ints);
424		for (int i = 0; i < ints.length; i++)
425		assertEquals(ints[i], q.pollFirst());
#	Line 431 | Line 431 | public class TreeSubSetTest extends JSR1
431		public void testIterator() {
432		NavigableSet q = populatedSet(SIZE);
433		int i = 0;
434	<	Iterator it = q.iterator();
434	>	Iterator it = q.iterator();
435		while (it.hasNext()) {
436		assertTrue(q.contains(it.next()));
437		++i;
#	Line 445 | Line 445 | public class TreeSubSetTest extends JSR1
445		public void testEmptyIterator() {
446		NavigableSet q = set0();
447		int i = 0;
448	<	Iterator it = q.iterator();
448	>	Iterator it = q.iterator();
449		while (it.hasNext()) {
450		assertTrue(q.contains(it.next()));
451		++i;
#	Line 726 | Line 726 | public class TreeSubSetTest extends JSR1
726		for (int i = 0; i < SIZE; ++i) {
727		assertEquals(i, ((Integer)q.pollFirst()).intValue());
728		}
729	<	assertNull(q.pollFirst());
729	>	assertNull(q.pollFirst());
730		}
731
732		/**
#	Line 902 | Line 902 | public class TreeSubSetTest extends JSR1
902		*/
903		public void testDescendingToArray() {
904		NavigableSet q = populatedSet(SIZE);
905	<	Object[] o = q.toArray();
905	>	Object[] o = q.toArray();
906		Arrays.sort(o);
907	<	for (int i = 0; i < o.length; i++)
908	<	assertEquals(o[i], q.pollFirst());
907	>	for (int i = 0; i < o.length; i++)
908	>	assertEquals(o[i], q.pollFirst());
909		}
910
911		/**
#	Line 913 | Line 913 | public class TreeSubSetTest extends JSR1
913		*/
914		public void testDescendingToArray2() {
915		NavigableSet q = populatedSet(SIZE);
916	<	Integer[] ints = new Integer[SIZE];
917	<	ints = (Integer[])q.toArray(ints);
916	>	Integer[] ints = new Integer[SIZE];
917	>	ints = (Integer[])q.toArray(ints);
918		Arrays.sort(ints);
919		for (int i = 0; i < ints.length; i++)
920		assertEquals(ints[i], q.pollFirst());
#	Line 926 | Line 926 | public class TreeSubSetTest extends JSR1
926		public void testDescendingIterator() {
927		NavigableSet q = populatedSet(SIZE);
928		int i = 0;
929	<	Iterator it = q.iterator();
929	>	Iterator it = q.iterator();
930		while (it.hasNext()) {
931		assertTrue(q.contains(it.next()));
932		++i;
#	Line 940 | Line 940 | public class TreeSubSetTest extends JSR1
940		public void testDescendingEmptyIterator() {
941		NavigableSet q = dset0();
942		int i = 0;
943	<	Iterator it = q.iterator();
943	>	Iterator it = q.iterator();
944		while (it.hasNext()) {
945		assertTrue(q.contains(it.next()));
946		++i;

Diff Legend

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