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.33 by jsr166, Sun Jul 14 21:41:06 2013 UTC vs.
Revision 1.34 by dl, Sat Jul 20 16:50:12 2013 UTC

#	Line 82 | Line 82 | public class ConcurrentHashMapTest exten
82		private static final long serialVersionUID = 0;
83		}
84
85	+	static class CollidingObject {
86	+	final String value;
87	+	CollidingObject(final String value) { this.value = value; }
88	+	public int hashCode() { return this.value.hashCode() & 1; }
89	+	public boolean equals(final Object obj) {
90	+	return (obj instanceof CollidingObject) && ((CollidingObject)obj).value.equals(value);
91	+	}
92	+	}
93	+
94	+	static class ComparableCollidingObject extends CollidingObject implements Comparable<ComparableCollidingObject> {
95	+	ComparableCollidingObject(final String value) { super(value); }
96	+	public int compareTo(final ComparableCollidingObject o) {
97	+	return value.compareTo(o.value);
98	+	}
99	+	}
100	+
101		/**
102		* Inserted elements that are subclasses of the same Comparable
103		* class are found.
#	Line 139 | Line 155 | public class ConcurrentHashMapTest exten
155		}
156		}
157
158	+	/**
159	+	* Mixtures of instances of comparable and non-comparable classes
160	+	* can be inserted and found.
161	+	*/
162	+	public void testMixedComparable() {
163	+	int size = 10000;
164	+	ConcurrentHashMap<Object, Object> map =
165	+	new ConcurrentHashMap<Object, Object>();
166	+	Random rng = new Random(1370014958369218000L);
167	+	for(int i = 0; i < size; i++) {
168	+	Object x;
169	+	switch(rng.nextInt(4)) {
170	+	case 0:
171	+	x = new Object();
172	+	break;
173	+	case 1:
174	+	x = new CollidingObject(Integer.toString(i));
175	+	break;
176	+	default:
177	+	x = new ComparableCollidingObject(Integer.toString(i));
178	+	}
179	+	assertNull(map.put(x, x));
180	+	}
181	+	int count = 0;
182	+	for (Object k : map.keySet()) {
183	+	assertEquals(map.get(k), k);
184	+	++count;
185	+	}
186	+	assertEquals(count, size);
187	+	assertEquals(map.size(), size);
188	+	for (Object k : map.keySet()) {
189	+	assertEquals(map.put(k, k), k);
190	+	}
191	+	}
192	+
193		/**
194		* clear removes all pairs
195		*/

Diff Legend

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