ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentHashMapTest.java (file contents):
Revision 1.14 by jsr166, Mon Nov 2 20:28:31 2009 UTC vs.
Revision 1.32 by jsr166, Wed Jun 12 18:09:00 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		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
10		import java.util.*;
11	<	import java.util.concurrent.*;
12	<	import java.util.Enumeration;
13	<	import java.io.*;
11	>	import java.util.concurrent.ConcurrentHashMap;
12
13	<	public class ConcurrentHashMapTest extends JSR166TestCase{
13	>	public class ConcurrentHashMapTest extends JSR166TestCase {
14		public static void main(String[] args) {
15	<	junit.textui.TestRunner.run (suite());
15	>	junit.textui.TestRunner.run(suite());
16		}
17		public static Test suite() {
18	<	return new TestSuite(ConcurrentHashMapTest.class);
18	>	return new TestSuite(ConcurrentHashMapTest.class);
19		}
20
21		/**
22	<	* Create a map from Integers 1-5 to Strings "A"-"E".
22	>	* Returns a new map from Integers 1-5 to Strings "A"-"E".
23		*/
24		private static ConcurrentHashMap map5() {
25	<	ConcurrentHashMap map = new ConcurrentHashMap(5);
25	>	ConcurrentHashMap map = new ConcurrentHashMap(5);
26		assertTrue(map.isEmpty());
27	<	map.put(one, "A");
28	<	map.put(two, "B");
29	<	map.put(three, "C");
30	<	map.put(four, "D");
31	<	map.put(five, "E");
27	>	map.put(one, "A");
28	>	map.put(two, "B");
29	>	map.put(three, "C");
30	>	map.put(four, "D");
31	>	map.put(five, "E");
32		assertFalse(map.isEmpty());
33		assertEquals(5, map.size());
34	<	return map;
34	>	return map;
35	>	}
36	>
37	>	// classes for testing Comparable fallbacks
38	>	static class BI implements Comparable<BI> {
39	>	private final int value;
40	>	BI(int value) { this.value = value; }
41	>	public int compareTo(BI other) {
42	>	return Integer.compare(value, other.value);
43	>	}
44	>	public boolean equals(Object x) {
45	>	return (x instanceof BI) && ((BI)x).value == value;
46	>	}
47	>	public int hashCode() { return 42; }
48	>	}
49	>	static class CI extends BI { CI(int value) { super(value); } }
50	>	static class DI extends BI { DI(int value) { super(value); } }
51	>
52	>	static class BS implements Comparable<BS> {
53	>	private final String value;
54	>	BS(String value) { this.value = value; }
55	>	public int compareTo(BS other) {
56	>	return value.compareTo(other.value);
57	>	}
58	>	public boolean equals(Object x) {
59	>	return (x instanceof BS) && value.equals(((BS)x).value);
60	>	}
61	>	public int hashCode() { return 42; }
62	>	}
63	>
64	>	static class LexicographicList<E extends Comparable<E>> extends ArrayList<E>
65	>	implements Comparable<LexicographicList<E>> {
66	>	LexicographicList(Collection<E> c) { super(c); }
67	>	LexicographicList(E e) { super(Collections.singleton(e)); }
68	>	public int compareTo(LexicographicList<E> other) {
69	>	int common = Math.min(size(), other.size());
70	>	int r = 0;
71	>	for (int i = 0; i < common; i++) {
72	>	if ((r = get(i).compareTo(other.get(i))) != 0)
73	>	break;
74	>	}
75	>	if (r == 0)
76	>	r = Integer.compare(size(), other.size());
77	>	return r;
78	>	}
79	>	private static final long serialVersionUID = 0;
80		}
81
82		/**
83	<	*  clear removes all pairs
83	>	* Inserted elements that are subclasses of the same Comparable
84	>	* class are found.
85	>	*/
86	>	public void testComparableFamily() {
87	>	ConcurrentHashMap<BI, Boolean> m =
88	>	new ConcurrentHashMap<BI, Boolean>();
89	>	for (int i = 0; i < 1000; i++) {
90	>	assertTrue(m.put(new CI(i), true) == null);
91	>	}
92	>	for (int i = 0; i < 1000; i++) {
93	>	assertTrue(m.containsKey(new CI(i)));
94	>	assertTrue(m.containsKey(new DI(i)));
95	>	}
96	>	}
97	>
98	>	/**
99	>	* Elements of classes with erased generic type parameters based
100	>	* on Comparable can be inserted and found.
101	>	*/
102	>	public void testGenericComparable() {
103	>	ConcurrentHashMap<Object, Boolean> m =
104	>	new ConcurrentHashMap<Object, Boolean>();
105	>	for (int i = 0; i < 1000; i++) {
106	>	BI bi = new BI(i);
107	>	BS bs = new BS(String.valueOf(i));
108	>	LexicographicList<BI> bis = new LexicographicList<BI>(bi);
109	>	LexicographicList<BS> bss = new LexicographicList<BS>(bs);
110	>	assertTrue(m.putIfAbsent(bis, true) == null);
111	>	assertTrue(m.containsKey(bis));
112	>	if (m.putIfAbsent(bss, true) == null)
113	>	assertTrue(m.containsKey(bss));
114	>	assertTrue(m.containsKey(bis));
115	>	}
116	>	for (int i = 0; i < 1000; i++) {
117	>	assertTrue(m.containsKey(new ArrayList(Collections.singleton(new BI(i)))));
118	>	}
119	>	}
120	>
121	>	/**
122	>	* Elements of non-comparable classes equal to those of classes
123	>	* with erased generic type parameters based on Comparable can be
124	>	* inserted and found.
125	>	*/
126	>	public void testGenericComparable2() {
127	>	ConcurrentHashMap<Object, Boolean> m =
128	>	new ConcurrentHashMap<Object, Boolean>();
129	>	for (int i = 0; i < 1000; i++) {
130	>	m.put(new ArrayList(Collections.singleton(new BI(i))), true);
131	>	}
132	>
133	>	for (int i = 0; i < 1000; i++) {
134	>	LexicographicList<BI> bis = new LexicographicList<BI>(new BI(i));
135	>	assertTrue(m.containsKey(bis));
136	>	}
137	>	}
138	>
139	>	/**
140	>	* clear removes all pairs
141		*/
142		public void testClear() {
143		ConcurrentHashMap map = map5();
144	<	map.clear();
145	<	assertEquals(map.size(), 0);
144	>	map.clear();
145	>	assertEquals(0, map.size());
146		}
147
148		/**
149	<	*  Maps with same contents are equal
149	>	* Maps with same contents are equal
150		*/
151		public void testEquals() {
152		ConcurrentHashMap map1 = map5();
153		ConcurrentHashMap map2 = map5();
154		assertEquals(map1, map2);
155		assertEquals(map2, map1);
156	<	map1.clear();
156	>	map1.clear();
157		assertFalse(map1.equals(map2));
158		assertFalse(map2.equals(map1));
159		}
160
161		/**
162	<	*  contains returns true for contained value
162	>	* contains returns true for contained value
163		*/
164		public void testContains() {
165		ConcurrentHashMap map = map5();
166	<	assertTrue(map.contains("A"));
166	>	assertTrue(map.contains("A"));
167		assertFalse(map.contains("Z"));
168		}
169
170		/**
171	<	*  containsKey returns true for contained key
171	>	* containsKey returns true for contained key
172		*/
173		public void testContainsKey() {
174		ConcurrentHashMap map = map5();
175	<	assertTrue(map.containsKey(one));
175	>	assertTrue(map.containsKey(one));
176		assertFalse(map.containsKey(zero));
177		}
178
179		/**
180	<	*  containsValue returns true for held values
180	>	* containsValue returns true for held values
181		*/
182		public void testContainsValue() {
183		ConcurrentHashMap map = map5();
184	<	assertTrue(map.containsValue("A"));
184	>	assertTrue(map.containsValue("A"));
185		assertFalse(map.containsValue("Z"));
186		}
187
188		/**
189	<	*   enumeration returns an enumeration containing the correct
190	<	*   elements
189	>	* enumeration returns an enumeration containing the correct
190	>	* elements
191		*/
192		public void testEnumeration() {
193		ConcurrentHashMap map = map5();
194	<	Enumeration e = map.elements();
195	<	int count = 0;
196	<	while(e.hasMoreElements()){
197	<	count++;
198	<	e.nextElement();
199	<	}
200	<	assertEquals(5, count);
194	>	Enumeration e = map.elements();
195	>	int count = 0;
196	>	while (e.hasMoreElements()) {
197	>	count++;
198	>	e.nextElement();
199	>	}
200	>	assertEquals(5, count);
201		}
202
203		/**
204	<	*  get returns the correct element at the given key,
205	<	*  or null if not present
204	>	* get returns the correct element at the given key,
205	>	* or null if not present
206		*/
207		public void testGet() {
208		ConcurrentHashMap map = map5();
209	<	assertEquals("A", (String)map.get(one));
209	>	assertEquals("A", (String)map.get(one));
210		ConcurrentHashMap empty = new ConcurrentHashMap();
211		assertNull(map.get("anything"));
212		}
213
214		/**
215	<	*  isEmpty is true of empty map and false for non-empty
215	>	* isEmpty is true of empty map and false for non-empty
216		*/
217		public void testIsEmpty() {
218		ConcurrentHashMap empty = new ConcurrentHashMap();
219		ConcurrentHashMap map = map5();
220	<	assertTrue(empty.isEmpty());
220	>	assertTrue(empty.isEmpty());
221		assertFalse(map.isEmpty());
222		}
223
224		/**
225	<	*   keys returns an enumeration containing all the keys from the map
225	>	* keys returns an enumeration containing all the keys from the map
226		*/
227		public void testKeys() {
228		ConcurrentHashMap map = map5();
229	<	Enumeration e = map.keys();
230	<	int count = 0;
231	<	while(e.hasMoreElements()){
232	<	count++;
233	<	e.nextElement();
234	<	}
235	<	assertEquals(5, count);
229	>	Enumeration e = map.keys();
230	>	int count = 0;
231	>	while (e.hasMoreElements()) {
232	>	count++;
233	>	e.nextElement();
234	>	}
235	>	assertEquals(5, count);
236		}
237
238		/**
239	<	*   keySet returns a Set containing all the keys
239	>	* keySet returns a Set containing all the keys
240		*/
241		public void testKeySet() {
242		ConcurrentHashMap map = map5();
243	<	Set s = map.keySet();
244	<	assertEquals(5, s.size());
245	<	assertTrue(s.contains(one));
246	<	assertTrue(s.contains(two));
247	<	assertTrue(s.contains(three));
248	<	assertTrue(s.contains(four));
249	<	assertTrue(s.contains(five));
243	>	Set s = map.keySet();
244	>	assertEquals(5, s.size());
245	>	assertTrue(s.contains(one));
246	>	assertTrue(s.contains(two));
247	>	assertTrue(s.contains(three));
248	>	assertTrue(s.contains(four));
249	>	assertTrue(s.contains(five));
250		}
251
252		/**
253	<	*  keySet.toArray returns contains all keys
253	>	* keySet.toArray returns contains all keys
254		*/
255		public void testKeySetToArray() {
256		ConcurrentHashMap map = map5();
257	<	Set s = map.keySet();
257	>	Set s = map.keySet();
258		Object[] ar = s.toArray();
259		assertTrue(s.containsAll(Arrays.asList(ar)));
260	<	assertEquals(5, ar.length);
260	>	assertEquals(5, ar.length);
261		ar[0] = m10;
262		assertFalse(s.containsAll(Arrays.asList(ar)));
263		}
264
265		/**
266	<	*  Values.toArray contains all values
266	>	* Values.toArray contains all values
267		*/
268		public void testValuesToArray() {
269		ConcurrentHashMap map = map5();
270	<	Collection v = map.values();
270	>	Collection v = map.values();
271		Object[] ar = v.toArray();
272		ArrayList s = new ArrayList(Arrays.asList(ar));
273	<	assertEquals(5, ar.length);
274	<	assertTrue(s.contains("A"));
275	<	assertTrue(s.contains("B"));
276	<	assertTrue(s.contains("C"));
277	<	assertTrue(s.contains("D"));
278	<	assertTrue(s.contains("E"));
273	>	assertEquals(5, ar.length);
274	>	assertTrue(s.contains("A"));
275	>	assertTrue(s.contains("B"));
276	>	assertTrue(s.contains("C"));
277	>	assertTrue(s.contains("D"));
278	>	assertTrue(s.contains("E"));
279		}
280
281		/**
282	<	*  entrySet.toArray contains all entries
282	>	* entrySet.toArray contains all entries
283		*/
284		public void testEntrySetToArray() {
285		ConcurrentHashMap map = map5();
286	<	Set s = map.entrySet();
286	>	Set s = map.entrySet();
287		Object[] ar = s.toArray();
288		assertEquals(5, ar.length);
289		for (int i = 0; i < 5; ++i) {
#	Line 197 | Line 297 | public class ConcurrentHashMapTest exten
297		*/
298		public void testValues() {
299		ConcurrentHashMap map = map5();
300	<	Collection s = map.values();
301	<	assertEquals(5, s.size());
302	<	assertTrue(s.contains("A"));
303	<	assertTrue(s.contains("B"));
304	<	assertTrue(s.contains("C"));
305	<	assertTrue(s.contains("D"));
306	<	assertTrue(s.contains("E"));
300	>	Collection s = map.values();
301	>	assertEquals(5, s.size());
302	>	assertTrue(s.contains("A"));
303	>	assertTrue(s.contains("B"));
304	>	assertTrue(s.contains("C"));
305	>	assertTrue(s.contains("D"));
306	>	assertTrue(s.contains("E"));
307		}
308
309		/**
#	Line 211 | Line 311 | public class ConcurrentHashMapTest exten
311		*/
312		public void testEntrySet() {
313		ConcurrentHashMap map = map5();
314	<	Set s = map.entrySet();
315	<	assertEquals(5, s.size());
314	>	Set s = map.entrySet();
315	>	assertEquals(5, s.size());
316		Iterator it = s.iterator();
317		while (it.hasNext()) {
318		Map.Entry e = (Map.Entry) it.next();
#	Line 226 | Line 326 | public class ConcurrentHashMapTest exten
326		}
327
328		/**
329	<	*   putAll  adds all key-value pairs from the given map
329	>	* putAll adds all key-value pairs from the given map
330		*/
331		public void testPutAll() {
332		ConcurrentHashMap empty = new ConcurrentHashMap();
333		ConcurrentHashMap map = map5();
334	<	empty.putAll(map);
335	<	assertEquals(5, empty.size());
336	<	assertTrue(empty.containsKey(one));
337	<	assertTrue(empty.containsKey(two));
338	<	assertTrue(empty.containsKey(three));
339	<	assertTrue(empty.containsKey(four));
340	<	assertTrue(empty.containsKey(five));
334	>	empty.putAll(map);
335	>	assertEquals(5, empty.size());
336	>	assertTrue(empty.containsKey(one));
337	>	assertTrue(empty.containsKey(two));
338	>	assertTrue(empty.containsKey(three));
339	>	assertTrue(empty.containsKey(four));
340	>	assertTrue(empty.containsKey(five));
341		}
342
343		/**
344	<	*   putIfAbsent works when the given key is not present
344	>	* putIfAbsent works when the given key is not present
345		*/
346		public void testPutIfAbsent() {
347		ConcurrentHashMap map = map5();
348	<	map.putIfAbsent(six, "Z");
348	>	map.putIfAbsent(six, "Z");
349		assertTrue(map.containsKey(six));
350		}
351
352		/**
353	<	*   putIfAbsent does not add the pair if the key is already present
353	>	* putIfAbsent does not add the pair if the key is already present
354		*/
355		public void testPutIfAbsent2() {
356		ConcurrentHashMap map = map5();
#	Line 258 | Line 358 | public class ConcurrentHashMapTest exten
358		}
359
360		/**
361	<	*   replace fails when the given key is not present
361	>	* replace fails when the given key is not present
362		*/
363		public void testReplace() {
364		ConcurrentHashMap map = map5();
365	<	assertNull(map.replace(six, "Z"));
365	>	assertNull(map.replace(six, "Z"));
366		assertFalse(map.containsKey(six));
367		}
368
369		/**
370	<	*   replace succeeds if the key is already present
370	>	* replace succeeds if the key is already present
371		*/
372		public void testReplace2() {
373		ConcurrentHashMap map = map5();
#	Line 275 | Line 375 | public class ConcurrentHashMapTest exten
375		assertEquals("Z", map.get(one));
376		}
377
278	–
378		/**
379		* replace value fails when the given key not mapped to expected value
380		*/
381		public void testReplaceValue() {
382		ConcurrentHashMap map = map5();
383		assertEquals("A", map.get(one));
384	<	assertFalse(map.replace(one, "Z", "Z"));
384	>	assertFalse(map.replace(one, "Z", "Z"));
385		assertEquals("A", map.get(one));
386		}
387
#	Line 292 | Line 391 | public class ConcurrentHashMapTest exten
391		public void testReplaceValue2() {
392		ConcurrentHashMap map = map5();
393		assertEquals("A", map.get(one));
394	<	assertTrue(map.replace(one, "A", "Z"));
394	>	assertTrue(map.replace(one, "A", "Z"));
395		assertEquals("Z", map.get(one));
396		}
397
299	–
398		/**
399	<	*   remove removes the correct key-value pair from the map
399	>	* remove removes the correct key-value pair from the map
400		*/
401		public void testRemove() {
402		ConcurrentHashMap map = map5();
403	<	map.remove(five);
404	<	assertEquals(4, map.size());
405	<	assertFalse(map.containsKey(five));
403	>	map.remove(five);
404	>	assertEquals(4, map.size());
405	>	assertFalse(map.containsKey(five));
406		}
407
408		/**
#	Line 312 | Line 410 | public class ConcurrentHashMapTest exten
410		*/
411		public void testRemove2() {
412		ConcurrentHashMap map = map5();
413	<	map.remove(five, "E");
414	<	assertEquals(4, map.size());
415	<	assertFalse(map.containsKey(five));
416	<	map.remove(four, "A");
417	<	assertEquals(4, map.size());
418	<	assertTrue(map.containsKey(four));
321	<
413	>	map.remove(five, "E");
414	>	assertEquals(4, map.size());
415	>	assertFalse(map.containsKey(five));
416	>	map.remove(four, "A");
417	>	assertEquals(4, map.size());
418	>	assertTrue(map.containsKey(four));
419		}
420
421		/**
422	<	*   size returns the correct values
422	>	* size returns the correct values
423		*/
424		public void testSize() {
425		ConcurrentHashMap map = map5();
426		ConcurrentHashMap empty = new ConcurrentHashMap();
427	<	assertEquals(0, empty.size());
428	<	assertEquals(5, map.size());
427	>	assertEquals(0, empty.size());
428	>	assertEquals(5, map.size());
429		}
430
431		/**
#	Line 338 | Line 435 | public class ConcurrentHashMapTest exten
435		ConcurrentHashMap map = map5();
436		String s = map.toString();
437		for (int i = 1; i <= 5; ++i) {
438	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
438	>	assertTrue(s.contains(String.valueOf(i)));
439		}
440		}
441
#	Line 351 | Line 448 | public class ConcurrentHashMapTest exten
448		try {
449		new ConcurrentHashMap(-1,0,1);
450		shouldThrow();
451	<	} catch(IllegalArgumentException e){}
451	>	} catch (IllegalArgumentException success) {}
452		}
453
454		/**
#	Line 361 | Line 458 | public class ConcurrentHashMapTest exten
458		try {
459		new ConcurrentHashMap(1,0,-1);
460		shouldThrow();
461	<	} catch(IllegalArgumentException e){}
461	>	} catch (IllegalArgumentException success) {}
462		}
463
464		/**
#	Line 371 | Line 468 | public class ConcurrentHashMapTest exten
468		try {
469		new ConcurrentHashMap(-1);
470		shouldThrow();
471	<	} catch(IllegalArgumentException e){}
471	>	} catch (IllegalArgumentException success) {}
472		}
473
474		/**
#	Line 382 | Line 479 | public class ConcurrentHashMapTest exten
479		ConcurrentHashMap c = new ConcurrentHashMap(5);
480		c.get(null);
481		shouldThrow();
482	<	} catch(NullPointerException e){}
482	>	} catch (NullPointerException success) {}
483		}
484
485		/**
#	Line 393 | Line 490 | public class ConcurrentHashMapTest exten
490		ConcurrentHashMap c = new ConcurrentHashMap(5);
491		c.containsKey(null);
492		shouldThrow();
493	<	} catch(NullPointerException e){}
493	>	} catch (NullPointerException success) {}
494		}
495
496		/**
#	Line 404 | Line 501 | public class ConcurrentHashMapTest exten
501		ConcurrentHashMap c = new ConcurrentHashMap(5);
502		c.containsValue(null);
503		shouldThrow();
504	<	} catch(NullPointerException e){}
504	>	} catch (NullPointerException success) {}
505		}
506
507		/**
#	Line 415 | Line 512 | public class ConcurrentHashMapTest exten
512		ConcurrentHashMap c = new ConcurrentHashMap(5);
513		c.contains(null);
514		shouldThrow();
515	<	} catch(NullPointerException e){}
515	>	} catch (NullPointerException success) {}
516		}
517
518		/**
#	Line 426 | Line 523 | public class ConcurrentHashMapTest exten
523		ConcurrentHashMap c = new ConcurrentHashMap(5);
524		c.put(null, "whatever");
525		shouldThrow();
526	<	} catch(NullPointerException e){}
526	>	} catch (NullPointerException success) {}
527		}
528
529		/**
#	Line 437 | Line 534 | public class ConcurrentHashMapTest exten
534		ConcurrentHashMap c = new ConcurrentHashMap(5);
535		c.put("whatever", null);
536		shouldThrow();
537	<	} catch(NullPointerException e){}
537	>	} catch (NullPointerException success) {}
538		}
539
540		/**
#	Line 448 | Line 545 | public class ConcurrentHashMapTest exten
545		ConcurrentHashMap c = new ConcurrentHashMap(5);
546		c.putIfAbsent(null, "whatever");
547		shouldThrow();
548	<	} catch(NullPointerException e){}
548	>	} catch (NullPointerException success) {}
549		}
550
551		/**
#	Line 459 | Line 556 | public class ConcurrentHashMapTest exten
556		ConcurrentHashMap c = new ConcurrentHashMap(5);
557		c.replace(null, "whatever");
558		shouldThrow();
559	<	} catch(NullPointerException e){}
559	>	} catch (NullPointerException success) {}
560		}
561
562		/**
#	Line 470 | Line 567 | public class ConcurrentHashMapTest exten
567		ConcurrentHashMap c = new ConcurrentHashMap(5);
568		c.replace(null, one, "whatever");
569		shouldThrow();
570	<	} catch(NullPointerException e){}
570	>	} catch (NullPointerException success) {}
571		}
572
573		/**
#	Line 481 | Line 578 | public class ConcurrentHashMapTest exten
578		ConcurrentHashMap c = new ConcurrentHashMap(5);
579		c.putIfAbsent("whatever", null);
580		shouldThrow();
581	<	} catch(NullPointerException e){}
581	>	} catch (NullPointerException success) {}
582		}
583
487	–
584		/**
585		* replace(x, null) throws NPE
586		*/
#	Line 493 | Line 589 | public class ConcurrentHashMapTest exten
589		ConcurrentHashMap c = new ConcurrentHashMap(5);
590		c.replace("whatever", null);
591		shouldThrow();
592	<	} catch(NullPointerException e){}
592	>	} catch (NullPointerException success) {}
593		}
594
595		/**
#	Line 504 | Line 600 | public class ConcurrentHashMapTest exten
600		ConcurrentHashMap c = new ConcurrentHashMap(5);
601		c.replace("whatever", null, "A");
602		shouldThrow();
603	<	} catch(NullPointerException e){}
603	>	} catch (NullPointerException success) {}
604		}
605
606		/**
#	Line 515 | Line 611 | public class ConcurrentHashMapTest exten
611		ConcurrentHashMap c = new ConcurrentHashMap(5);
612		c.replace("whatever", one, null);
613		shouldThrow();
614	<	} catch(NullPointerException e){}
614	>	} catch (NullPointerException success) {}
615		}
616
521	–
617		/**
618		* remove(null) throws NPE
619		*/
#	Line 528 | Line 623 | public class ConcurrentHashMapTest exten
623		c.put("sadsdf", "asdads");
624		c.remove(null);
625		shouldThrow();
626	<	} catch(NullPointerException e){}
626	>	} catch (NullPointerException success) {}
627		}
628
629		/**
#	Line 540 | Line 635 | public class ConcurrentHashMapTest exten
635		c.put("sadsdf", "asdads");
636		c.remove(null, "whatever");
637		shouldThrow();
638	<	} catch(NullPointerException e){}
638	>	} catch (NullPointerException success) {}
639		}
640
641		/**
642		* remove(x, null) returns false
643		*/
644		public void testRemove3() {
645	<	try {
646	<	ConcurrentHashMap c = new ConcurrentHashMap(5);
647	<	c.put("sadsdf", "asdads");
553	<	assertFalse(c.remove("sadsdf", null));
554	<	} catch(NullPointerException e){
555	<	fail();
556	<	}
645	>	ConcurrentHashMap c = new ConcurrentHashMap(5);
646	>	c.put("sadsdf", "asdads");
647	>	assertFalse(c.remove("sadsdf", null));
648		}
649
650		/**
651		* A deserialized map equals original
652		*/
653	<	public void testSerialization() {
654	<	ConcurrentHashMap q = map5();
655	<
656	<	try {
657	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
658	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
659	<	out.writeObject(q);
660	<	out.close();
570	<
571	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
572	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
573	<	ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
574	<	assertEquals(q.size(), r.size());
575	<	assertTrue(q.equals(r));
576	<	assertTrue(r.equals(q));
577	<	} catch(Exception e){
578	<	e.printStackTrace();
579	<	unexpectedException();
580	<	}
653	>	public void testSerialization() throws Exception {
654	>	Map x = map5();
655	>	Map y = serialClone(x);
656	>
657	>	assertNotSame(x, y);
658	>	assertEquals(x.size(), y.size());
659	>	assertEquals(x, y);
660	>	assertEquals(y, x);
661		}
662
583	–
663		/**
664		* SetValue of an EntrySet entry sets value in the map.
665		*/
#	Line 592 | Line 671 | public class ConcurrentHashMapTest exten
671		map.put(new Integer(i), new Integer(i));
672		assertFalse(map.isEmpty());
673		Map.Entry entry1 = (Map.Entry)map.entrySet().iterator().next();
674	<
675	<	// assert that entry1 is not 16
676	<	assertTrue("entry is 16, test not valid",
677	<	!entry1.getKey().equals(new Integer(16)));
678	<
679	<	// remove 16 (a different key) from map
680	<	// which just happens to cause entry1 to be cloned in map
681	<	map.remove(new Integer(16));
682	<	entry1.setValue("XYZ");
604	<	assertTrue(map.containsValue("XYZ")); // fails
674	>	// Unless it happens to be first (in which case remainder of
675	>	// test is skipped), remove a possibly-colliding key from map
676	>	// which, under some implementations, may cause entry1 to be
677	>	// cloned in map
678	>	if (!entry1.getKey().equals(new Integer(16))) {
679	>	map.remove(new Integer(16));
680	>	entry1.setValue("XYZ");
681	>	assertTrue(map.containsValue("XYZ")); // fails if write-through broken
682	>	}
683		}
684
685		}

Diff Legend

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