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.1 by dl, Tue Dec 28 16:15:59 2004 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);
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 39 | Line 35 | public class TreeSetTest extends JSR166T
35		private TreeSet populatedSet(int n) {
36		TreeSet q = new TreeSet();
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 306 | Line 288 | public class TreeSetTest extends JSR166T
288		}
289		assertTrue(q.isEmpty());
290		}
291	<
291	>
292		/**
293		* contains(x) reports true when elements added but not yet removed
294		*/
#	Line 382 | Line 364 | public class TreeSetTest extends JSR166T
364		}
365		}
366
367	<
367	>
368
369		/**
370		* lower returns preceding element
#	Line 400 | Line 382 | public class TreeSetTest extends JSR166T
382
383		Object e4 = q.lower(zero);
384		assertNull(e4);
403	–
385		}
386
387		/**
#	Line 419 | Line 400 | public class TreeSetTest extends JSR166T
400
401		Object e4 = q.higher(six);
402		assertNull(e4);
422	–
403		}
404
405		/**
#	Line 438 | Line 418 | public class TreeSetTest extends JSR166T
418
419		Object e4 = q.floor(zero);
420		assertNull(e4);
441	–
421		}
422
423		/**
#	Line 457 | Line 436 | public class TreeSetTest extends JSR166T
436
437		Object e4 = q.ceiling(six);
438		assertNull(e4);
460	–
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();
447	<	Arrays.sort(o);
448	<	for(int i = 0; i < o.length; i++)
471	<	assertEquals(o[i], q.pollFirst());
446	>	Object[] o = q.toArray();
447	>	for (int i = 0; i < o.length; i++)
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);
458	<	Arrays.sort(ints);
459	<	for(int i = 0; i < ints.length; i++)
483	<	assertEquals(ints[i], q.pollFirst());
456	>	Integer[] ints = new Integer[SIZE];
457	>	assertSame(ints, q.toArray(ints));
458	>	for (int i = 0; i < ints.length; i++)
459	>	assertSame(ints[i], q.pollFirst());
460		}
461	<
461	>
462		/**
463		* iterator iterates through all elements
464		*/
465		public void testIterator() {
466		TreeSet q = populatedSet(SIZE);
467		int i = 0;
468	<	Iterator it = q.iterator();
469	<	while(it.hasNext()) {
468	>	Iterator it = q.iterator();
469	>	while (it.hasNext()) {
470		assertTrue(q.contains(it.next()));
471		++i;
472		}
#	Line 503 | Line 479 | public class TreeSetTest extends JSR166T
479		public void testEmptyIterator() {
480		TreeSet q = new TreeSet();
481		int i = 0;
482	<	Iterator it = q.iterator();
483	<	while(it.hasNext()) {
482	>	Iterator it = q.iterator();
483	>	while (it.hasNext()) {
484		assertTrue(q.contains(it.next()));
485		++i;
486		}
#	Line 514 | 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 540 | Line 516 | public class TreeSetTest extends JSR166T
516		for (int i = 0; i < SIZE; ++i) {
517		assertTrue(s.indexOf(String.valueOf(i)) >= 0);
518		}
519	<	}
519	>	}
520
521		/**
522	<	* A deserialized serialized set has same elements
522	>	* A deserialized serialized set has same elements
523		*/
524	<	public void testSerialization() {
524	>	public void testSerialization() throws Exception {
525		TreeSet q = populatedSet(SIZE);
526	<	try {
527	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
528	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
529	<	out.writeObject(q);
530	<	out.close();
531	<
532	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
533	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
534	<	TreeSet r = (TreeSet)in.readObject();
535	<	assertEquals(q.size(), r.size());
536	<	while (!q.isEmpty())
561	<	assertEquals(q.pollFirst(), r.pollFirst());
562	<	} catch(Exception e){
563	<	e.printStackTrace();
564	<	unexpectedException();
565	<	}
526	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
527	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
528	>	out.writeObject(q);
529	>	out.close();
530	>
531	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
532	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
533	>	TreeSet r = (TreeSet)in.readObject();
534	>	assertEquals(q.size(), r.size());
535	>	while (!q.isEmpty())
536	>	assertEquals(q.pollFirst(), r.pollFirst());
537		}
538
539		/**
#	Line 684 | Line 655 | public class TreeSetTest extends JSR166T
655		assertEquals(4, set.size());
656		}
657
658	+	Random rnd = new Random(666);
659	+	BitSet bs;
660	+
661	+	/**
662	+	* Subsets of subsets subdivide correctly
663	+	*/
664	+	public void testRecursiveSubSets() throws Exception {
665	+	int setSize = expensiveTests ? 1000 : 100;
666	+	Class cl = TreeSet.class;
667	+
668	+	NavigableSet<Integer> set = newSet(cl);
669	+	bs = new BitSet(setSize);
670	+
671	+	populate(set, setSize);
672	+	check(set,                 0, setSize - 1, true);
673	+	check(set.descendingSet(), 0, setSize - 1, false);
674	+
675	+	mutateSet(set, 0, setSize - 1);
676	+	check(set,                 0, setSize - 1, true);
677	+	check(set.descendingSet(), 0, setSize - 1, false);
678	+
679	+	bashSubSet(set.subSet(0, true, setSize, false),
680	+	0, setSize - 1, true);
681	+	}
682	+
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;
688	+	}
689	+
690	+	void populate(NavigableSet<Integer> set, int limit) {
691	+	for (int i = 0, n = 2 * limit / 3; i < n; i++) {
692	+	int element = rnd.nextInt(limit);
693	+	put(set, element);
694	+	}
695	+	}
696	+
697	+	void mutateSet(NavigableSet<Integer> set, int min, int max) {
698	+	int size = set.size();
699	+	int rangeSize = max - min + 1;
700	+
701	+	// Remove a bunch of entries directly
702	+	for (int i = 0, n = rangeSize / 2; i < n; i++) {
703	+	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
704	+	}
705	+
706	+	// Remove a bunch of entries with iterator
707	+	for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
708	+	if (rnd.nextBoolean()) {
709	+	bs.clear(it.next());
710	+	it.remove();
711	+	}
712	+	}
713	+
714	+	// Add entries till we're back to original size
715	+	while (set.size() < size) {
716	+	int element = min + rnd.nextInt(rangeSize);
717	+	assertTrue(element >= min && element<= max);
718	+	put(set, element);
719	+	}
720	+	}
721	+
722	+	void mutateSubSet(NavigableSet<Integer> set, int min, int max) {
723	+	int size = set.size();
724	+	int rangeSize = max - min + 1;
725	+
726	+	// Remove a bunch of entries directly
727	+	for (int i = 0, n = rangeSize / 2; i < n; i++) {
728	+	remove(set, min - 5 + rnd.nextInt(rangeSize + 10));
729	+	}
730	+
731	+	// Remove a bunch of entries with iterator
732	+	for (Iterator<Integer> it = set.iterator(); it.hasNext(); ) {
733	+	if (rnd.nextBoolean()) {
734	+	bs.clear(it.next());
735	+	it.remove();
736	+	}
737	+	}
738	+
739	+	// Add entries till we're back to original size
740	+	while (set.size() < size) {
741	+	int element = min - 5 + rnd.nextInt(rangeSize + 10);
742	+	if (element >= min && element<= max) {
743	+	put(set, element);
744	+	} else {
745	+	try {
746	+	set.add(element);
747	+	shouldThrow();
748	+	} catch (IllegalArgumentException success) {}
749	+	}
750	+	}
751	+	}
752	+
753	+	void put(NavigableSet<Integer> set, int element) {
754	+	if (set.add(element))
755	+	bs.set(element);
756	+	}
757	+
758	+	void remove(NavigableSet<Integer> set, int element) {
759	+	if (set.remove(element))
760	+	bs.clear(element);
761	+	}
762	+
763	+	void bashSubSet(NavigableSet<Integer> set,
764	+	int min, int max, boolean ascending) {
765	+	check(set, min, max, ascending);
766	+	check(set.descendingSet(), min, max, !ascending);
767	+
768	+	mutateSubSet(set, min, max);
769	+	check(set, min, max, ascending);
770	+	check(set.descendingSet(), min, max, !ascending);
771	+
772	+	// Recurse
773	+	if (max - min < 2)
774	+	return;
775	+	int midPoint = (min + max) / 2;
776	+
777	+	// headSet - pick direction and endpoint inclusion randomly
778	+	boolean incl = rnd.nextBoolean();
779	+	NavigableSet<Integer> hm = set.headSet(midPoint, incl);
780	+	if (ascending) {
781	+	if (rnd.nextBoolean())
782	+	bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
783	+	else
784	+	bashSubSet(hm.descendingSet(), min, midPoint - (incl ? 0 : 1),
785	+	false);
786	+	} else {
787	+	if (rnd.nextBoolean())
788	+	bashSubSet(hm, midPoint + (incl ? 0 : 1), max, false);
789	+	else
790	+	bashSubSet(hm.descendingSet(), midPoint + (incl ? 0 : 1), max,
791	+	true);
792	+	}
793	+
794	+	// tailSet - pick direction and endpoint inclusion randomly
795	+	incl = rnd.nextBoolean();
796	+	NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
797	+	if (ascending) {
798	+	if (rnd.nextBoolean())
799	+	bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
800	+	else
801	+	bashSubSet(tm.descendingSet(), midPoint + (incl ? 0 : 1), max,
802	+	false);
803	+	} else {
804	+	if (rnd.nextBoolean()) {
805	+	bashSubSet(tm, min, midPoint - (incl ? 0 : 1), false);
806	+	} else {
807	+	bashSubSet(tm.descendingSet(), min, midPoint - (incl ? 0 : 1),
808	+	true);
809	+	}
810	+	}
811	+
812	+	// subSet - pick direction and endpoint inclusion randomly
813	+	int rangeSize = max - min + 1;
814	+	int[] endpoints = new int[2];
815	+	endpoints[0] = min + rnd.nextInt(rangeSize);
816	+	endpoints[1] = min + rnd.nextInt(rangeSize);
817	+	Arrays.sort(endpoints);
818	+	boolean lowIncl = rnd.nextBoolean();
819	+	boolean highIncl = rnd.nextBoolean();
820	+	if (ascending) {
821	+	NavigableSet<Integer> sm = set.subSet(
822	+	endpoints[0], lowIncl, endpoints[1], highIncl);
823	+	if (rnd.nextBoolean())
824	+	bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
825	+	endpoints[1] - (highIncl ? 0 : 1), true);
826	+	else
827	+	bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
828	+	endpoints[1] - (highIncl ? 0 : 1), false);
829	+	} else {
830	+	NavigableSet<Integer> sm = set.subSet(
831	+	endpoints[1], highIncl, endpoints[0], lowIncl);
832	+	if (rnd.nextBoolean())
833	+	bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
834	+	endpoints[1] - (highIncl ? 0 : 1), false);
835	+	else
836	+	bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
837	+	endpoints[1] - (highIncl ? 0 : 1), true);
838	+	}
839	+	}
840	+
841	+	/**
842	+	* min and max are both inclusive.  If max < min, interval is empty.
843	+	*/
844	+	void check(NavigableSet<Integer> set,
845	+	final int min, final int max, final boolean ascending) {
846	+	class ReferenceSet {
847	+	int lower(int element) {
848	+	return ascending ?
849	+	lowerAscending(element) : higherAscending(element);
850	+	}
851	+	int floor(int element) {
852	+	return ascending ?
853	+	floorAscending(element) : ceilingAscending(element);
854	+	}
855	+	int ceiling(int element) {
856	+	return ascending ?
857	+	ceilingAscending(element) : floorAscending(element);
858	+	}
859	+	int higher(int element) {
860	+	return ascending ?
861	+	higherAscending(element) : lowerAscending(element);
862	+	}
863	+	int first() {
864	+	return ascending ? firstAscending() : lastAscending();
865	+	}
866	+	int last() {
867	+	return ascending ? lastAscending() : firstAscending();
868	+	}
869	+	int lowerAscending(int element) {
870	+	return floorAscending(element - 1);
871	+	}
872	+	int floorAscending(int element) {
873	+	if (element < min)
874	+	return -1;
875	+	else if (element > max)
876	+	element = max;
877	+
878	+	// BitSet should support this! Test would run much faster
879	+	while (element >= min) {
880	+	if (bs.get(element))
881	+	return element;
882	+	element--;
883	+	}
884	+	return -1;
885	+	}
886	+	int ceilingAscending(int element) {
887	+	if (element < min)
888	+	element = min;
889	+	else if (element > max)
890	+	return -1;
891	+	int result = bs.nextSetBit(element);
892	+	return result > max ? -1 : result;
893	+	}
894	+	int higherAscending(int element) {
895	+	return ceilingAscending(element + 1);
896	+	}
897	+	private int firstAscending() {
898	+	int result = ceilingAscending(min);
899	+	return result > max ? -1 : result;
900	+	}
901	+	private int lastAscending() {
902	+	int result = floorAscending(max);
903	+	return result < min ? -1 : result;
904	+	}
905	+	}
906	+	ReferenceSet rs = new ReferenceSet();
907	+
908	+	// Test contents using containsElement
909	+	int size = 0;
910	+	for (int i = min; i <= max; i++) {
911	+	boolean bsContainsI = bs.get(i);
912	+	assertEquals(bsContainsI, set.contains(i));
913	+	if (bsContainsI)
914	+	size++;
915	+	}
916	+	assertEquals(set.size(), size);
917	+
918	+	// Test contents using contains elementSet iterator
919	+	int size2 = 0;
920	+	int previousElement = -1;
921	+	for (int element : set) {
922	+	assertTrue(bs.get(element));
923	+	size2++;
924	+	assertTrue(previousElement < 0 || (ascending ?
925	+	element - previousElement > 0 : element - previousElement < 0));
926	+	previousElement = element;
927	+	}
928	+	assertEquals(size2, size);
929	+
930	+	// Test navigation ops
931	+	for (int element = min - 1; element <= max + 1; element++) {
932	+	assertEq(set.lower(element), rs.lower(element));
933	+	assertEq(set.floor(element), rs.floor(element));
934	+	assertEq(set.higher(element), rs.higher(element));
935	+	assertEq(set.ceiling(element), rs.ceiling(element));
936	+	}
937	+
938	+	// Test extrema
939	+	if (set.size() != 0) {
940	+	assertEq(set.first(), rs.first());
941	+	assertEq(set.last(), rs.last());
942	+	} else {
943	+	assertEq(rs.first(), -1);
944	+	assertEq(rs.last(),  -1);
945	+	try {
946	+	set.first();
947	+	shouldThrow();
948	+	} catch (NoSuchElementException success) {}
949	+	try {
950	+	set.last();
951	+	shouldThrow();
952	+	} catch (NoSuchElementException success) {}
953	+	}
954	+	}
955	+
956	+	static void assertEq(Integer i, int j) {
957	+	if (i == null)
958	+	assertEquals(j, -1);
959	+	else
960	+	assertEquals((int) i, j);
961	+	}
962	+
963	+	static boolean eq(Integer i, int j) {
964	+	return i == null ? j == -1 : i == j;
965	+	}
966	+
967		}

Diff Legend

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