ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/TreeMapTest.java

Comparing jsr166/src/test/tck/TreeMapTest.java (file contents):
Revision 1.20 by jsr166, Fri May 27 19:10:32 2011 UTC vs.
Revision 1.26 by jsr166, Wed Jan 2 07:41:07 2013 UTC

#	Line 6 | Line 6
6
7		import junit.framework.*;
8		import java.util.*;
9	–	import java.util.concurrent.*;
10	–	import java.io.*;
9
10		public class TreeMapTest extends JSR166TestCase {
11		public static void main(String[] args) {
#	Line 18 | Line 16 | public class TreeMapTest extends JSR166T
16		}
17
18		/**
19	<	* Create a map from Integers 1-5 to Strings "A"-"E".
19	>	* Returns a new map from Integers 1-5 to Strings "A"-"E".
20		*/
21		private static TreeMap map5() {
22		TreeMap map = new TreeMap();
#	Line 39 | Line 37 | public class TreeMapTest extends JSR166T
37		public void testClear() {
38		TreeMap map = map5();
39		map.clear();
40	<	assertEquals(map.size(), 0);
40	>	assertEquals(0, map.size());
41		}
42
43		/**
44	<	*
44	>	* copy constructor creates map equal to source map
45		*/
46		public void testConstructFromSorted() {
47		TreeMap map = map5();
#	Line 119 | Line 117 | public class TreeMapTest extends JSR166T
117		assertEquals(five, map.lastKey());
118		}
119
122	–
120		/**
121		* keySet.toArray returns contains all keys
122		*/
#	Line 176 | Line 173 | public class TreeMapTest extends JSR166T
173		last = k;
174		++count;
175		}
176	<	assertEquals(count ,5);
176	>	assertEquals(5, count);
177		}
178
179		/**
#	Line 195 | Line 192 | public class TreeMapTest extends JSR166T
192		last = k;
193		++count;
194		}
195	<	assertEquals(count ,5);
195	>	assertEquals(5, count);
196		}
197
198		/**
#	Line 214 | Line 211 | public class TreeMapTest extends JSR166T
211		last = k;
212		++count;
213		}
214	<	assertEquals(count, 5);
214	>	assertEquals(5, count);
215		}
216
217		/**
#	Line 233 | Line 230 | public class TreeMapTest extends JSR166T
230		last = k;
231		++count;
232		}
233	<	assertEquals(count, 5);
233	>	assertEquals(5, count);
234		}
235
236		/**
#	Line 413 | Line 410 | public class TreeMapTest extends JSR166T
410		assertNull(e4);
411		}
412
416	–
413		/**
414		* lowerKey returns preceding element
415		*/
#	Line 601 | Line 597 | public class TreeMapTest extends JSR166T
597		* A deserialized map equals original
598		*/
599		public void testSerialization() throws Exception {
600	<	TreeMap q = map5();
600	>	NavigableMap x = map5();
601	>	NavigableMap y = serialClone(x);
602
603	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
604	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
605	<	out.writeObject(q);
606	<	out.close();
607	<
611	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
612	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
613	<	TreeMap r = (TreeMap)in.readObject();
614	<	assertEquals(q.size(), r.size());
615	<	assertTrue(q.equals(r));
616	<	assertTrue(r.equals(q));
603	>	assertTrue(x != y);
604	>	assertEquals(x.size(), y.size());
605	>	assertEquals(x.toString(), y.toString());
606	>	assertEquals(x, y);
607	>	assertEquals(y, x);
608		}
609
610		/**
#	Line 800 | Line 791 | public class TreeMapTest extends JSR166T
791		static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
792		NavigableMap<Integer, Integer> result
793		= (NavigableMap<Integer, Integer>) cl.newInstance();
794	<	assertEquals(result.size(), 0);
794	>	assertEquals(0, result.size());
795		assertFalse(result.keySet().iterator().hasNext());
796		return result;
797		}
#	Line 1027 | Line 1018 | public class TreeMapTest extends JSR166T
1018		if (bsContainsI)
1019		size++;
1020		}
1021	<	assertEquals(map.size(), size);
1021	>	assertEquals(size, map.size());
1022
1023		// Test contents using contains keySet iterator
1024		int size2 = 0;

Diff Legend

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