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.21 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.27 by jsr166, Wed Dec 31 20:09:09 2014 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	–	import junit.framework.*;
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());
#	Line 27 | Line 30 | public class TreeSubSetTest extends JSR1
30		}
31
32		/**
33	<	* Create a set of given size containing consecutive
33	>	* Returns a new set of given size containing consecutive
34		* Integers 0 ... n.
35		*/
36		private NavigableSet<Integer> populatedSet(int n) {
37		TreeSet<Integer> q = new TreeSet<Integer>();
38		assertTrue(q.isEmpty());
39
40	<	for (int i = n-1; i >= 0; i-=2)
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)
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)));
#	Line 47 | Line 50 | public class TreeSubSetTest extends JSR1
50		}
51
52		/**
53	<	* Create set of first 5 ints
53	>	* Returns a new set of first 5 ints.
54		*/
55		private NavigableSet set5() {
56		TreeSet q = new TreeSet();
#	Line 235 | Line 238 | public class TreeSubSetTest extends JSR1
238		*/
239		public void testRemoveElement() {
240		NavigableSet q = populatedSet(SIZE);
241	<	for (int i = 1; i < SIZE; i+=2) {
241	>	for (int i = 1; i < SIZE; i += 2) {
242		assertTrue(q.contains(i));
243		assertTrue(q.remove(i));
244		assertFalse(q.contains(i));
245		assertTrue(q.contains(i-1));
246		}
247	<	for (int i = 0; i < SIZE; i+=2) {
247	>	for (int i = 0; i < SIZE; i += 2) {
248		assertTrue(q.contains(i));
249		assertTrue(q.remove(i));
250		assertFalse(q.contains(i));
#	Line 485 | Line 488 | public class TreeSubSetTest extends JSR1
488		NavigableSet x = populatedSet(SIZE);
489		NavigableSet y = serialClone(x);
490
491	<	assertTrue(x != y);
491	>	assertNotSame(x, y);
492		assertEquals(x.size(), y.size());
493		assertEquals(x, y);
494		assertEquals(y, x);
#	Line 729 | Line 732 | public class TreeSubSetTest extends JSR1
732		*/
733		public void testDescendingRemoveElement() {
734		NavigableSet q = populatedSet(SIZE);
735	<	for (int i = 1; i < SIZE; i+=2) {
735	>	for (int i = 1; i < SIZE; i += 2) {
736		assertTrue(q.remove(new Integer(i)));
737		}
738	<	for (int i = 0; i < SIZE; i+=2) {
738	>	for (int i = 0; i < SIZE; i += 2) {
739		assertTrue(q.remove(new Integer(i)));
740		assertFalse(q.remove(new Integer(i+1)));
741		}
#	Line 974 | Line 977 | public class TreeSubSetTest extends JSR1
977		NavigableSet x = dset5();
978		NavigableSet y = serialClone(x);
979
980	<	assertTrue(x != y);
980	>	assertNotSame(x, y);
981		assertEquals(x.size(), y.size());
982		assertEquals(x.toString(), y.toString());
983		assertEquals(x, y);
#	Line 1105 | Line 1108 | public class TreeSubSetTest extends JSR1
1108		assertEquals(4, set.size());
1109		}
1110
1111	+	/**
1112	+	* addAll is idempotent
1113	+	*/
1114	+	public void testAddAll_idempotent() throws Exception {
1115	+	Set x = populatedSet(SIZE);
1116	+	Set y = new TreeSet(x);
1117	+	y.addAll(x);
1118	+	assertEquals(x, y);
1119	+	assertEquals(y, x);
1120	+	}
1121	+
1122		}

Diff Legend

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