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.8 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.17 by jsr166, Thu Nov 4 01:04:54 2010 UTC

#	Line 11 | Line 11 | import java.io.*;
11
12		public class TreeSetTest 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(TreeSetTest.class);
#	Line 19 | Line 19 | public class TreeSetTest extends JSR166T
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 108 | Line 104 | public class TreeSetTest extends JSR166T
104		* Set contains all elements of collection used to initialize
105		*/
106		public void testConstructor6() {
107	<	try {
108	<	Integer[] ints = new Integer[SIZE];
109	<	for (int i = 0; i < SIZE; ++i)
110	<	ints[i] = new Integer(i);
111	<	TreeSet q = new TreeSet(Arrays.asList(ints));
112	<	for (int i = 0; i < SIZE; ++i)
117	<	assertEquals(ints[i], q.pollFirst());
118	<	}
119	<	finally {}
107	>	Integer[] ints = new Integer[SIZE];
108	>	for (int i = 0; i < SIZE; ++i)
109	>	ints[i] = new Integer(i);
110	>	TreeSet q = new TreeSet(Arrays.asList(ints));
111	>	for (int i = 0; i < SIZE; ++i)
112	>	assertEquals(ints[i], q.pollFirst());
113		}
114
115		/**
116		* The comparator used in constructor is used
117		*/
118		public void testConstructor7() {
119	<	try {
120	<	MyReverseComparator cmp = new MyReverseComparator();
121	<	TreeSet q = new TreeSet(cmp);
122	<	assertEquals(cmp, q.comparator());
123	<	Integer[] ints = new Integer[SIZE];
124	<	for (int i = 0; i < SIZE; ++i)
125	<	ints[i] = new Integer(i);
126	<	q.addAll(Arrays.asList(ints));
127	<	for (int i = SIZE-1; i >= 0; --i)
135	<	assertEquals(ints[i], q.pollFirst());
136	<	}
137	<	finally {}
119	>	MyReverseComparator cmp = new MyReverseComparator();
120	>	TreeSet q = new TreeSet(cmp);
121	>	assertEquals(cmp, q.comparator());
122	>	Integer[] ints = new Integer[SIZE];
123	>	for (int i = 0; i < SIZE; ++i)
124	>	ints[i] = new Integer(i);
125	>	q.addAll(Arrays.asList(ints));
126	>	for (int i = SIZE-1; i >= 0; --i)
127	>	assertEquals(ints[i], q.pollFirst());
128		}
129
130		/**
#	Line 218 | Line 208 | public class TreeSetTest extends JSR166T
208		shouldThrow();
209		} catch (NullPointerException success) {}
210		}
211	+
212		/**
213		* addAll of a collection with null elements throws NPE
214		*/
#	Line 229 | Line 220 | public class TreeSetTest extends JSR166T
220		shouldThrow();
221		} catch (NullPointerException success) {}
222		}
223	+
224		/**
225		* addAll of a collection with any null elements throws NPE after
226		* possibly adding some elements
#	Line 248 | Line 240 | public class TreeSetTest extends JSR166T
240		* Set contains all elements of successful addAll
241		*/
242		public void testAddAll5() {
243	<	try {
244	<	Integer[] empty = new Integer[0];
245	<	Integer[] ints = new Integer[SIZE];
246	<	for (int i = 0; i < SIZE; ++i)
247	<	ints[i] = new Integer(SIZE-1-i);
248	<	TreeSet q = new TreeSet();
249	<	assertFalse(q.addAll(Arrays.asList(empty)));
250	<	assertTrue(q.addAll(Arrays.asList(ints)));
251	<	for (int i = 0; i < SIZE; ++i)
260	<	assertEquals(new Integer(i), q.pollFirst());
261	<	}
262	<	finally {}
243	>	Integer[] empty = new Integer[0];
244	>	Integer[] ints = new Integer[SIZE];
245	>	for (int i = 0; i < SIZE; ++i)
246	>	ints[i] = new Integer(SIZE-1-i);
247	>	TreeSet q = new TreeSet();
248	>	assertFalse(q.addAll(Arrays.asList(empty)));
249	>	assertTrue(q.addAll(Arrays.asList(ints)));
250	>	for (int i = 0; i < SIZE; ++i)
251	>	assertEquals(new Integer(i), q.pollFirst());
252		}
253
254		/**
#	Line 268 | Line 257 | public class TreeSetTest extends JSR166T
257		public void testPollFirst() {
258		TreeSet q = populatedSet(SIZE);
259		for (int i = 0; i < SIZE; ++i) {
260	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
260	>	assertEquals(i, q.pollFirst());
261		}
262		assertNull(q.pollFirst());
263		}
#	Line 279 | Line 268 | public class TreeSetTest extends JSR166T
268		public void testPollLast() {
269		TreeSet q = populatedSet(SIZE);
270		for (int i = SIZE-1; i >= 0; --i) {
271	<	assertEquals(i, ((Integer)q.pollLast()).intValue());
271	>	assertEquals(i, q.pollLast());
272		}
273		assertNull(q.pollFirst());
274		}
#	Line 393 | Line 382 | public class TreeSetTest extends JSR166T
382
383		Object e4 = q.lower(zero);
384		assertNull(e4);
396	–
385		}
386
387		/**
#	Line 412 | Line 400 | public class TreeSetTest extends JSR166T
400
401		Object e4 = q.higher(six);
402		assertNull(e4);
415	–
403		}
404
405		/**
#	Line 431 | Line 418 | public class TreeSetTest extends JSR166T
418
419		Object e4 = q.floor(zero);
420		assertNull(e4);
434	–
421		}
422
423		/**
#	Line 450 | Line 436 | public class TreeSetTest extends JSR166T
436
437		Object e4 = q.ceiling(six);
438		assertNull(e4);
453	–
439		}
440
441		/**
442	<	* toArray contains all elements
442	>	* toArray contains all elements in sorted order
443		*/
444		public void testToArray() {
445		TreeSet q = populatedSet(SIZE);
446		Object[] o = q.toArray();
462	–	Arrays.sort(o);
447		for (int i = 0; i < o.length; i++)
448	<	assertEquals(o[i], q.pollFirst());
448	>	assertSame(o[i], q.pollFirst());
449		}
450
451		/**
452	<	* toArray(a) contains all elements
452	>	* toArray(a) contains all elements in sorted order
453		*/
454		public void testToArray2() {
455		TreeSet q = populatedSet(SIZE);
456		Integer[] ints = new Integer[SIZE];
457	<	ints = (Integer[])q.toArray(ints);
474	<	Arrays.sort(ints);
457	>	assertSame(ints, q.toArray(ints));
458		for (int i = 0; i < ints.length; i++)
459	<	assertEquals(ints[i], q.pollFirst());
459	>	assertSame(ints[i], q.pollFirst());
460		}
461
462		/**
#	Line 507 | Line 490 | public class TreeSetTest extends JSR166T
490		/**
491		* iterator.remove removes current element
492		*/
493	<	public void testIteratorRemove () {
493	>	public void testIteratorRemove() {
494		final TreeSet q = new TreeSet();
495		q.add(new Integer(2));
496		q.add(new Integer(1));
#	Line 678 | Line 661 | public class TreeSetTest extends JSR166T
661		/**
662		* Subsets of subsets subdivide correctly
663		*/
664	<	public void testRecursiveSubSets() {
665	<	int setSize = 1000;
664	>	public void testRecursiveSubSets() throws Exception {
665	>	int setSize = expensiveTests ? 1000 : 100;
666		Class cl = TreeSet.class;
667
668		NavigableSet<Integer> set = newSet(cl);
#	Line 697 | Line 680 | public class TreeSetTest extends JSR166T
680		0, setSize - 1, true);
681		}
682
683	<	static NavigableSet<Integer> newSet(Class cl) {
684	<	NavigableSet<Integer> result = null;
702	<	try {
703	<	result = (NavigableSet<Integer>) cl.newInstance();
704	<	} catch (Exception e) {
705	<	fail();
706	<	}
683	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
684	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
685		assertEquals(result.size(), 0);
686		assertFalse(result.iterator().hasNext());
687		return result;
#	Line 766 | Line 744 | public class TreeSetTest extends JSR166T
744		} else {
745		try {
746		set.add(element);
747	<	fail();
748	<	} catch (IllegalArgumentException e) {
771	<	// expected
772	<	}
747	>	shouldThrow();
748	>	} catch (IllegalArgumentException success) {}
749		}
750		}
751		}
#	Line 902 | Line 878 | public class TreeSetTest extends JSR166T
878		// BitSet should support this! Test would run much faster
879		while (element >= min) {
880		if (bs.get(element))
881	<	return(element);
881	>	return element;
882		element--;
883		}
884		return -1;
#	Line 968 | Line 944 | public class TreeSetTest extends JSR166T
944		assertEq(rs.last(),  -1);
945		try {
946		set.first();
947	<	fail();
948	<	} catch (NoSuchElementException e) {
973	<	// expected
974	<	}
947	>	shouldThrow();
948	>	} catch (NoSuchElementException success) {}
949		try {
950		set.last();
951	<	fail();
952	<	} catch (NoSuchElementException e) {
979	<	// expected
980	<	}
951	>	shouldThrow();
952	>	} catch (NoSuchElementException success) {}
953		}
954		}
955

Diff Legend

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