ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java (file contents):
Revision 1.16 by jsr166, Sat Oct 9 19:30:34 2010 UTC vs.
Revision 1.23 by jsr166, Thu May 30 03:28:55 2013 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.concurrent.ConcurrentNavigableMap;
9	+	import java.util.concurrent.ConcurrentSkipListMap;
10		import java.util.*;
9	–	import java.util.concurrent.*;
10	–	import java.io.*;
11
12		public class ConcurrentSkipListSubMapTest extends JSR166TestCase {
13		public static void main(String[] args) {
#	Line 18 | Line 18 | public class ConcurrentSkipListSubMapTes
18		}
19
20		/**
21	<	* Create a map from Integers 1-5 to Strings "A"-"E".
21	>	* Returns a new map from Integers 1-5 to Strings "A"-"E".
22		*/
23		private static ConcurrentNavigableMap map5() {
24		ConcurrentSkipListMap map = new ConcurrentSkipListMap();
#	Line 36 | Line 36 | public class ConcurrentSkipListSubMapTes
36		}
37
38		/**
39	<	* Create a map from Integers -5 to -1 to Strings "A"-"E".
39	>	* Returns a new map from Integers -5 to -1 to Strings "A"-"E".
40		*/
41		private static ConcurrentNavigableMap dmap5() {
42		ConcurrentSkipListMap map = new ConcurrentSkipListMap();
#	Line 69 | Line 69 | public class ConcurrentSkipListSubMapTes
69		public void testClear() {
70		ConcurrentNavigableMap map = map5();
71		map.clear();
72	<	assertEquals(map.size(), 0);
72	>	assertEquals(0, map.size());
73		}
74
75	–
75		/**
76		* Maps with same contents are equal
77		*/
#	Line 141 | Line 140 | public class ConcurrentSkipListSubMapTes
140		assertEquals(five, map.lastKey());
141		}
142
144	–
143		/**
144		* keySet returns a Set containing all the keys
145		*/
#	Line 228 | Line 226 | public class ConcurrentSkipListSubMapTes
226		assertTrue(s.contains("E"));
227		}
228
231	–
229		/**
230		* entrySet contains all pairs
231		*/
#	Line 298 | Line 295 | public class ConcurrentSkipListSubMapTes
295		assertEquals("Z", map.get(one));
296		}
297
301	–
298		/**
299		* replace value fails when the given key not mapped to expected value
300		*/
#	Line 319 | Line 315 | public class ConcurrentSkipListSubMapTes
315		assertEquals("Z", map.get(one));
316		}
317
322	–
318		/**
319		* remove removes the correct key-value pair from the map
320		*/
#	Line 488 | Line 483 | public class ConcurrentSkipListSubMapTes
483		ConcurrentNavigableMap map = map5();
484		String s = map.toString();
485		for (int i = 1; i <= 5; ++i) {
486	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
486	>	assertTrue(s.contains(String.valueOf(i)));
487		}
488		}
489
#	Line 527 | Line 522 | public class ConcurrentSkipListSubMapTes
522		} catch (NullPointerException success) {}
523		}
524
530	–
525		/**
526		* put(null,x) throws NPE
527		*/
#	Line 598 | Line 592 | public class ConcurrentSkipListSubMapTes
592		* A deserialized map equals original
593		*/
594		public void testSerialization() throws Exception {
595	<	ConcurrentNavigableMap q = map5();
595	>	NavigableMap x = map5();
596	>	NavigableMap y = serialClone(x);
597
598	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
599	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
600	<	out.writeObject(q);
601	<	out.close();
602	<
608	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
609	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
610	<	ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
611	<	assertEquals(q.size(), r.size());
612	<	assertTrue(q.equals(r));
613	<	assertTrue(r.equals(q));
598	>	assertNotSame(x, y);
599	>	assertEquals(x.size(), y.size());
600	>	assertEquals(x.toString(), y.toString());
601	>	assertEquals(x, y);
602	>	assertEquals(y, x);
603		}
604
616	–
617	–
605		/**
606		* subMap returns map with keys in requested range
607		*/
#	Line 756 | Line 743 | public class ConcurrentSkipListSubMapTes
743		public void testDescendingClear() {
744		ConcurrentNavigableMap map = dmap5();
745		map.clear();
746	<	assertEquals(map.size(), 0);
746	>	assertEquals(0, map.size());
747		}
748
762	–
749		/**
750		* Maps with same contents are equal
751		*/
#	Line 828 | Line 814 | public class ConcurrentSkipListSubMapTes
814		assertEquals(m5, map.lastKey());
815		}
816
831	–
817		/**
818		* keySet returns a Set containing all the keys
819		*/
#	Line 915 | Line 900 | public class ConcurrentSkipListSubMapTes
900		assertTrue(s.contains("E"));
901		}
902
918	–
903		/**
904		* entrySet contains all pairs
905		*/
#	Line 985 | Line 969 | public class ConcurrentSkipListSubMapTes
969		assertEquals("Z", map.get(m1));
970		}
971
988	–
972		/**
973		* replace value fails when the given key not mapped to expected value
974		*/
#	Line 1006 | Line 989 | public class ConcurrentSkipListSubMapTes
989		assertEquals("Z", map.get(m1));
990		}
991
1009	–
992		/**
993		* remove removes the correct key-value pair from the map
994		*/
#	Line 1175 | Line 1157 | public class ConcurrentSkipListSubMapTes
1157		ConcurrentNavigableMap map = dmap5();
1158		String s = map.toString();
1159		for (int i = 1; i <= 5; ++i) {
1160	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
1160	>	assertTrue(s.contains(String.valueOf(i)));
1161		}
1162		}
1163
#	Line 1214 | Line 1196 | public class ConcurrentSkipListSubMapTes
1196		} catch (NullPointerException success) {}
1197		}
1198
1217	–
1199		/**
1200		* put(null,x) throws NPE
1201		*/
#	Line 1285 | Line 1266 | public class ConcurrentSkipListSubMapTes
1266		* A deserialized map equals original
1267		*/
1268		public void testDescendingSerialization() throws Exception {
1269	<	ConcurrentNavigableMap q = dmap5();
1269	>	NavigableMap x = dmap5();
1270	>	NavigableMap y = serialClone(x);
1271
1272	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1273	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1274	<	out.writeObject(q);
1275	<	out.close();
1276	<
1295	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1296	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1297	<	ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
1298	<	assertEquals(q.size(), r.size());
1299	<	assertTrue(q.equals(r));
1300	<	assertTrue(r.equals(q));
1272	>	assertNotSame(x, y);
1273	>	assertEquals(x.size(), y.size());
1274	>	assertEquals(x.toString(), y.toString());
1275	>	assertEquals(x, y);
1276	>	assertEquals(y, x);
1277		}
1278
1303	–
1279		/**
1280		* subMap returns map with keys in requested range
1281		*/

Diff Legend

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