ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListMapTest.java (file contents):
Revision 1.43 by dl, Tue Jan 26 13:33:05 2021 UTC vs.
Revision 1.44 by jsr166, Wed Jan 27 01:57:24 2021 UTC

#	Line 42 | Line 42 | public class ConcurrentSkipListMapTest e
42		* Returns a new map from Items 1-5 to Strings "A"-"E".
43		*/
44		private static ConcurrentSkipListMap<Item,String> map5() {
45	<	ConcurrentSkipListMap<Item,String> map = new ConcurrentSkipListMap<Item,String>();
45	>	ConcurrentSkipListMap<Item,String> map = new ConcurrentSkipListMap<>();
46		assertTrue(map.isEmpty());
47		map.put(one, "A");
48		map.put(five, "E");
#	Line 68 | Line 68 | public class ConcurrentSkipListMapTest e
68		*/
69		public void testConstructFromSorted() {
70		ConcurrentSkipListMap<Item,String> map = map5();
71	<	ConcurrentSkipListMap<Item,String> map2 = new ConcurrentSkipListMap<Item,String>(map);
71	>	ConcurrentSkipListMap<Item,String> map2 = new ConcurrentSkipListMap<>(map);
72		mustEqual(map, map2);
73		}
74
#	Line 110 | Line 110 | public class ConcurrentSkipListMapTest e
110		public void testGet() {
111		ConcurrentSkipListMap<Item,String> map = map5();
112		mustEqual("A", map.get(one));
113	<	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<Item,String>();
113	>	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<>();
114		assertNull(empty.get(one));
115		}
116
#	Line 118 | Line 118 | public class ConcurrentSkipListMapTest e
118		* isEmpty is true of empty map and false for non-empty
119		*/
120		public void testIsEmpty() {
121	<	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<Item,String>();
121	>	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<>();
122		ConcurrentSkipListMap<Item,String> map = map5();
123		assertTrue(empty.isEmpty());
124		assertFalse(map.isEmpty());
#	Line 263 | Line 263 | public class ConcurrentSkipListMapTest e
263		ConcurrentSkipListMap<Item,String> map = map5();
264		Collection<String> v = map.values();
265		String[] ar = v.toArray(new String[0]);
266	<	ArrayList<String> s = new ArrayList<String>(Arrays.asList(ar));
266	>	ArrayList<String> s = new ArrayList<>(Arrays.asList(ar));
267		mustEqual(5, ar.length);
268		assertTrue(s.contains("A"));
269		assertTrue(s.contains("B"));
#	Line 356 | Line 356 | public class ConcurrentSkipListMapTest e
356		* putAll adds all key-value pairs from the given map
357		*/
358		public void testPutAll() {
359	<	ConcurrentSkipListMap<Item,String> p = new ConcurrentSkipListMap<Item,String>();
359	>	ConcurrentSkipListMap<Item,String> p = new ConcurrentSkipListMap<>();
360		ConcurrentSkipListMap<Item,String> map = map5();
361		p.putAll(map);
362		mustEqual(5, p.size());
#	Line 682 | Line 682 | public class ConcurrentSkipListMapTest e
682		*/
683		public void testSize() {
684		ConcurrentSkipListMap<Item,String> map = map5();
685	<	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<Item,String>();
685	>	ConcurrentSkipListMap<Item,String> empty = new ConcurrentSkipListMap<>();
686		mustEqual(0, empty.size());
687		mustEqual(5, map.size());
688		}
#	Line 726 | Line 726 | public class ConcurrentSkipListMapTest e
726		* containsValue(null) throws NPE
727		*/
728		public void testContainsValue_NullPointerException() {
729	<	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<Item,String>();
729	>	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<>();
730		try {
731		c.containsValue(null);
732		shouldThrow();
#	Line 781 | Line 781 | public class ConcurrentSkipListMapTest e
781		* remove(null) throws NPE
782		*/
783		public void testRemove1_NullPointerException() {
784	<	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<Item,String>();
784	>	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<>();
785		c.put(zero, "A");
786		try {
787		c.remove(null);
#	Line 793 | Line 793 | public class ConcurrentSkipListMapTest e
793		* remove(null, x) throws NPE
794		*/
795		public void testRemove2_NullPointerException() {
796	<	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<Item,String>();
796	>	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<>();
797		c.put(zero, "asdads");
798		try {
799		c.remove(null, "whatever");
#	Line 805 | Line 805 | public class ConcurrentSkipListMapTest e
805		* remove(x, null) returns false
806		*/
807		public void testRemove3() {
808	<	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<Item,String>();
808	>	ConcurrentSkipListMap<Item,String> c = new ConcurrentSkipListMap<>();
809		c.put(zero, "asdads");
810		assertFalse(c.remove("sadsdf", null));
811		}

Diff Legend

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