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.18 by jsr166, Tue Mar 15 19:47:07 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 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 {
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 TreeSubSetTest extends JSR1
27		* Create a set of given size containing consecutive
28		* Integers 0 ... n.
29		*/
30	<	private NavigableSet populatedSet(int n) {
31	<	TreeSet q = new TreeSet();
30	>	private NavigableSet<Integer> populatedSet(int n) {
31	>	TreeSet<Integer> q = new TreeSet<Integer>();
32		assertTrue(q.isEmpty());
33
34	<	for (int i = n-1; i >= 0; i-=2)
35	<	assertTrue(q.add(new Integer(i)));
36	<	for (int i = (n & 1); i < n; i+=2)
37	<	assertTrue(q.add(new Integer(i)));
34	>	for (int i = n-1; i >= 0; i-=2)
35	>	assertTrue(q.add(new Integer(i)));
36	>	for (int i = (n & 1); i < n; i+=2)
37	>	assertTrue(q.add(new Integer(i)));
38		assertTrue(q.add(new Integer(-n)));
39		assertTrue(q.add(new Integer(n)));
40		NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
41		assertFalse(s.isEmpty());
42	<	assertEquals(n, s.size());
42	>	assertEquals(n, s.size());
43		return s;
44		}
45
#	Line 61 | Line 57 | public class TreeSubSetTest extends JSR1
57		q.add(zero);
58		q.add(seven);
59		NavigableSet s = q.subSet(one, true, seven, false);
60	<	assertEquals(5, s.size());
60	>	assertEquals(5, s.size());
61		return s;
62		}
63
#	Line 74 | Line 70 | public class TreeSubSetTest extends JSR1
70		q.add(m4);
71		q.add(m5);
72		NavigableSet s = q.descendingSet();
73	<	assertEquals(5, s.size());
73	>	assertEquals(5, s.size());
74		return s;
75		}
76
77		private static NavigableSet set0() {
78	<	TreeSet set = new TreeSet();
78	>	TreeSet set = new TreeSet();
79		assertTrue(set.isEmpty());
80		return set.tailSet(m1, false);
81		}
82
83		private static NavigableSet dset0() {
84	<	TreeSet set = new TreeSet();
84	>	TreeSet set = new TreeSet();
85		assertTrue(set.isEmpty());
86		return set;
87		}
#	Line 104 | Line 100 | public class TreeSubSetTest extends JSR1
100		public void testEmpty() {
101		NavigableSet q = set0();
102		assertTrue(q.isEmpty());
103	<	q.add(new Integer(1));
103	>	assertTrue(q.add(new Integer(1)));
104		assertFalse(q.isEmpty());
105	<	q.add(new Integer(2));
105	>	assertTrue(q.add(new Integer(2)));
106		q.pollFirst();
107		q.pollFirst();
108		assertTrue(q.isEmpty());
#	Line 131 | Line 127 | public class TreeSubSetTest extends JSR1
127		* add(null) throws NPE
128		*/
129		public void testAddNull() {
130	<	try {
130	>	try {
131		NavigableSet q = set0();
132		q.add(null);
133		shouldThrow();
#	Line 179 | Line 175 | public class TreeSubSetTest extends JSR1
175		shouldThrow();
176		} catch (NullPointerException success) {}
177		}
178	+
179		/**
180		* addAll of a collection with null elements throws NPE
181		*/
#	Line 190 | Line 187 | public class TreeSubSetTest extends JSR1
187		shouldThrow();
188		} catch (NullPointerException success) {}
189		}
190	+
191		/**
192		* addAll of a collection with any null elements throws NPE after
193		* possibly adding some elements
#	Line 209 | Line 207 | public class TreeSubSetTest extends JSR1
207		* Set contains all elements of successful addAll
208		*/
209		public void testAddAll5() {
210	<	try {
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)
221	<	assertEquals(new Integer(i), q.pollFirst());
222	<	}
223	<	finally {}
210	>	Integer[] empty = new Integer[0];
211	>	Integer[] ints = new Integer[SIZE];
212	>	for (int i = 0; i < SIZE; ++i)
213	>	ints[i] = new Integer(SIZE-1- i);
214	>	NavigableSet q = set0();
215	>	assertFalse(q.addAll(Arrays.asList(empty)));
216	>	assertTrue(q.addAll(Arrays.asList(ints)));
217	>	for (int i = 0; i < SIZE; ++i)
218	>	assertEquals(new Integer(i), q.pollFirst());
219		}
220
221		/**
#	Line 229 | Line 224 | public class TreeSubSetTest extends JSR1
224		public void testPoll() {
225		NavigableSet q = populatedSet(SIZE);
226		for (int i = 0; i < SIZE; ++i) {
227	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
227	>	assertEquals(i, q.pollFirst());
228		}
229	<	assertNull(q.pollFirst());
229	>	assertNull(q.pollFirst());
230		}
231
232		/**
#	Line 240 | Line 235 | public class TreeSubSetTest extends JSR1
235		public void testRemoveElement() {
236		NavigableSet q = populatedSet(SIZE);
237		for (int i = 1; i < SIZE; i+=2) {
238	<	assertTrue(q.remove(new Integer(i)));
238	>	assertTrue(q.contains(i));
239	>	assertTrue(q.remove(i));
240	>	assertFalse(q.contains(i));
241	>	assertTrue(q.contains(i-1));
242		}
243		for (int i = 0; i < SIZE; i+=2) {
244	<	assertTrue(q.remove(new Integer(i)));
245	<	assertFalse(q.remove(new Integer(i+1)));
244	>	assertTrue(q.contains(i));
245	>	assertTrue(q.remove(i));
246	>	assertFalse(q.contains(i));
247	>	assertFalse(q.remove(i+1));
248	>	assertFalse(q.contains(i+1));
249		}
250		assertTrue(q.isEmpty());
251		}
#	Line 269 | Line 270 | public class TreeSubSetTest extends JSR1
270		q.clear();
271		assertTrue(q.isEmpty());
272		assertEquals(0, q.size());
273	<	q.add(new Integer(1));
273	>	assertTrue(q.add(new Integer(1)));
274		assertFalse(q.isEmpty());
275		q.clear();
276		assertTrue(q.isEmpty());
#	Line 342 | Line 343 | public class TreeSubSetTest extends JSR1
343
344		Object e4 = q.lower(zero);
345		assertNull(e4);
345	–
346		}
347
348		/**
#	Line 361 | Line 361 | public class TreeSubSetTest extends JSR1
361
362		Object e4 = q.higher(six);
363		assertNull(e4);
364	–
364		}
365
366		/**
#	Line 380 | Line 379 | public class TreeSubSetTest extends JSR1
379
380		Object e4 = q.floor(zero);
381		assertNull(e4);
383	–
382		}
383
384		/**
#	Line 399 | Line 397 | public class TreeSubSetTest extends JSR1
397
398		Object e4 = q.ceiling(six);
399		assertNull(e4);
402	–
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();
408	<	Arrays.sort(o);
409	<	for (int i = 0; i < o.length; i++)
413	<	assertEquals(o[i], q.pollFirst());
407	>	Object[] o = q.toArray();
408	>	for (int i = 0; i < o.length; i++)
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);
417	<	Integer[] ints = new Integer[SIZE];
418	<	ints = (Integer[])q.toArray(ints);
419	<	Arrays.sort(ints);
416	>	NavigableSet<Integer> q = populatedSet(SIZE);
417	>	Integer[] ints = new Integer[SIZE];
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 431 | Line 427 | public class TreeSubSetTest extends JSR1
427		public void testIterator() {
428		NavigableSet q = populatedSet(SIZE);
429		int i = 0;
430	<	Iterator it = q.iterator();
430	>	Iterator it = q.iterator();
431		while (it.hasNext()) {
432		assertTrue(q.contains(it.next()));
433		++i;
#	Line 445 | Line 441 | public class TreeSubSetTest extends JSR1
441		public void testEmptyIterator() {
442		NavigableSet q = set0();
443		int i = 0;
444	<	Iterator it = q.iterator();
444	>	Iterator it = q.iterator();
445		while (it.hasNext()) {
446		assertTrue(q.contains(it.next()));
447		++i;
#	Line 456 | Line 452 | public class TreeSubSetTest extends JSR1
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 467 | Line 463 | public class TreeSubSetTest extends JSR1
463		it.remove();
464
465		it = q.iterator();
466	<	assertEquals(it.next(), new Integer(2));
467	<	assertEquals(it.next(), new Integer(3));
466	>	assertEquals(it.next(), 2);
467	>	assertEquals(it.next(), 3);
468		assertFalse(it.hasNext());
469		}
470
#	Line 677 | Line 673 | public class TreeSubSetTest extends JSR1
673		shouldThrow();
674		} catch (NullPointerException success) {}
675		}
676	+
677		/**
678		* addAll of a collection with null elements throws NPE
679		*/
#	Line 688 | Line 685 | public class TreeSubSetTest extends JSR1
685		shouldThrow();
686		} catch (NullPointerException success) {}
687		}
688	+
689		/**
690		* addAll of a collection with any null elements throws NPE after
691		* possibly adding some elements
#	Line 724 | Line 722 | public class TreeSubSetTest extends JSR1
722		public void testDescendingPoll() {
723		NavigableSet q = populatedSet(SIZE);
724		for (int i = 0; i < SIZE; ++i) {
725	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
725	>	assertEquals(i, q.pollFirst());
726		}
727	<	assertNull(q.pollFirst());
727	>	assertNull(q.pollFirst());
728		}
729
730		/**
#	Line 764 | Line 762 | public class TreeSubSetTest extends JSR1
762		q.clear();
763		assertTrue(q.isEmpty());
764		assertEquals(0, q.size());
765	<	q.add(new Integer(1));
765	>	assertTrue(q.add(new Integer(1)));
766		assertFalse(q.isEmpty());
767		q.clear();
768		assertTrue(q.isEmpty());
#	Line 837 | Line 835 | public class TreeSubSetTest extends JSR1
835
836		Object e4 = q.lower(zero);
837		assertNull(e4);
840	–
838		}
839
840		/**
#	Line 856 | Line 853 | public class TreeSubSetTest extends JSR1
853
854		Object e4 = q.higher(m6);
855		assertNull(e4);
859	–
856		}
857
858		/**
#	Line 875 | Line 871 | public class TreeSubSetTest extends JSR1
871
872		Object e4 = q.floor(zero);
873		assertNull(e4);
878	–
874		}
875
876		/**
#	Line 894 | Line 889 | public class TreeSubSetTest extends JSR1
889
890		Object e4 = q.ceiling(m6);
891		assertNull(e4);
897	–
892		}
893
894		/**
#	Line 902 | Line 896 | public class TreeSubSetTest extends JSR1
896		*/
897		public void testDescendingToArray() {
898		NavigableSet q = populatedSet(SIZE);
899	<	Object[] o = q.toArray();
899	>	Object[] o = q.toArray();
900		Arrays.sort(o);
901	<	for (int i = 0; i < o.length; i++)
902	<	assertEquals(o[i], q.pollFirst());
901	>	for (int i = 0; i < o.length; i++)
902	>	assertEquals(o[i], q.pollFirst());
903		}
904
905		/**
#	Line 913 | Line 907 | public class TreeSubSetTest extends JSR1
907		*/
908		public void testDescendingToArray2() {
909		NavigableSet q = populatedSet(SIZE);
910	<	Integer[] ints = new Integer[SIZE];
911	<	ints = (Integer[])q.toArray(ints);
910	>	Integer[] ints = new Integer[SIZE];
911	>	assertSame(ints, q.toArray(ints));
912		Arrays.sort(ints);
913		for (int i = 0; i < ints.length; i++)
914		assertEquals(ints[i], q.pollFirst());
#	Line 926 | Line 920 | public class TreeSubSetTest extends JSR1
920		public void testDescendingIterator() {
921		NavigableSet q = populatedSet(SIZE);
922		int i = 0;
923	<	Iterator it = q.iterator();
923	>	Iterator it = q.iterator();
924		while (it.hasNext()) {
925		assertTrue(q.contains(it.next()));
926		++i;
#	Line 940 | Line 934 | public class TreeSubSetTest extends JSR1
934		public void testDescendingEmptyIterator() {
935		NavigableSet q = dset0();
936		int i = 0;
937	<	Iterator it = q.iterator();
937	>	Iterator it = q.iterator();
938		while (it.hasNext()) {
939		assertTrue(q.contains(it.next()));
940		++i;
#	Line 951 | Line 945 | public class TreeSubSetTest extends JSR1
945		/**
946		* iterator.remove removes current element
947		*/
948	<	public void testDescendingIteratorRemove () {
948	>	public void testDescendingIteratorRemove() {
949		final NavigableSet q = dset0();
950		q.add(new Integer(2));
951		q.add(new Integer(1));
#	Line 962 | Line 956 | public class TreeSubSetTest extends JSR1
956		it.remove();
957
958		it = q.iterator();
959	<	assertEquals(it.next(), new Integer(2));
960	<	assertEquals(it.next(), new Integer(3));
959	>	assertEquals(it.next(), 2);
960	>	assertEquals(it.next(), 3);
961		assertFalse(it.hasNext());
962		}
963

Diff Legend

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