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.3 by dl, Thu Apr 20 20:35:00 2006 UTC vs.
Revision 1.19 by jsr166, Thu Nov 18 20:21: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);
17	>	return new TestSuite(TreeSetTest.class);
18		}
19
20	<	static class MyReverseComparator implements Comparator {
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 36 | Line 32 | public class TreeSetTest extends JSR166T
32		* Create a set of given size containing consecutive
33		* Integers 0 ... n.
34		*/
35	<	private TreeSet populatedSet(int n) {
36	<	TreeSet q = new TreeSet();
35	>	private TreeSet<Integer> populatedSet(int n) {
36	>	TreeSet<Integer> q = new TreeSet<Integer>();
37		assertTrue(q.isEmpty());
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		assertFalse(q.isEmpty());
43	<	assertEquals(n, q.size());
43	>	assertEquals(n, q.size());
44		return q;
45		}
46
#	Line 59 | Line 55 | public class TreeSetTest extends JSR166T
55		q.add(three);
56		q.add(four);
57		q.add(five);
58	<	assertEquals(5, q.size());
58	>	assertEquals(5, q.size());
59		return q;
60		}
61	<
61	>
62		/**
63		* A new set has unbounded capacity
64		*/
#	Line 77 | Line 73 | public class TreeSetTest extends JSR166T
73		try {
74		TreeSet q = new TreeSet((Collection)null);
75		shouldThrow();
76	<	}
81	<	catch (NullPointerException success) {}
76	>	} catch (NullPointerException success) {}
77		}
78
79		/**
#	Line 89 | Line 84 | public class TreeSetTest extends JSR166T
84		Integer[] ints = new Integer[SIZE];
85		TreeSet q = new TreeSet(Arrays.asList(ints));
86		shouldThrow();
87	<	}
93	<	catch (NullPointerException success) {}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 103 | Line 97 | public class TreeSetTest extends JSR166T
97		ints[i] = new Integer(i);
98		TreeSet q = new TreeSet(Arrays.asList(ints));
99		shouldThrow();
100	<	}
107	<	catch (NullPointerException success) {}
100	>	} catch (NullPointerException success) {}
101		}
102
103		/**
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)
120	<	assertEquals(ints[i], q.pollFirst());
121	<	}
122	<	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)
138	<	assertEquals(ints[i], q.pollFirst());
139	<	}
140	<	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 173 | Line 160 | public class TreeSetTest extends JSR166T
160		* add(null) throws NPE if nonempty
161		*/
162		public void testAddNull() {
163	<	try {
163	>	try {
164		TreeSet q = populatedSet(SIZE);
165		q.add(null);
166		shouldThrow();
167	<	} catch (NullPointerException success) { }
167	>	} catch (NullPointerException success) {}
168		}
169
170		/**
#	Line 208 | Line 195 | public class TreeSetTest extends JSR166T
195		q.add(new Object());
196		q.add(new Object());
197		shouldThrow();
198	<	}
212	<	catch(ClassCastException success) {}
198	>	} catch (ClassCastException success) {}
199		}
200
201		/**
#	Line 220 | Line 206 | public class TreeSetTest extends JSR166T
206		TreeSet q = new TreeSet();
207		q.addAll(null);
208		shouldThrow();
209	<	}
224	<	catch (NullPointerException success) {}
209	>	} catch (NullPointerException success) {}
210		}
211	+
212		/**
213		* addAll of a collection with null elements throws NPE
214		*/
#	Line 232 | Line 218 | public class TreeSetTest extends JSR166T
218		Integer[] ints = new Integer[SIZE];
219		q.addAll(Arrays.asList(ints));
220		shouldThrow();
221	<	}
236	<	catch (NullPointerException success) {}
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 247 | Line 233 | public class TreeSetTest extends JSR166T
233		ints[i] = new Integer(i);
234		q.addAll(Arrays.asList(ints));
235		shouldThrow();
236	<	}
251	<	catch (NullPointerException success) {}
236	>	} catch (NullPointerException success) {}
237		}
238
239		/**
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)
267	<	assertEquals(new Integer(i), q.pollFirst());
268	<	}
269	<	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 275 | 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());
262	>	assertNull(q.pollFirst());
263		}
264
265		/**
#	Line 286 | 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());
273	>	assertNull(q.pollFirst());
274		}
275
276
#	Line 298 | Line 280 | public class TreeSetTest extends JSR166T
280		public void testRemoveElement() {
281		TreeSet q = populatedSet(SIZE);
282		for (int i = 1; i < SIZE; i+=2) {
283	<	assertTrue(q.remove(new Integer(i)));
283	>	assertTrue(q.contains(i));
284	>	assertTrue(q.remove(i));
285	>	assertFalse(q.contains(i));
286	>	assertTrue(q.contains(i-1));
287		}
288		for (int i = 0; i < SIZE; i+=2) {
289	<	assertTrue(q.remove(new Integer(i)));
290	<	assertFalse(q.remove(new Integer(i+1)));
289	>	assertTrue(q.contains(i));
290	>	assertTrue(q.remove(i));
291	>	assertFalse(q.contains(i));
292	>	assertFalse(q.remove(i+1));
293	>	assertFalse(q.contains(i+1));
294		}
295		assertTrue(q.isEmpty());
296		}
297	<
297	>
298		/**
299		* contains(x) reports true when elements added but not yet removed
300		*/
#	Line 382 | Line 370 | public class TreeSetTest extends JSR166T
370		}
371		}
372
373	<
373	>
374
375		/**
376		* lower returns preceding element
#	Line 400 | Line 388 | public class TreeSetTest extends JSR166T
388
389		Object e4 = q.lower(zero);
390		assertNull(e4);
403	–
391		}
392
393		/**
#	Line 419 | Line 406 | public class TreeSetTest extends JSR166T
406
407		Object e4 = q.higher(six);
408		assertNull(e4);
422	–
409		}
410
411		/**
#	Line 438 | Line 424 | public class TreeSetTest extends JSR166T
424
425		Object e4 = q.floor(zero);
426		assertNull(e4);
441	–
427		}
428
429		/**
#	Line 457 | Line 442 | public class TreeSetTest extends JSR166T
442
443		Object e4 = q.ceiling(six);
444		assertNull(e4);
460	–
445		}
446
447		/**
448	<	* toArray contains all elements
448	>	* toArray contains all elements in sorted order
449		*/
450		public void testToArray() {
451		TreeSet q = populatedSet(SIZE);
452	<	Object[] o = q.toArray();
453	<	Arrays.sort(o);
454	<	for(int i = 0; i < o.length; i++)
471	<	assertEquals(o[i], q.pollFirst());
452	>	Object[] o = q.toArray();
453	>	for (int i = 0; i < o.length; i++)
454	>	assertSame(o[i], q.pollFirst());
455		}
456
457		/**
458	<	* toArray(a) contains all elements
458	>	* toArray(a) contains all elements in sorted order
459		*/
460		public void testToArray2() {
461	<	TreeSet q = populatedSet(SIZE);
462	<	Integer[] ints = new Integer[SIZE];
463	<	ints = (Integer[])q.toArray(ints);
464	<	Arrays.sort(ints);
465	<	for(int i = 0; i < ints.length; i++)
466	<	assertEquals(ints[i], q.pollFirst());
461	>	TreeSet<Integer> q = populatedSet(SIZE);
462	>	Integer[] ints = new Integer[SIZE];
463	>	Integer[] array = q.toArray(ints);
464	>	assertSame(ints, array);
465	>	for (int i = 0; i < ints.length; i++)
466	>	assertSame(ints[i], q.pollFirst());
467		}
468	<
468	>
469		/**
470		* iterator iterates through all elements
471		*/
472		public void testIterator() {
473		TreeSet q = populatedSet(SIZE);
474		int i = 0;
475	<	Iterator it = q.iterator();
476	<	while(it.hasNext()) {
475	>	Iterator it = q.iterator();
476	>	while (it.hasNext()) {
477		assertTrue(q.contains(it.next()));
478		++i;
479		}
#	Line 503 | Line 486 | public class TreeSetTest extends JSR166T
486		public void testEmptyIterator() {
487		TreeSet q = new TreeSet();
488		int i = 0;
489	<	Iterator it = q.iterator();
490	<	while(it.hasNext()) {
489	>	Iterator it = q.iterator();
490	>	while (it.hasNext()) {
491		assertTrue(q.contains(it.next()));
492		++i;
493		}
#	Line 514 | Line 497 | public class TreeSetTest extends JSR166T
497		/**
498		* iterator.remove removes current element
499		*/
500	<	public void testIteratorRemove () {
500	>	public void testIteratorRemove() {
501		final TreeSet q = new TreeSet();
502		q.add(new Integer(2));
503		q.add(new Integer(1));
#	Line 540 | Line 523 | public class TreeSetTest extends JSR166T
523		for (int i = 0; i < SIZE; ++i) {
524		assertTrue(s.indexOf(String.valueOf(i)) >= 0);
525		}
526	<	}
526	>	}
527
528		/**
529	<	* A deserialized serialized set has same elements
529	>	* A deserialized serialized set has same elements
530		*/
531	<	public void testSerialization() {
531	>	public void testSerialization() throws Exception {
532		TreeSet q = populatedSet(SIZE);
533	<	try {
534	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
535	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
536	<	out.writeObject(q);
537	<	out.close();
538	<
539	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
540	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
541	<	TreeSet r = (TreeSet)in.readObject();
542	<	assertEquals(q.size(), r.size());
543	<	while (!q.isEmpty())
561	<	assertEquals(q.pollFirst(), r.pollFirst());
562	<	} catch(Exception e){
563	<	e.printStackTrace();
564	<	unexpectedException();
565	<	}
533	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
534	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
535	>	out.writeObject(q);
536	>	out.close();
537	>
538	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
539	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
540	>	TreeSet r = (TreeSet)in.readObject();
541	>	assertEquals(q.size(), r.size());
542	>	while (!q.isEmpty())
543	>	assertEquals(q.pollFirst(), r.pollFirst());
544		}
545
546		/**
#	Line 690 | Line 668 | public class TreeSetTest extends JSR166T
668		/**
669		* Subsets of subsets subdivide correctly
670		*/
671	<	public void testRecursiveSubSets() {
672	<	int setSize = 1000;
673	<	Class cl = TreeSet.class;
671	>	public void testRecursiveSubSets() throws Exception {
672	>	int setSize = expensiveTests ? 1000 : 100;
673	>	Class cl = TreeSet.class;
674
675		NavigableSet<Integer> set = newSet(cl);
676		bs = new BitSet(setSize);
#	Line 709 | Line 687 | public class TreeSetTest extends JSR166T
687		0, setSize - 1, true);
688		}
689
690	<	static NavigableSet<Integer> newSet(Class cl) {
691	<	NavigableSet<Integer> result = null;
714	<	try {
715	<	result = (NavigableSet<Integer>) cl.newInstance();
716	<	} catch(Exception e) {
717	<	fail();
718	<	}
690	>	static NavigableSet<Integer> newSet(Class cl) throws Exception {
691	>	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
692		assertEquals(result.size(), 0);
693		assertFalse(result.iterator().hasNext());
694		return result;
#	Line 738 | Line 711 | public class TreeSetTest extends JSR166T
711		}
712
713		// Remove a bunch of entries with iterator
714	<	for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
714	>	for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
715		if (rnd.nextBoolean()) {
716		bs.clear(it.next());
717		it.remove();
#	Line 763 | Line 736 | public class TreeSetTest extends JSR166T
736		}
737
738		// Remove a bunch of entries with iterator
739	<	for(Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
739	>	for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
740		if (rnd.nextBoolean()) {
741		bs.clear(it.next());
742		it.remove();
#	Line 778 | Line 751 | public class TreeSetTest extends JSR166T
751		} else {
752		try {
753		set.add(element);
754	<	fail();
755	<	} catch(IllegalArgumentException e) {
783	<	// expected
784	<	}
754	>	shouldThrow();
755	>	} catch (IllegalArgumentException success) {}
756		}
757		}
758		}
#	Line 914 | Line 885 | public class TreeSetTest extends JSR166T
885		// BitSet should support this! Test would run much faster
886		while (element >= min) {
887		if (bs.get(element))
888	<	return(element);
888	>	return element;
889		element--;
890		}
891		return -1;
#	Line 980 | Line 951 | public class TreeSetTest extends JSR166T
951		assertEq(rs.last(),  -1);
952		try {
953		set.first();
954	<	fail();
955	<	} catch(NoSuchElementException e) {
985	<	// expected
986	<	}
954	>	shouldThrow();
955	>	} catch (NoSuchElementException success) {}
956		try {
957		set.last();
958	<	fail();
959	<	} catch(NoSuchElementException e) {
991	<	// expected
992	<	}
958	>	shouldThrow();
959	>	} catch (NoSuchElementException success) {}
960		}
961		}
962

Diff Legend

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