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.38 by jsr166, Mon May 28 21:19:50 2018 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.Comparator;
9	>	import java.util.Iterator;
10	>	import java.util.NavigableSet;
11	>	import java.util.Set;
12	>	import java.util.SortedSet;
13	>	import java.util.TreeSet;
14	>
15	>	import junit.framework.Test;
16	>	import junit.framework.TestSuite;
17
18		public class TreeSubSetTest extends JSR166TestCase {
19		public static void main(String[] args) {
20	<	junit.textui.TestRunner.run (suite());
20	>	main(suite(), args);
21		}
22		public static Test suite() {
23	<	return new TestSuite(TreeSubSetTest.class);
23	>	return new TestSuite(TreeSubSetTest.class);
24		}
25
26		static class MyReverseComparator implements Comparator {
27		public int compare(Object x, Object y) {
28	<	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;
28	>	return ((Comparable)y).compareTo(x);
29		}
30		}
31
32		/**
33	<	* Create a set of given size containing consecutive
34	<	* Integers 0 ... n.
33	>	* Returns a new set of given size containing consecutive
34	>	* Integers 0 ... n - 1.
35		*/
36	<	private NavigableSet populatedSet(int n) {
37	<	TreeSet q = new TreeSet();
36	>	private static NavigableSet<Integer> populatedSet(int n) {
37	>	TreeSet<Integer> q = new TreeSet<>();
38		assertTrue(q.isEmpty());
39
40	<	for (int i = n-1; i >= 0; i-=2)
41	<	assertTrue(q.add(new Integer(i)));
42	<	for (int i = (n & 1); i < n; i+=2)
43	<	assertTrue(q.add(new Integer(i)));
40	>	for (int i = n - 1; i >= 0; i -= 2)
41	>	assertTrue(q.add(new Integer(i)));
42	>	for (int i = (n & 1); i < n; i += 2)
43	>	assertTrue(q.add(new Integer(i)));
44		assertTrue(q.add(new Integer(-n)));
45		assertTrue(q.add(new Integer(n)));
46		NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
47		assertFalse(s.isEmpty());
48	<	assertEquals(n, s.size());
48	>	assertEquals(n, s.size());
49		return s;
50		}
51
52		/**
53	<	* Create set of first 5 ints
53	>	* Returns a new set of first 5 ints.
54		*/
55	<	private NavigableSet set5() {
55	>	private static NavigableSet set5() {
56		TreeSet q = new TreeSet();
57		assertTrue(q.isEmpty());
58		q.add(one);
#	Line 61 | Line 63 | public class TreeSubSetTest extends JSR1
63		q.add(zero);
64		q.add(seven);
65		NavigableSet s = q.subSet(one, true, seven, false);
66	<	assertEquals(5, s.size());
66	>	assertEquals(5, s.size());
67		return s;
68		}
69
70	<	private NavigableSet dset5() {
70	>	private static NavigableSet dset5() {
71		TreeSet q = new TreeSet();
72		assertTrue(q.isEmpty());
73		q.add(m1);
#	Line 74 | Line 76 | public class TreeSubSetTest extends JSR1
76		q.add(m4);
77		q.add(m5);
78		NavigableSet s = q.descendingSet();
79	<	assertEquals(5, s.size());
79	>	assertEquals(5, s.size());
80		return s;
81		}
82
83		private static NavigableSet set0() {
84	<	TreeSet set = new TreeSet();
84	>	TreeSet set = new TreeSet();
85		assertTrue(set.isEmpty());
86		return set.tailSet(m1, false);
87		}
88
89		private static NavigableSet dset0() {
90	<	TreeSet set = new TreeSet();
90	>	TreeSet set = new TreeSet();
91		assertTrue(set.isEmpty());
92		return set;
93		}
#	Line 97 | Line 99 | public class TreeSubSetTest extends JSR1
99		assertEquals(0, set0().size());
100		}
101
100	–
102		/**
103		* isEmpty is true before add, false after
104		*/
105		public void testEmpty() {
106		NavigableSet q = set0();
107		assertTrue(q.isEmpty());
108	<	q.add(new Integer(1));
108	>	assertTrue(q.add(new Integer(1)));
109		assertFalse(q.isEmpty());
110	<	q.add(new Integer(2));
110	>	assertTrue(q.add(new Integer(2)));
111		q.pollFirst();
112		q.pollFirst();
113		assertTrue(q.isEmpty());
#	Line 118 | Line 119 | public class TreeSubSetTest extends JSR1
119		public void testSize() {
120		NavigableSet q = populatedSet(SIZE);
121		for (int i = 0; i < SIZE; ++i) {
122	<	assertEquals(SIZE-i, q.size());
122	>	assertEquals(SIZE - i, q.size());
123		q.pollFirst();
124		}
125		for (int i = 0; i < SIZE; ++i) {
#	Line 131 | Line 132 | public class TreeSubSetTest extends JSR1
132		* add(null) throws NPE
133		*/
134		public void testAddNull() {
135	<	try {
136	<	NavigableSet q = set0();
135	>	NavigableSet q = set0();
136	>	try {
137		q.add(null);
138		shouldThrow();
139		} catch (NullPointerException success) {}
#	Line 159 | Line 160 | public class TreeSubSetTest extends JSR1
160		* Add of non-Comparable throws CCE
161		*/
162		public void testAddNonComparable() {
163	+	NavigableSet q = set0();
164		try {
163	–	NavigableSet q = set0();
164	–	q.add(new Object());
165		q.add(new Object());
166		q.add(new Object());
167		shouldThrow();
168		} catch (ClassCastException success) {}
169		}
170
171	–
171		/**
172		* addAll(null) throws NPE
173		*/
174		public void testAddAll1() {
175	+	NavigableSet q = set0();
176		try {
177	–	NavigableSet q = set0();
177		q.addAll(null);
178		shouldThrow();
179		} catch (NullPointerException success) {}
180		}
181	+
182		/**
183		* addAll of a collection with null elements throws NPE
184		*/
185		public void testAddAll2() {
186	+	NavigableSet q = set0();
187	+	Integer[] ints = new Integer[SIZE];
188		try {
187	–	NavigableSet q = set0();
188	–	Integer[] ints = new Integer[SIZE];
189		q.addAll(Arrays.asList(ints));
190		shouldThrow();
191		} catch (NullPointerException success) {}
192		}
193	+
194		/**
195		* addAll of a collection with any null elements throws NPE after
196		* possibly adding some elements
197		*/
198		public void testAddAll3() {
199	+	NavigableSet q = set0();
200	+	Integer[] ints = new Integer[SIZE];
201	+	for (int i = 0; i < SIZE - 1; ++i)
202	+	ints[i] = new Integer(i + SIZE);
203		try {
199	–	NavigableSet q = set0();
200	–	Integer[] ints = new Integer[SIZE];
201	–	for (int i = 0; i < SIZE-1; ++i)
202	–	ints[i] = new Integer(i+SIZE);
204		q.addAll(Arrays.asList(ints));
205		shouldThrow();
206		} catch (NullPointerException success) {}
#	Line 209 | Line 210 | public class TreeSubSetTest extends JSR1
210		* Set contains all elements of successful addAll
211		*/
212		public void testAddAll5() {
213	<	try {
214	<	Integer[] empty = new Integer[0];
215	<	Integer[] ints = new Integer[SIZE];
216	<	for (int i = 0; i < SIZE; ++i)
217	<	ints[i] = new Integer(SIZE-1- i);
218	<	NavigableSet q = set0();
219	<	assertFalse(q.addAll(Arrays.asList(empty)));
220	<	assertTrue(q.addAll(Arrays.asList(ints)));
221	<	for (int i = 0; i < SIZE; ++i)
221	<	assertEquals(new Integer(i), q.pollFirst());
222	<	}
223	<	finally {}
213	>	Integer[] empty = new Integer[0];
214	>	Integer[] ints = new Integer[SIZE];
215	>	for (int i = 0; i < SIZE; ++i)
216	>	ints[i] = new Integer(SIZE - 1 - i);
217	>	NavigableSet q = set0();
218	>	assertFalse(q.addAll(Arrays.asList(empty)));
219	>	assertTrue(q.addAll(Arrays.asList(ints)));
220	>	for (int i = 0; i < SIZE; ++i)
221	>	assertEquals(new Integer(i), q.pollFirst());
222		}
223
224		/**
#	Line 229 | Line 227 | public class TreeSubSetTest extends JSR1
227		public void testPoll() {
228		NavigableSet q = populatedSet(SIZE);
229		for (int i = 0; i < SIZE; ++i) {
230	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
230	>	assertEquals(i, q.pollFirst());
231		}
232	<	assertNull(q.pollFirst());
232	>	assertNull(q.pollFirst());
233		}
234
235		/**
#	Line 239 | Line 237 | public class TreeSubSetTest extends JSR1
237		*/
238		public void testRemoveElement() {
239		NavigableSet q = populatedSet(SIZE);
240	<	for (int i = 1; i < SIZE; i+=2) {
241	<	assertTrue(q.remove(new Integer(i)));
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)));
240	>	for (int i = 1; i < SIZE; i += 2) {
241	>	assertTrue(q.contains(i));
242	>	assertTrue(q.remove(i));
243	>	assertFalse(q.contains(i));
244	>	assertTrue(q.contains(i - 1));
245	>	}
246	>	for (int i = 0; i < SIZE; i += 2) {
247	>	assertTrue(q.contains(i));
248	>	assertTrue(q.remove(i));
249	>	assertFalse(q.contains(i));
250	>	assertFalse(q.remove(i + 1));
251	>	assertFalse(q.contains(i + 1));
252		}
253		assertTrue(q.isEmpty());
254		}
#	Line 269 | Line 273 | public class TreeSubSetTest extends JSR1
273		q.clear();
274		assertTrue(q.isEmpty());
275		assertEquals(0, q.size());
276	<	q.add(new Integer(1));
276	>	assertTrue(q.add(new Integer(1)));
277		assertFalse(q.isEmpty());
278		q.clear();
279		assertTrue(q.isEmpty());
#	Line 303 | Line 307 | public class TreeSubSetTest extends JSR1
307		assertTrue(changed);
308
309		assertTrue(q.containsAll(p));
310	<	assertEquals(SIZE-i, q.size());
310	>	assertEquals(SIZE - i, q.size());
311		p.pollFirst();
312		}
313		}
#	Line 316 | Line 320 | public class TreeSubSetTest extends JSR1
320		NavigableSet q = populatedSet(SIZE);
321		NavigableSet p = populatedSet(i);
322		assertTrue(q.removeAll(p));
323	<	assertEquals(SIZE-i, q.size());
323	>	assertEquals(SIZE - i, q.size());
324		for (int j = 0; j < i; ++j) {
325	<	Integer I = (Integer)(p.pollFirst());
326	<	assertFalse(q.contains(I));
325	>	Integer x = (Integer)(p.pollFirst());
326	>	assertFalse(q.contains(x));
327		}
328		}
329		}
330
327	–
328	–
331		/**
332		* lower returns preceding element
333		*/
#	Line 342 | Line 344 | public class TreeSubSetTest extends JSR1
344
345		Object e4 = q.lower(zero);
346		assertNull(e4);
345	–
347		}
348
349		/**
#	Line 361 | Line 362 | public class TreeSubSetTest extends JSR1
362
363		Object e4 = q.higher(six);
364		assertNull(e4);
364	–
365		}
366
367		/**
#	Line 380 | Line 380 | public class TreeSubSetTest extends JSR1
380
381		Object e4 = q.floor(zero);
382		assertNull(e4);
383	–
383		}
384
385		/**
#	Line 399 | Line 398 | public class TreeSubSetTest extends JSR1
398
399		Object e4 = q.ceiling(six);
400		assertNull(e4);
402	–
401		}
402
403		/**
404	<	* toArray contains all elements
404	>	* toArray contains all elements in sorted order
405		*/
406		public void testToArray() {
407		NavigableSet q = populatedSet(SIZE);
408	<	Object[] o = q.toArray();
409	<	Arrays.sort(o);
410	<	for (int i = 0; i < o.length; i++)
411	<	assertEquals(o[i], q.pollFirst());
408	>	Object[] a = q.toArray();
409	>	assertSame(Object[].class, a.getClass());
410	>	for (Object o : a)
411	>	assertSame(o, q.pollFirst());
412	>	assertTrue(q.isEmpty());
413		}
414
415		/**
416	<	* toArray(a) contains all elements
416	>	* toArray(a) contains all elements in sorted order
417		*/
418		public void testToArray2() {
419	<	NavigableSet q = populatedSet(SIZE);
420	<	Integer[] ints = new Integer[SIZE];
421	<	ints = (Integer[])q.toArray(ints);
422	<	Arrays.sort(ints);
423	<	for (int i = 0; i < ints.length; i++)
424	<	assertEquals(ints[i], q.pollFirst());
419	>	NavigableSet<Integer> q = populatedSet(SIZE);
420	>	Integer[] ints = new Integer[SIZE];
421	>	Integer[] array = q.toArray(ints);
422	>	assertSame(ints, array);
423	>	for (Integer o : ints)
424	>	assertSame(o, q.pollFirst());
425	>	assertTrue(q.isEmpty());
426		}
427
428		/**
#	Line 430 | Line 430 | public class TreeSubSetTest extends JSR1
430		*/
431		public void testIterator() {
432		NavigableSet q = populatedSet(SIZE);
433	<	int i = 0;
434	<	Iterator it = q.iterator();
435	<	while (it.hasNext()) {
433	>	Iterator it = q.iterator();
434	>	int i;
435	>	for (i = 0; it.hasNext(); i++)
436		assertTrue(q.contains(it.next()));
437	–	++i;
438	–	}
437		assertEquals(i, SIZE);
438	+	assertIteratorExhausted(it);
439		}
440
441		/**
442		* iterator of empty set has no elements
443		*/
444		public void testEmptyIterator() {
445	<	NavigableSet q = set0();
447	<	int i = 0;
448	<	Iterator it = q.iterator();
449	<	while (it.hasNext()) {
450	<	assertTrue(q.contains(it.next()));
451	<	++i;
452	<	}
453	<	assertEquals(i, 0);
445	>	assertIteratorExhausted(set0().iterator());
446		}
447
448		/**
449		* iterator.remove removes current element
450		*/
451	<	public void testIteratorRemove () {
451	>	public void testIteratorRemove() {
452		final NavigableSet q = set0();
453		q.add(new Integer(2));
454		q.add(new Integer(1));
#	Line 467 | Line 459 | public class TreeSubSetTest extends JSR1
459		it.remove();
460
461		it = q.iterator();
462	<	assertEquals(it.next(), new Integer(2));
463	<	assertEquals(it.next(), new Integer(3));
462	>	assertEquals(2, it.next());
463	>	assertEquals(3, it.next());
464		assertFalse(it.hasNext());
465		}
466
475	–
467		/**
468		* toString contains toStrings of elements
469		*/
#	Line 480 | Line 471 | public class TreeSubSetTest extends JSR1
471		NavigableSet q = populatedSet(SIZE);
472		String s = q.toString();
473		for (int i = 0; i < SIZE; ++i) {
474	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
474	>	assertTrue(s.contains(String.valueOf(i)));
475		}
476		}
477
478		/**
479	<	* A deserialized serialized set has same elements
479	>	* A deserialized/reserialized set equals original
480		*/
481		public void testSerialization() throws Exception {
482	<	NavigableSet q = populatedSet(SIZE);
483	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
484	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
485	<	out.writeObject(q);
486	<	out.close();
487	<
488	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
489	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
490	<	NavigableSet r = (NavigableSet)in.readObject();
491	<	assertEquals(q.size(), r.size());
492	<	while (!q.isEmpty())
493	<	assertEquals(q.pollFirst(), r.pollFirst());
482	>	NavigableSet x = populatedSet(SIZE);
483	>	NavigableSet y = serialClone(x);
484	>
485	>	assertNotSame(x, y);
486	>	assertEquals(x.size(), y.size());
487	>	assertEquals(x, y);
488	>	assertEquals(y, x);
489	>	while (!x.isEmpty()) {
490	>	assertFalse(y.isEmpty());
491	>	assertEquals(x.pollFirst(), y.pollFirst());
492	>	}
493	>	assertTrue(y.isEmpty());
494		}
495
496		/**
#	Line 627 | Line 618 | public class TreeSubSetTest extends JSR1
618		public void testDescendingSize() {
619		NavigableSet q = populatedSet(SIZE);
620		for (int i = 0; i < SIZE; ++i) {
621	<	assertEquals(SIZE-i, q.size());
621	>	assertEquals(SIZE - i, q.size());
622		q.pollFirst();
623		}
624		for (int i = 0; i < SIZE; ++i) {
#	Line 657 | Line 648 | public class TreeSubSetTest extends JSR1
648		* Add of non-Comparable throws CCE
649		*/
650		public void testDescendingAddNonComparable() {
651	+	NavigableSet q = dset0();
652		try {
661	–	NavigableSet q = dset0();
662	–	q.add(new Object());
653		q.add(new Object());
654		q.add(new Object());
655		shouldThrow();
656		} catch (ClassCastException success) {}
657		}
658
669	–
659		/**
660		* addAll(null) throws NPE
661		*/
662		public void testDescendingAddAll1() {
663	+	NavigableSet q = dset0();
664		try {
675	–	NavigableSet q = dset0();
665		q.addAll(null);
666		shouldThrow();
667		} catch (NullPointerException success) {}
668		}
669	+
670		/**
671		* addAll of a collection with null elements throws NPE
672		*/
673		public void testDescendingAddAll2() {
674	+	NavigableSet q = dset0();
675	+	Integer[] ints = new Integer[SIZE];
676		try {
685	–	NavigableSet q = dset0();
686	–	Integer[] ints = new Integer[SIZE];
677		q.addAll(Arrays.asList(ints));
678		shouldThrow();
679		} catch (NullPointerException success) {}
680		}
681	+
682		/**
683		* addAll of a collection with any null elements throws NPE after
684		* possibly adding some elements
685		*/
686		public void testDescendingAddAll3() {
687	+	NavigableSet q = dset0();
688	+	Integer[] ints = new Integer[SIZE];
689	+	for (int i = 0; i < SIZE - 1; ++i)
690	+	ints[i] = new Integer(i + SIZE);
691		try {
697	–	NavigableSet q = dset0();
698	–	Integer[] ints = new Integer[SIZE];
699	–	for (int i = 0; i < SIZE-1; ++i)
700	–	ints[i] = new Integer(i+SIZE);
692		q.addAll(Arrays.asList(ints));
693		shouldThrow();
694		} catch (NullPointerException success) {}
#	Line 710 | Line 701 | public class TreeSubSetTest extends JSR1
701		Integer[] empty = new Integer[0];
702		Integer[] ints = new Integer[SIZE];
703		for (int i = 0; i < SIZE; ++i)
704	<	ints[i] = new Integer(SIZE-1- i);
704	>	ints[i] = new Integer(SIZE - 1 - i);
705		NavigableSet q = dset0();
706		assertFalse(q.addAll(Arrays.asList(empty)));
707		assertTrue(q.addAll(Arrays.asList(ints)));
#	Line 724 | Line 715 | public class TreeSubSetTest extends JSR1
715		public void testDescendingPoll() {
716		NavigableSet q = populatedSet(SIZE);
717		for (int i = 0; i < SIZE; ++i) {
718	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
718	>	assertEquals(i, q.pollFirst());
719		}
720	<	assertNull(q.pollFirst());
720	>	assertNull(q.pollFirst());
721		}
722
723		/**
#	Line 734 | Line 725 | public class TreeSubSetTest extends JSR1
725		*/
726		public void testDescendingRemoveElement() {
727		NavigableSet q = populatedSet(SIZE);
728	<	for (int i = 1; i < SIZE; i+=2) {
728	>	for (int i = 1; i < SIZE; i += 2) {
729		assertTrue(q.remove(new Integer(i)));
730		}
731	<	for (int i = 0; i < SIZE; i+=2) {
731	>	for (int i = 0; i < SIZE; i += 2) {
732		assertTrue(q.remove(new Integer(i)));
733	<	assertFalse(q.remove(new Integer(i+1)));
733	>	assertFalse(q.remove(new Integer(i + 1)));
734		}
735		assertTrue(q.isEmpty());
736		}
#	Line 764 | Line 755 | public class TreeSubSetTest extends JSR1
755		q.clear();
756		assertTrue(q.isEmpty());
757		assertEquals(0, q.size());
758	<	q.add(new Integer(1));
758	>	assertTrue(q.add(new Integer(1)));
759		assertFalse(q.isEmpty());
760		q.clear();
761		assertTrue(q.isEmpty());
#	Line 798 | Line 789 | public class TreeSubSetTest extends JSR1
789		assertTrue(changed);
790
791		assertTrue(q.containsAll(p));
792	<	assertEquals(SIZE-i, q.size());
792	>	assertEquals(SIZE - i, q.size());
793		p.pollFirst();
794		}
795		}
#	Line 811 | Line 802 | public class TreeSubSetTest extends JSR1
802		NavigableSet q = populatedSet(SIZE);
803		NavigableSet p = populatedSet(i);
804		assertTrue(q.removeAll(p));
805	<	assertEquals(SIZE-i, q.size());
805	>	assertEquals(SIZE - i, q.size());
806		for (int j = 0; j < i; ++j) {
807	<	Integer I = (Integer)(p.pollFirst());
808	<	assertFalse(q.contains(I));
807	>	Integer x = (Integer)(p.pollFirst());
808	>	assertFalse(q.contains(x));
809		}
810		}
811		}
812
822	–
823	–
813		/**
814		* lower returns preceding element
815		*/
#	Line 837 | Line 826 | public class TreeSubSetTest extends JSR1
826
827		Object e4 = q.lower(zero);
828		assertNull(e4);
840	–
829		}
830
831		/**
#	Line 856 | Line 844 | public class TreeSubSetTest extends JSR1
844
845		Object e4 = q.higher(m6);
846		assertNull(e4);
859	–
847		}
848
849		/**
#	Line 875 | Line 862 | public class TreeSubSetTest extends JSR1
862
863		Object e4 = q.floor(zero);
864		assertNull(e4);
878	–
865		}
866
867		/**
#	Line 894 | Line 880 | public class TreeSubSetTest extends JSR1
880
881		Object e4 = q.ceiling(m6);
882		assertNull(e4);
897	–
883		}
884
885		/**
#	Line 902 | Line 887 | public class TreeSubSetTest extends JSR1
887		*/
888		public void testDescendingToArray() {
889		NavigableSet q = populatedSet(SIZE);
890	<	Object[] o = q.toArray();
890	>	Object[] o = q.toArray();
891		Arrays.sort(o);
892	<	for (int i = 0; i < o.length; i++)
893	<	assertEquals(o[i], q.pollFirst());
892	>	for (int i = 0; i < o.length; i++)
893	>	assertEquals(o[i], q.pollFirst());
894		}
895
896		/**
#	Line 913 | Line 898 | public class TreeSubSetTest extends JSR1
898		*/
899		public void testDescendingToArray2() {
900		NavigableSet q = populatedSet(SIZE);
901	<	Integer[] ints = new Integer[SIZE];
902	<	ints = (Integer[])q.toArray(ints);
901	>	Integer[] ints = new Integer[SIZE];
902	>	assertSame(ints, q.toArray(ints));
903		Arrays.sort(ints);
904		for (int i = 0; i < ints.length; i++)
905		assertEquals(ints[i], q.pollFirst());
#	Line 926 | Line 911 | public class TreeSubSetTest extends JSR1
911		public void testDescendingIterator() {
912		NavigableSet q = populatedSet(SIZE);
913		int i = 0;
914	<	Iterator it = q.iterator();
914	>	Iterator it = q.iterator();
915		while (it.hasNext()) {
916		assertTrue(q.contains(it.next()));
917		++i;
#	Line 940 | Line 925 | public class TreeSubSetTest extends JSR1
925		public void testDescendingEmptyIterator() {
926		NavigableSet q = dset0();
927		int i = 0;
928	<	Iterator it = q.iterator();
928	>	Iterator it = q.iterator();
929		while (it.hasNext()) {
930		assertTrue(q.contains(it.next()));
931		++i;
932		}
933	<	assertEquals(i, 0);
933	>	assertEquals(0, i);
934		}
935
936		/**
937		* iterator.remove removes current element
938		*/
939	<	public void testDescendingIteratorRemove () {
939	>	public void testDescendingIteratorRemove() {
940		final NavigableSet q = dset0();
941		q.add(new Integer(2));
942		q.add(new Integer(1));
#	Line 962 | Line 947 | public class TreeSubSetTest extends JSR1
947		it.remove();
948
949		it = q.iterator();
950	<	assertEquals(it.next(), new Integer(2));
951	<	assertEquals(it.next(), new Integer(3));
950	>	assertEquals(2, it.next());
951	>	assertEquals(3, it.next());
952		assertFalse(it.hasNext());
953		}
954
970	–
955		/**
956		* toString contains toStrings of elements
957		*/
#	Line 975 | Line 959 | public class TreeSubSetTest extends JSR1
959		NavigableSet q = populatedSet(SIZE);
960		String s = q.toString();
961		for (int i = 0; i < SIZE; ++i) {
962	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
962	>	assertTrue(s.contains(String.valueOf(i)));
963		}
964		}
965
966		/**
967	<	* A deserialized serialized set has same elements
967	>	* A deserialized/reserialized set equals original
968		*/
969		public void testDescendingSerialization() throws Exception {
970	<	NavigableSet q = populatedSet(SIZE);
971	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
972	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
973	<	out.writeObject(q);
974	<	out.close();
975	<
976	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
977	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
978	<	NavigableSet r = (NavigableSet)in.readObject();
979	<	assertEquals(q.size(), r.size());
980	<	while (!q.isEmpty())
981	<	assertEquals(q.pollFirst(), r.pollFirst());
970	>	NavigableSet x = dset5();
971	>	NavigableSet y = serialClone(x);
972	>
973	>	assertNotSame(x, y);
974	>	assertEquals(x.size(), y.size());
975	>	assertEquals(x.toString(), y.toString());
976	>	assertEquals(x, y);
977	>	assertEquals(y, x);
978	>	while (!x.isEmpty()) {
979	>	assertFalse(y.isEmpty());
980	>	assertEquals(x.pollFirst(), y.pollFirst());
981	>	}
982	>	assertTrue(y.isEmpty());
983		}
984
985		/**
#	Line 1116 | Line 1101 | public class TreeSubSetTest extends JSR1
1101		assertEquals(4, set.size());
1102		}
1103
1104	+	/**
1105	+	* addAll is idempotent
1106	+	*/
1107	+	public void testAddAll_idempotent() throws Exception {
1108	+	Set x = populatedSet(SIZE);
1109	+	Set y = new TreeSet(x);
1110	+	y.addAll(x);
1111	+	assertEquals(x, y);
1112	+	assertEquals(y, x);
1113	+	}
1114	+
1115		}

Diff Legend

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