ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ConcurrentHashMapTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ConcurrentHashMapTest.java (file contents):
Revision 1.15 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.24 by jsr166, Fri May 27 19:26:42 2011 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   */
# Line 12 | Line 12 | import java.util.concurrent.*;
12   import java.util.Enumeration;
13   import java.io.*;
14  
15 < public class ConcurrentHashMapTest extends JSR166TestCase{
15 > public class ConcurrentHashMapTest extends JSR166TestCase {
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());
17 >        junit.textui.TestRunner.run(suite());
18      }
19      public static Test suite() {
20 <        return new TestSuite(ConcurrentHashMapTest.class);
20 >        return new TestSuite(ConcurrentHashMapTest.class);
21      }
22  
23      /**
24       * Create a map from Integers 1-5 to Strings "A"-"E".
25       */
26      private static ConcurrentHashMap map5() {
27 <        ConcurrentHashMap map = new ConcurrentHashMap(5);
27 >        ConcurrentHashMap map = new ConcurrentHashMap(5);
28          assertTrue(map.isEmpty());
29 <        map.put(one, "A");
30 <        map.put(two, "B");
31 <        map.put(three, "C");
32 <        map.put(four, "D");
33 <        map.put(five, "E");
29 >        map.put(one, "A");
30 >        map.put(two, "B");
31 >        map.put(three, "C");
32 >        map.put(four, "D");
33 >        map.put(five, "E");
34          assertFalse(map.isEmpty());
35          assertEquals(5, map.size());
36 <        return map;
36 >        return map;
37      }
38  
39      /**
40 <     *  clear removes all pairs
40 >     * clear removes all pairs
41       */
42      public void testClear() {
43          ConcurrentHashMap map = map5();
44 <        map.clear();
45 <        assertEquals(map.size(), 0);
44 >        map.clear();
45 >        assertEquals(map.size(), 0);
46      }
47  
48      /**
49 <     *  Maps with same contents are equal
49 >     * Maps with same contents are equal
50       */
51      public void testEquals() {
52          ConcurrentHashMap map1 = map5();
53          ConcurrentHashMap map2 = map5();
54          assertEquals(map1, map2);
55          assertEquals(map2, map1);
56 <        map1.clear();
56 >        map1.clear();
57          assertFalse(map1.equals(map2));
58          assertFalse(map2.equals(map1));
59      }
60  
61      /**
62 <     *  contains returns true for contained value
62 >     * contains returns true for contained value
63       */
64      public void testContains() {
65          ConcurrentHashMap map = map5();
66 <        assertTrue(map.contains("A"));
66 >        assertTrue(map.contains("A"));
67          assertFalse(map.contains("Z"));
68      }
69  
70      /**
71 <     *  containsKey returns true for contained key
71 >     * containsKey returns true for contained key
72       */
73      public void testContainsKey() {
74          ConcurrentHashMap map = map5();
75 <        assertTrue(map.containsKey(one));
75 >        assertTrue(map.containsKey(one));
76          assertFalse(map.containsKey(zero));
77      }
78  
79      /**
80 <     *  containsValue returns true for held values
80 >     * containsValue returns true for held values
81       */
82      public void testContainsValue() {
83          ConcurrentHashMap map = map5();
84 <        assertTrue(map.containsValue("A"));
84 >        assertTrue(map.containsValue("A"));
85          assertFalse(map.containsValue("Z"));
86      }
87  
88      /**
89 <     *   enumeration returns an enumeration containing the correct
90 <     *   elements
89 >     * enumeration returns an enumeration containing the correct
90 >     * elements
91       */
92      public void testEnumeration() {
93          ConcurrentHashMap map = map5();
94 <        Enumeration e = map.elements();
95 <        int count = 0;
96 <        while (e.hasMoreElements()){
97 <            count++;
98 <            e.nextElement();
99 <        }
100 <        assertEquals(5, count);
94 >        Enumeration e = map.elements();
95 >        int count = 0;
96 >        while (e.hasMoreElements()) {
97 >            count++;
98 >            e.nextElement();
99 >        }
100 >        assertEquals(5, count);
101      }
102  
103      /**
104 <     *  get returns the correct element at the given key,
105 <     *  or null if not present
104 >     * get returns the correct element at the given key,
105 >     * or null if not present
106       */
107      public void testGet() {
108          ConcurrentHashMap map = map5();
109 <        assertEquals("A", (String)map.get(one));
109 >        assertEquals("A", (String)map.get(one));
110          ConcurrentHashMap empty = new ConcurrentHashMap();
111          assertNull(map.get("anything"));
112      }
113  
114      /**
115 <     *  isEmpty is true of empty map and false for non-empty
115 >     * isEmpty is true of empty map and false for non-empty
116       */
117      public void testIsEmpty() {
118          ConcurrentHashMap empty = new ConcurrentHashMap();
119          ConcurrentHashMap map = map5();
120 <        assertTrue(empty.isEmpty());
120 >        assertTrue(empty.isEmpty());
121          assertFalse(map.isEmpty());
122      }
123  
124      /**
125 <     *   keys returns an enumeration containing all the keys from the map
125 >     * keys returns an enumeration containing all the keys from the map
126       */
127      public void testKeys() {
128          ConcurrentHashMap map = map5();
129 <        Enumeration e = map.keys();
130 <        int count = 0;
131 <        while (e.hasMoreElements()){
132 <            count++;
133 <            e.nextElement();
134 <        }
135 <        assertEquals(5, count);
129 >        Enumeration e = map.keys();
130 >        int count = 0;
131 >        while (e.hasMoreElements()) {
132 >            count++;
133 >            e.nextElement();
134 >        }
135 >        assertEquals(5, count);
136      }
137  
138      /**
139 <     *   keySet returns a Set containing all the keys
139 >     * keySet returns a Set containing all the keys
140       */
141      public void testKeySet() {
142          ConcurrentHashMap map = map5();
143 <        Set s = map.keySet();
144 <        assertEquals(5, s.size());
145 <        assertTrue(s.contains(one));
146 <        assertTrue(s.contains(two));
147 <        assertTrue(s.contains(three));
148 <        assertTrue(s.contains(four));
149 <        assertTrue(s.contains(five));
143 >        Set s = map.keySet();
144 >        assertEquals(5, s.size());
145 >        assertTrue(s.contains(one));
146 >        assertTrue(s.contains(two));
147 >        assertTrue(s.contains(three));
148 >        assertTrue(s.contains(four));
149 >        assertTrue(s.contains(five));
150      }
151  
152      /**
153 <     *  keySet.toArray returns contains all keys
153 >     * keySet.toArray returns contains all keys
154       */
155      public void testKeySetToArray() {
156          ConcurrentHashMap map = map5();
157 <        Set s = map.keySet();
157 >        Set s = map.keySet();
158          Object[] ar = s.toArray();
159          assertTrue(s.containsAll(Arrays.asList(ar)));
160 <        assertEquals(5, ar.length);
160 >        assertEquals(5, ar.length);
161          ar[0] = m10;
162          assertFalse(s.containsAll(Arrays.asList(ar)));
163      }
164  
165      /**
166 <     *  Values.toArray contains all values
166 >     * Values.toArray contains all values
167       */
168      public void testValuesToArray() {
169          ConcurrentHashMap map = map5();
170 <        Collection v = map.values();
170 >        Collection v = map.values();
171          Object[] ar = v.toArray();
172          ArrayList s = new ArrayList(Arrays.asList(ar));
173 <        assertEquals(5, ar.length);
174 <        assertTrue(s.contains("A"));
175 <        assertTrue(s.contains("B"));
176 <        assertTrue(s.contains("C"));
177 <        assertTrue(s.contains("D"));
178 <        assertTrue(s.contains("E"));
173 >        assertEquals(5, ar.length);
174 >        assertTrue(s.contains("A"));
175 >        assertTrue(s.contains("B"));
176 >        assertTrue(s.contains("C"));
177 >        assertTrue(s.contains("D"));
178 >        assertTrue(s.contains("E"));
179      }
180  
181      /**
182 <     *  entrySet.toArray contains all entries
182 >     * entrySet.toArray contains all entries
183       */
184      public void testEntrySetToArray() {
185          ConcurrentHashMap map = map5();
186 <        Set s = map.entrySet();
186 >        Set s = map.entrySet();
187          Object[] ar = s.toArray();
188          assertEquals(5, ar.length);
189          for (int i = 0; i < 5; ++i) {
# Line 197 | Line 197 | public class ConcurrentHashMapTest exten
197       */
198      public void testValues() {
199          ConcurrentHashMap map = map5();
200 <        Collection s = map.values();
201 <        assertEquals(5, s.size());
202 <        assertTrue(s.contains("A"));
203 <        assertTrue(s.contains("B"));
204 <        assertTrue(s.contains("C"));
205 <        assertTrue(s.contains("D"));
206 <        assertTrue(s.contains("E"));
200 >        Collection s = map.values();
201 >        assertEquals(5, s.size());
202 >        assertTrue(s.contains("A"));
203 >        assertTrue(s.contains("B"));
204 >        assertTrue(s.contains("C"));
205 >        assertTrue(s.contains("D"));
206 >        assertTrue(s.contains("E"));
207      }
208  
209      /**
# Line 211 | Line 211 | public class ConcurrentHashMapTest exten
211       */
212      public void testEntrySet() {
213          ConcurrentHashMap map = map5();
214 <        Set s = map.entrySet();
215 <        assertEquals(5, s.size());
214 >        Set s = map.entrySet();
215 >        assertEquals(5, s.size());
216          Iterator it = s.iterator();
217          while (it.hasNext()) {
218              Map.Entry e = (Map.Entry) it.next();
# Line 226 | Line 226 | public class ConcurrentHashMapTest exten
226      }
227  
228      /**
229 <     *   putAll  adds all key-value pairs from the given map
229 >     * putAll adds all key-value pairs from the given map
230       */
231      public void testPutAll() {
232          ConcurrentHashMap empty = new ConcurrentHashMap();
233          ConcurrentHashMap map = map5();
234 <        empty.putAll(map);
235 <        assertEquals(5, empty.size());
236 <        assertTrue(empty.containsKey(one));
237 <        assertTrue(empty.containsKey(two));
238 <        assertTrue(empty.containsKey(three));
239 <        assertTrue(empty.containsKey(four));
240 <        assertTrue(empty.containsKey(five));
234 >        empty.putAll(map);
235 >        assertEquals(5, empty.size());
236 >        assertTrue(empty.containsKey(one));
237 >        assertTrue(empty.containsKey(two));
238 >        assertTrue(empty.containsKey(three));
239 >        assertTrue(empty.containsKey(four));
240 >        assertTrue(empty.containsKey(five));
241      }
242  
243      /**
244 <     *   putIfAbsent works when the given key is not present
244 >     * putIfAbsent works when the given key is not present
245       */
246      public void testPutIfAbsent() {
247          ConcurrentHashMap map = map5();
248 <        map.putIfAbsent(six, "Z");
248 >        map.putIfAbsent(six, "Z");
249          assertTrue(map.containsKey(six));
250      }
251  
252      /**
253 <     *   putIfAbsent does not add the pair if the key is already present
253 >     * putIfAbsent does not add the pair if the key is already present
254       */
255      public void testPutIfAbsent2() {
256          ConcurrentHashMap map = map5();
# Line 258 | Line 258 | public class ConcurrentHashMapTest exten
258      }
259  
260      /**
261 <     *   replace fails when the given key is not present
261 >     * replace fails when the given key is not present
262       */
263      public void testReplace() {
264          ConcurrentHashMap map = map5();
265 <        assertNull(map.replace(six, "Z"));
265 >        assertNull(map.replace(six, "Z"));
266          assertFalse(map.containsKey(six));
267      }
268  
269      /**
270 <     *   replace succeeds if the key is already present
270 >     * replace succeeds if the key is already present
271       */
272      public void testReplace2() {
273          ConcurrentHashMap map = map5();
# Line 275 | Line 275 | public class ConcurrentHashMapTest exten
275          assertEquals("Z", map.get(one));
276      }
277  
278
278      /**
279       * replace value fails when the given key not mapped to expected value
280       */
281      public void testReplaceValue() {
282          ConcurrentHashMap map = map5();
283          assertEquals("A", map.get(one));
284 <        assertFalse(map.replace(one, "Z", "Z"));
284 >        assertFalse(map.replace(one, "Z", "Z"));
285          assertEquals("A", map.get(one));
286      }
287  
# Line 292 | Line 291 | public class ConcurrentHashMapTest exten
291      public void testReplaceValue2() {
292          ConcurrentHashMap map = map5();
293          assertEquals("A", map.get(one));
294 <        assertTrue(map.replace(one, "A", "Z"));
294 >        assertTrue(map.replace(one, "A", "Z"));
295          assertEquals("Z", map.get(one));
296      }
297  
299
298      /**
299 <     *   remove removes the correct key-value pair from the map
299 >     * remove removes the correct key-value pair from the map
300       */
301      public void testRemove() {
302          ConcurrentHashMap map = map5();
303 <        map.remove(five);
304 <        assertEquals(4, map.size());
305 <        assertFalse(map.containsKey(five));
303 >        map.remove(five);
304 >        assertEquals(4, map.size());
305 >        assertFalse(map.containsKey(five));
306      }
307  
308      /**
# Line 312 | Line 310 | public class ConcurrentHashMapTest exten
310       */
311      public void testRemove2() {
312          ConcurrentHashMap map = map5();
313 <        map.remove(five, "E");
314 <        assertEquals(4, map.size());
315 <        assertFalse(map.containsKey(five));
316 <        map.remove(four, "A");
317 <        assertEquals(4, map.size());
318 <        assertTrue(map.containsKey(four));
321 <
313 >        map.remove(five, "E");
314 >        assertEquals(4, map.size());
315 >        assertFalse(map.containsKey(five));
316 >        map.remove(four, "A");
317 >        assertEquals(4, map.size());
318 >        assertTrue(map.containsKey(four));
319      }
320  
321      /**
322 <     *   size returns the correct values
322 >     * size returns the correct values
323       */
324      public void testSize() {
325          ConcurrentHashMap map = map5();
326          ConcurrentHashMap empty = new ConcurrentHashMap();
327 <        assertEquals(0, empty.size());
328 <        assertEquals(5, map.size());
327 >        assertEquals(0, empty.size());
328 >        assertEquals(5, map.size());
329      }
330  
331      /**
# Line 338 | Line 335 | public class ConcurrentHashMapTest exten
335          ConcurrentHashMap map = map5();
336          String s = map.toString();
337          for (int i = 1; i <= 5; ++i) {
338 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
338 >            assertTrue(s.contains(String.valueOf(i)));
339          }
340      }
341  
# Line 351 | Line 348 | public class ConcurrentHashMapTest exten
348          try {
349              new ConcurrentHashMap(-1,0,1);
350              shouldThrow();
351 <        } catch (IllegalArgumentException e){}
351 >        } catch (IllegalArgumentException success) {}
352      }
353  
354      /**
# Line 361 | Line 358 | public class ConcurrentHashMapTest exten
358          try {
359              new ConcurrentHashMap(1,0,-1);
360              shouldThrow();
361 <        } catch (IllegalArgumentException e){}
361 >        } catch (IllegalArgumentException success) {}
362      }
363  
364      /**
# Line 371 | Line 368 | public class ConcurrentHashMapTest exten
368          try {
369              new ConcurrentHashMap(-1);
370              shouldThrow();
371 <        } catch (IllegalArgumentException e){}
371 >        } catch (IllegalArgumentException success) {}
372      }
373  
374      /**
# Line 382 | Line 379 | public class ConcurrentHashMapTest exten
379              ConcurrentHashMap c = new ConcurrentHashMap(5);
380              c.get(null);
381              shouldThrow();
382 <        } catch (NullPointerException e){}
382 >        } catch (NullPointerException success) {}
383      }
384  
385      /**
# Line 393 | Line 390 | public class ConcurrentHashMapTest exten
390              ConcurrentHashMap c = new ConcurrentHashMap(5);
391              c.containsKey(null);
392              shouldThrow();
393 <        } catch (NullPointerException e){}
393 >        } catch (NullPointerException success) {}
394      }
395  
396      /**
# Line 404 | Line 401 | public class ConcurrentHashMapTest exten
401              ConcurrentHashMap c = new ConcurrentHashMap(5);
402              c.containsValue(null);
403              shouldThrow();
404 <        } catch (NullPointerException e){}
404 >        } catch (NullPointerException success) {}
405      }
406  
407      /**
# Line 415 | Line 412 | public class ConcurrentHashMapTest exten
412              ConcurrentHashMap c = new ConcurrentHashMap(5);
413              c.contains(null);
414              shouldThrow();
415 <        } catch (NullPointerException e){}
415 >        } catch (NullPointerException success) {}
416      }
417  
418      /**
# Line 426 | Line 423 | public class ConcurrentHashMapTest exten
423              ConcurrentHashMap c = new ConcurrentHashMap(5);
424              c.put(null, "whatever");
425              shouldThrow();
426 <        } catch (NullPointerException e){}
426 >        } catch (NullPointerException success) {}
427      }
428  
429      /**
# Line 437 | Line 434 | public class ConcurrentHashMapTest exten
434              ConcurrentHashMap c = new ConcurrentHashMap(5);
435              c.put("whatever", null);
436              shouldThrow();
437 <        } catch (NullPointerException e){}
437 >        } catch (NullPointerException success) {}
438      }
439  
440      /**
# Line 448 | Line 445 | public class ConcurrentHashMapTest exten
445              ConcurrentHashMap c = new ConcurrentHashMap(5);
446              c.putIfAbsent(null, "whatever");
447              shouldThrow();
448 <        } catch (NullPointerException e){}
448 >        } catch (NullPointerException success) {}
449      }
450  
451      /**
# Line 459 | Line 456 | public class ConcurrentHashMapTest exten
456              ConcurrentHashMap c = new ConcurrentHashMap(5);
457              c.replace(null, "whatever");
458              shouldThrow();
459 <        } catch (NullPointerException e){}
459 >        } catch (NullPointerException success) {}
460      }
461  
462      /**
# Line 470 | Line 467 | public class ConcurrentHashMapTest exten
467              ConcurrentHashMap c = new ConcurrentHashMap(5);
468              c.replace(null, one, "whatever");
469              shouldThrow();
470 <        } catch (NullPointerException e){}
470 >        } catch (NullPointerException success) {}
471      }
472  
473      /**
# Line 481 | Line 478 | public class ConcurrentHashMapTest exten
478              ConcurrentHashMap c = new ConcurrentHashMap(5);
479              c.putIfAbsent("whatever", null);
480              shouldThrow();
481 <        } catch (NullPointerException e){}
481 >        } catch (NullPointerException success) {}
482      }
483  
487
484      /**
485       * replace(x, null) throws NPE
486       */
# Line 493 | Line 489 | public class ConcurrentHashMapTest exten
489              ConcurrentHashMap c = new ConcurrentHashMap(5);
490              c.replace("whatever", null);
491              shouldThrow();
492 <        } catch (NullPointerException e){}
492 >        } catch (NullPointerException success) {}
493      }
494  
495      /**
# Line 504 | Line 500 | public class ConcurrentHashMapTest exten
500              ConcurrentHashMap c = new ConcurrentHashMap(5);
501              c.replace("whatever", null, "A");
502              shouldThrow();
503 <        } catch (NullPointerException e){}
503 >        } catch (NullPointerException success) {}
504      }
505  
506      /**
# Line 515 | Line 511 | public class ConcurrentHashMapTest exten
511              ConcurrentHashMap c = new ConcurrentHashMap(5);
512              c.replace("whatever", one, null);
513              shouldThrow();
514 <        } catch (NullPointerException e){}
514 >        } catch (NullPointerException success) {}
515      }
516  
521
517      /**
518       * remove(null) throws NPE
519       */
# Line 528 | Line 523 | public class ConcurrentHashMapTest exten
523              c.put("sadsdf", "asdads");
524              c.remove(null);
525              shouldThrow();
526 <        } catch (NullPointerException e){}
526 >        } catch (NullPointerException success) {}
527      }
528  
529      /**
# Line 540 | Line 535 | public class ConcurrentHashMapTest exten
535              c.put("sadsdf", "asdads");
536              c.remove(null, "whatever");
537              shouldThrow();
538 <        } catch (NullPointerException e){}
538 >        } catch (NullPointerException success) {}
539      }
540  
541      /**
542       * remove(x, null) returns false
543       */
544      public void testRemove3() {
545 <        try {
546 <            ConcurrentHashMap c = new ConcurrentHashMap(5);
547 <            c.put("sadsdf", "asdads");
553 <            assertFalse(c.remove("sadsdf", null));
554 <        } catch (NullPointerException e){
555 <            fail();
556 <        }
545 >        ConcurrentHashMap c = new ConcurrentHashMap(5);
546 >        c.put("sadsdf", "asdads");
547 >        assertFalse(c.remove("sadsdf", null));
548      }
549  
550      /**
551       * A deserialized map equals original
552       */
553 <    public void testSerialization() {
553 >    public void testSerialization() throws Exception {
554          ConcurrentHashMap q = map5();
555  
556 <        try {
557 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
558 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
559 <            out.writeObject(q);
560 <            out.close();
561 <
562 <            ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
563 <            ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
564 <            ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
565 <            assertEquals(q.size(), r.size());
566 <            assertTrue(q.equals(r));
576 <            assertTrue(r.equals(q));
577 <        } catch (Exception e){
578 <            e.printStackTrace();
579 <            unexpectedException();
580 <        }
556 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
557 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
558 >        out.writeObject(q);
559 >        out.close();
560 >
561 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
562 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
563 >        ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
564 >        assertEquals(q.size(), r.size());
565 >        assertTrue(q.equals(r));
566 >        assertTrue(r.equals(q));
567      }
568  
583
569      /**
570       * SetValue of an EntrySet entry sets value in the map.
571       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines