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.17 by jsr166, Thu Nov 4 01:04:54 2010 UTC vs.
Revision 1.46 by jsr166, Sat Mar 11 18:20:47 2017 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.*;
8	<	import java.util.*;
9	<	import java.util.concurrent.*;
10	<	import java.io.*;
7	>	import java.util.Arrays;
8	>	import java.util.BitSet;
9	>	import java.util.Collection;
10	>	import java.util.Comparator;
11	>	import java.util.Iterator;
12	>	import java.util.NavigableSet;
13	>	import java.util.NoSuchElementException;
14	>	import java.util.Random;
15	>	import java.util.Set;
16	>	import java.util.SortedSet;
17	>	import java.util.TreeSet;
18	>
19	>	import junit.framework.Test;
20	>	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 29 | Line 39 | public class TreeSetTest extends JSR166T
39		static final int SIZE = 20;
40
41		/**
42	<	* Create a set of given size containing consecutive
43	<	* Integers 0 ... n.
42	>	* Returns a new set of given size containing consecutive
43	>	* Integers 0 ... n - 1.
44		*/
45	<	private TreeSet populatedSet(int n) {
46	<	TreeSet q = new TreeSet();
45	>	private static TreeSet<Integer> populatedSet(int n) {
46	>	TreeSet<Integer> q = new TreeSet<>();
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)
50	>	for (int i = (n & 1); i < n; i += 2)
51		assertTrue(q.add(new Integer(i)));
52		assertFalse(q.isEmpty());
53		assertEquals(n, q.size());
#	Line 45 | Line 55 | public class TreeSetTest extends JSR166T
55		}
56
57		/**
58	<	* Create set of first 5 ints
58	>	* Returns a new set of first 5 ints.
59		*/
60	<	private TreeSet set5() {
60	>	private static TreeSet set5() {
61		TreeSet q = new TreeSet();
62		assertTrue(q.isEmpty());
63		q.add(one);
#	Line 71 | Line 81 | public class TreeSetTest extends JSR166T
81		*/
82		public void testConstructor3() {
83		try {
84	<	TreeSet q = new TreeSet((Collection)null);
84	>	new TreeSet((Collection)null);
85		shouldThrow();
86		} catch (NullPointerException success) {}
87		}
#	Line 81 | Line 91 | public class TreeSetTest extends JSR166T
91		*/
92		public void testConstructor4() {
93		try {
94	<	Integer[] ints = new Integer[SIZE];
85	<	TreeSet q = new TreeSet(Arrays.asList(ints));
94	>	new TreeSet(Arrays.asList(new Integer[SIZE]));
95		shouldThrow();
96		} catch (NullPointerException success) {}
97		}
#	Line 91 | 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 {
107	<	Integer[] ints = new Integer[SIZE];
96	<	for (int i = 0; i < SIZE-1; ++i)
97	<	ints[i] = new Integer(i);
98	<	TreeSet q = new TreeSet(Arrays.asList(ints));
107	>	new TreeSet(Arrays.asList(ints));
108		shouldThrow();
109		} catch (NullPointerException success) {}
110		}
#	Line 123 | 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 147 | 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 160 | Line 169 | public class TreeSetTest extends JSR166T
169		* add(null) throws NPE if nonempty
170		*/
171		public void testAddNull() {
172	+	TreeSet q = populatedSet(SIZE);
173		try {
164	–	TreeSet q = populatedSet(SIZE);
174		q.add(null);
175		shouldThrow();
176		} catch (NullPointerException success) {}
#	Line 189 | Line 198 | public class TreeSetTest extends JSR166T
198		* Add of non-Comparable throws CCE
199		*/
200		public void testAddNonComparable() {
201	+	TreeSet q = new TreeSet();
202		try {
193	–	TreeSet q = new TreeSet();
194	–	q.add(new Object());
203		q.add(new Object());
204		q.add(new Object());
205		shouldThrow();
#	Line 202 | Line 210 | public class TreeSetTest extends JSR166T
210		* addAll(null) throws NPE
211		*/
212		public void testAddAll1() {
213	+	TreeSet q = new TreeSet();
214		try {
206	–	TreeSet q = new TreeSet();
215		q.addAll(null);
216		shouldThrow();
217		} catch (NullPointerException success) {}
#	Line 213 | Line 221 | public class TreeSetTest extends JSR166T
221		* addAll of a collection with null elements throws NPE
222		*/
223		public void testAddAll2() {
224	+	TreeSet q = new TreeSet();
225	+	Integer[] ints = new Integer[SIZE];
226		try {
217	–	TreeSet q = new TreeSet();
218	–	Integer[] ints = new Integer[SIZE];
227		q.addAll(Arrays.asList(ints));
228		shouldThrow();
229		} catch (NullPointerException success) {}
#	Line 226 | Line 234 | public class TreeSetTest extends JSR166T
234		* possibly adding some elements
235		*/
236		public void testAddAll3() {
237	+	TreeSet q = new TreeSet();
238	+	Integer[] ints = new Integer[SIZE];
239	+	for (int i = 0; i < SIZE - 1; ++i)
240	+	ints[i] = new Integer(i);
241		try {
230	–	TreeSet q = new TreeSet();
231	–	Integer[] ints = new Integer[SIZE];
232	–	for (int i = 0; i < SIZE-1; ++i)
233	–	ints[i] = new Integer(i);
242		q.addAll(Arrays.asList(ints));
243		shouldThrow();
244		} catch (NullPointerException success) {}
#	Line 243 | 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 267 | 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());
282		}
283
276	–
284		/**
285		* remove(x) removes x and returns true if present
286		*/
287		public void testRemoveElement() {
288		TreeSet q = populatedSet(SIZE);
289	<	for (int i = 1; i < SIZE; i+=2) {
290	<	assertTrue(q.remove(new Integer(i)));
291	<	}
292	<	for (int i = 0; i < SIZE; i+=2) {
293	<	assertTrue(q.remove(new Integer(i)));
294	<	assertFalse(q.remove(new Integer(i+1)));
289	>	for (int i = 1; i < SIZE; i += 2) {
290	>	assertTrue(q.contains(i));
291	>	assertTrue(q.remove(i));
292	>	assertFalse(q.contains(i));
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));
301		}
302		assertTrue(q.isEmpty());
303		}
#	Line 343 | 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 356 | 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 I = (Integer)(p.pollFirst());
375	<	assertFalse(q.contains(I));
374	>	Integer x = (Integer)(p.pollFirst());
375	>	assertFalse(q.contains(x));
376		}
377		}
378		}
379
367	–
368	–
380		/**
381		* lower returns preceding element
382		*/
#	Line 452 | Line 463 | public class TreeSetTest extends JSR166T
463		* toArray(a) contains all elements in sorted order
464		*/
465		public void testToArray2() {
466	<	TreeSet q = populatedSet(SIZE);
466	>	TreeSet<Integer> q = populatedSet(SIZE);
467		Integer[] ints = new Integer[SIZE];
468	<	assertSame(ints, q.toArray(ints));
468	>	Integer[] array = q.toArray(ints);
469	>	assertSame(ints, array);
470		for (int i = 0; i < ints.length; i++)
471		assertSame(ints[i], q.pollFirst());
472		}
#	Line 464 | Line 476 | public class TreeSetTest extends JSR166T
476		*/
477		public void testIterator() {
478		TreeSet q = populatedSet(SIZE);
467	–	int i = 0;
479		Iterator it = q.iterator();
480	<	while (it.hasNext()) {
480	>	int i;
481	>	for (i = 0; it.hasNext(); i++)
482		assertTrue(q.contains(it.next()));
471	–	++i;
472	–	}
483		assertEquals(i, SIZE);
484	+	assertIteratorExhausted(it);
485		}
486
487		/**
488		* iterator of empty set has no elements
489		*/
490		public void testEmptyIterator() {
491	<	TreeSet q = new TreeSet();
481	<	int i = 0;
482	<	Iterator it = q.iterator();
483	<	while (it.hasNext()) {
484	<	assertTrue(q.contains(it.next()));
485	<	++i;
486	<	}
487	<	assertEquals(i, 0);
491	>	assertIteratorExhausted(new TreeSet().iterator());
492		}
493
494		/**
#	Line 506 | Line 510 | public class TreeSetTest extends JSR166T
510		assertFalse(it.hasNext());
511		}
512
509	–
513		/**
514		* toString contains toStrings of elements
515		*/
#	Line 514 | Line 517 | public class TreeSetTest extends JSR166T
517		TreeSet q = populatedSet(SIZE);
518		String s = q.toString();
519		for (int i = 0; i < SIZE; ++i) {
520	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
520	>	assertTrue(s.contains(String.valueOf(i)));
521		}
522		}
523
#	Line 522 | Line 525 | public class TreeSetTest extends JSR166T
525		* A deserialized serialized set has same elements
526		*/
527		public void testSerialization() throws Exception {
528	<	TreeSet q = populatedSet(SIZE);
529	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
530	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
531	<	out.writeObject(q);
532	<	out.close();
533	<
534	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
535	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
536	<	TreeSet r = (TreeSet)in.readObject();
537	<	assertEquals(q.size(), r.size());
538	<	while (!q.isEmpty())
539	<	assertEquals(q.pollFirst(), r.pollFirst());
528	>	NavigableSet x = populatedSet(SIZE);
529	>	NavigableSet y = serialClone(x);
530	>
531	>	assertNotSame(x, y);
532	>	assertEquals(x.size(), y.size());
533	>	assertEquals(x, y);
534	>	assertEquals(y, x);
535	>	while (!x.isEmpty()) {
536	>	assertFalse(y.isEmpty());
537	>	assertEquals(x.pollFirst(), y.pollFirst());
538	>	}
539	>	assertTrue(y.isEmpty());
540		}
541
542		/**
#	Line 680 | Line 683 | public class TreeSetTest extends JSR166T
683		0, setSize - 1, true);
684		}
685
686	+	/**
687	+	* addAll is idempotent
688	+	*/
689	+	public void testAddAll_idempotent() throws Exception {
690	+	Set x = populatedSet(SIZE);
691	+	Set y = new TreeSet(x);
692	+	y.addAll(x);
693	+	assertEquals(x, y);
694	+	assertEquals(y, x);
695	+	}
696	+
697		static NavigableSet<Integer> newSet(Class cl) throws Exception {
698	<	NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
699	<	assertEquals(result.size(), 0);
698	>	NavigableSet<Integer> result =
699	>	(NavigableSet<Integer>) cl.getConstructor().newInstance();
700	>	assertEquals(0, result.size());
701		assertFalse(result.iterator().hasNext());
702		return result;
703		}
#	Line 714 | Line 729 | public class TreeSetTest extends JSR166T
729		// Add entries till we're back to original size
730		while (set.size() < size) {
731		int element = min + rnd.nextInt(rangeSize);
732	<	assertTrue(element >= min && element<= max);
732	>	assertTrue(element >= min && element <= max);
733		put(set, element);
734		}
735		}
#	Line 739 | Line 754 | public class TreeSetTest extends JSR166T
754		// Add entries till we're back to original size
755		while (set.size() < size) {
756		int element = min - 5 + rnd.nextInt(rangeSize + 10);
757	<	if (element >= min && element<= max) {
757	>	if (element >= min && element <= max) {
758		put(set, element);
759		} else {
760		try {
#	Line 843 | Line 858 | public class TreeSetTest extends JSR166T
858		*/
859		void check(NavigableSet<Integer> set,
860		final int min, final int max, final boolean ascending) {
861	<	class ReferenceSet {
861	>	class ReferenceSet {
862		int lower(int element) {
863		return ascending ?
864		lowerAscending(element) : higherAscending(element);
#	Line 889 | Line 904 | public class TreeSetTest extends JSR166T
904		else if (element > max)
905		return -1;
906		int result = bs.nextSetBit(element);
907	<	return result > max ? -1 : result;
907	>	return (result > max) ? -1 : result;
908		}
909		int higherAscending(int element) {
910		return ceilingAscending(element + 1);
911		}
912		private int firstAscending() {
913		int result = ceilingAscending(min);
914	<	return result > max ? -1 : result;
914	>	return (result > max) ? -1 : result;
915		}
916		private int lastAscending() {
917		int result = floorAscending(max);
918	<	return result < min ? -1 : result;
918	>	return (result < min) ? -1 : result;
919		}
920		}
921		ReferenceSet rs = new ReferenceSet();
#	Line 913 | Line 928 | public class TreeSetTest extends JSR166T
928		if (bsContainsI)
929		size++;
930		}
931	<	assertEquals(set.size(), size);
931	>	assertEquals(size, set.size());
932
933		// Test contents using contains elementSet iterator
934		int size2 = 0;
#	Line 961 | Line 976 | public class TreeSetTest extends JSR166T
976		}
977
978		static boolean eq(Integer i, int j) {
979	<	return i == null ? j == -1 : i == j;
979	>	return (i == null) ? j == -1 : i == j;
980		}
981
982		}

Diff Legend

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