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.9 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.18 by jsr166, Sat Nov 21 10:25:05 2009 UTC

# Line 2 | Line 2
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
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# 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);
26 >    private static ConcurrentHashMap map5() {
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      /**
# Line 41 | Line 41 | public class ConcurrentHashMapTest exten
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      /**
# Line 53 | Line 53 | public class ConcurrentHashMapTest exten
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      }
# Line 63 | Line 63 | public class ConcurrentHashMapTest exten
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 <    
69 >
70      /**
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  
# Line 81 | Line 81 | public class ConcurrentHashMapTest exten
81       */
82      public void testContainsValue() {
83          ConcurrentHashMap map = map5();
84 <        assertTrue(map.contains("A"));
85 <        assertFalse(map.contains("Z"));
84 >        assertTrue(map.containsValue("A"));
85 >        assertFalse(map.containsValue("Z"));
86      }
87  
88      /**
# Line 91 | Line 91 | public class ConcurrentHashMapTest exten
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);
101 <    }
102 <
103 <    /**
104 <     *   Clone creates an equal map
105 <     */
106 <    public void testClone() {
107 <        ConcurrentHashMap map = map5();
108 <        ConcurrentHashMap m2 = (ConcurrentHashMap)(map.clone());
109 <        assertEquals(map, m2);
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      /**
# Line 115 | Line 106 | public class ConcurrentHashMapTest exten
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      }
# Line 126 | Line 117 | public class ConcurrentHashMapTest exten
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  
# Line 135 | Line 126 | public class ConcurrentHashMapTest exten
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      /**
# Line 149 | Line 140 | public class ConcurrentHashMapTest exten
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
154 >     */
155 >    public void testKeySetToArray() {
156 >        ConcurrentHashMap map = map5();
157 >        Set s = map.keySet();
158 >        Object[] ar = s.toArray();
159 >        assertTrue(s.containsAll(Arrays.asList(ar)));
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
167 >     */
168 >    public void testValuesToArray() {
169 >        ConcurrentHashMap map = map5();
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"));
179 >    }
180 >
181 >    /**
182 >     *  entrySet.toArray contains all entries
183 >     */
184 >    public void testEntrySetToArray() {
185 >        ConcurrentHashMap map = map5();
186 >        Set s = map.entrySet();
187 >        Object[] ar = s.toArray();
188 >        assertEquals(5, ar.length);
189 >        for (int i = 0; i < 5; ++i) {
190 >            assertTrue(map.containsKey(((Map.Entry)(ar[i])).getKey()));
191 >            assertTrue(map.containsValue(((Map.Entry)(ar[i])).getValue()));
192 >        }
193      }
194  
195      /**
# Line 163 | 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 177 | 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();
219 <            assertTrue(
219 >            assertTrue(
220                         (e.getKey().equals(one) && e.getValue().equals("A")) ||
221                         (e.getKey().equals(two) && e.getValue().equals("B")) ||
222                         (e.getKey().equals(three) && e.getValue().equals("C")) ||
# Line 197 | Line 231 | public class ConcurrentHashMapTest exten
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      /**
# Line 211 | Line 245 | public class ConcurrentHashMapTest exten
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  
# Line 228 | Line 262 | public class ConcurrentHashMapTest exten
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  
# Line 248 | Line 282 | public class ConcurrentHashMapTest exten
282      public void testReplaceValue() {
283          ConcurrentHashMap map = map5();
284          assertEquals("A", map.get(one));
285 <        assertFalse(map.replace(one, "Z", "Z"));
285 >        assertFalse(map.replace(one, "Z", "Z"));
286          assertEquals("A", map.get(one));
287      }
288  
# Line 258 | Line 292 | public class ConcurrentHashMapTest exten
292      public void testReplaceValue2() {
293          ConcurrentHashMap map = map5();
294          assertEquals("A", map.get(one));
295 <        assertTrue(map.replace(one, "A", "Z"));
295 >        assertTrue(map.replace(one, "A", "Z"));
296          assertEquals("Z", map.get(one));
297      }
298  
# Line 268 | Line 302 | public class ConcurrentHashMapTest exten
302       */
303      public void testRemove() {
304          ConcurrentHashMap map = map5();
305 <        map.remove(five);
306 <        assertEquals(4, map.size());
307 <        assertFalse(map.containsKey(five));
305 >        map.remove(five);
306 >        assertEquals(4, map.size());
307 >        assertFalse(map.containsKey(five));
308      }
309  
310      /**
# Line 278 | Line 312 | public class ConcurrentHashMapTest exten
312       */
313      public void testRemove2() {
314          ConcurrentHashMap map = map5();
315 <        map.remove(five, "E");
316 <        assertEquals(4, map.size());
317 <        assertFalse(map.containsKey(five));
318 <        map.remove(four, "A");
319 <        assertEquals(4, map.size());
320 <        assertTrue(map.containsKey(four));
315 >        map.remove(five, "E");
316 >        assertEquals(4, map.size());
317 >        assertFalse(map.containsKey(five));
318 >        map.remove(four, "A");
319 >        assertEquals(4, map.size());
320 >        assertTrue(map.containsKey(four));
321  
322      }
323  
# Line 293 | Line 327 | public class ConcurrentHashMapTest exten
327      public void testSize() {
328          ConcurrentHashMap map = map5();
329          ConcurrentHashMap empty = new ConcurrentHashMap();
330 <        assertEquals(0, empty.size());
331 <        assertEquals(5, map.size());
330 >        assertEquals(0, empty.size());
331 >        assertEquals(5, map.size());
332      }
333  
334      /**
# Line 306 | Line 340 | public class ConcurrentHashMapTest exten
340          for (int i = 1; i <= 5; ++i) {
341              assertTrue(s.indexOf(String.valueOf(i)) >= 0);
342          }
343 <    }        
343 >    }
344  
345      // Exception tests
346 <    
346 >
347      /**
348 <     * Cannot create with negative capacity
348 >     * Cannot create with negative capacity
349       */
350      public void testConstructor1() {
351          try {
352              new ConcurrentHashMap(-1,0,1);
353              shouldThrow();
354 <        } catch(IllegalArgumentException e){}
354 >        } catch (IllegalArgumentException e) {}
355      }
356  
357      /**
# Line 327 | Line 361 | public class ConcurrentHashMapTest exten
361          try {
362              new ConcurrentHashMap(1,0,-1);
363              shouldThrow();
364 <        } catch(IllegalArgumentException e){}
364 >        } catch (IllegalArgumentException e) {}
365      }
366  
367      /**
# Line 337 | Line 371 | public class ConcurrentHashMapTest exten
371          try {
372              new ConcurrentHashMap(-1);
373              shouldThrow();
374 <        } catch(IllegalArgumentException e){}
374 >        } catch (IllegalArgumentException e) {}
375      }
376  
377      /**
# Line 348 | Line 382 | public class ConcurrentHashMapTest exten
382              ConcurrentHashMap c = new ConcurrentHashMap(5);
383              c.get(null);
384              shouldThrow();
385 <        } catch(NullPointerException e){}
385 >        } catch (NullPointerException e) {}
386      }
387  
388      /**
# Line 359 | Line 393 | public class ConcurrentHashMapTest exten
393              ConcurrentHashMap c = new ConcurrentHashMap(5);
394              c.containsKey(null);
395              shouldThrow();
396 <        } catch(NullPointerException e){}
396 >        } catch (NullPointerException e) {}
397      }
398  
399      /**
# Line 370 | Line 404 | public class ConcurrentHashMapTest exten
404              ConcurrentHashMap c = new ConcurrentHashMap(5);
405              c.containsValue(null);
406              shouldThrow();
407 <        } catch(NullPointerException e){}
407 >        } catch (NullPointerException e) {}
408      }
409  
410      /**
# Line 381 | Line 415 | public class ConcurrentHashMapTest exten
415              ConcurrentHashMap c = new ConcurrentHashMap(5);
416              c.contains(null);
417              shouldThrow();
418 <        } catch(NullPointerException e){}
418 >        } catch (NullPointerException e) {}
419      }
420  
421      /**
# Line 392 | Line 426 | public class ConcurrentHashMapTest exten
426              ConcurrentHashMap c = new ConcurrentHashMap(5);
427              c.put(null, "whatever");
428              shouldThrow();
429 <        } catch(NullPointerException e){}
429 >        } catch (NullPointerException e) {}
430      }
431  
432      /**
# Line 403 | Line 437 | public class ConcurrentHashMapTest exten
437              ConcurrentHashMap c = new ConcurrentHashMap(5);
438              c.put("whatever", null);
439              shouldThrow();
440 <        } catch(NullPointerException e){}
440 >        } catch (NullPointerException e) {}
441      }
442  
443      /**
# Line 414 | Line 448 | public class ConcurrentHashMapTest exten
448              ConcurrentHashMap c = new ConcurrentHashMap(5);
449              c.putIfAbsent(null, "whatever");
450              shouldThrow();
451 <        } catch(NullPointerException e){}
451 >        } catch (NullPointerException e) {}
452      }
453  
454      /**
# Line 425 | Line 459 | public class ConcurrentHashMapTest exten
459              ConcurrentHashMap c = new ConcurrentHashMap(5);
460              c.replace(null, "whatever");
461              shouldThrow();
462 <        } catch(NullPointerException e){}
462 >        } catch (NullPointerException e) {}
463      }
464  
465      /**
# Line 436 | Line 470 | public class ConcurrentHashMapTest exten
470              ConcurrentHashMap c = new ConcurrentHashMap(5);
471              c.replace(null, one, "whatever");
472              shouldThrow();
473 <        } catch(NullPointerException e){}
473 >        } catch (NullPointerException e) {}
474      }
475  
476      /**
# Line 447 | Line 481 | public class ConcurrentHashMapTest exten
481              ConcurrentHashMap c = new ConcurrentHashMap(5);
482              c.putIfAbsent("whatever", null);
483              shouldThrow();
484 <        } catch(NullPointerException e){}
484 >        } catch (NullPointerException e) {}
485      }
486  
487  
# Line 459 | Line 493 | public class ConcurrentHashMapTest exten
493              ConcurrentHashMap c = new ConcurrentHashMap(5);
494              c.replace("whatever", null);
495              shouldThrow();
496 <        } catch(NullPointerException e){}
496 >        } catch (NullPointerException e) {}
497      }
498  
499      /**
# Line 470 | Line 504 | public class ConcurrentHashMapTest exten
504              ConcurrentHashMap c = new ConcurrentHashMap(5);
505              c.replace("whatever", null, "A");
506              shouldThrow();
507 <        } catch(NullPointerException e){}
507 >        } catch (NullPointerException e) {}
508      }
509  
510      /**
# Line 481 | Line 515 | public class ConcurrentHashMapTest exten
515              ConcurrentHashMap c = new ConcurrentHashMap(5);
516              c.replace("whatever", one, null);
517              shouldThrow();
518 <        } catch(NullPointerException e){}
518 >        } catch (NullPointerException e) {}
519      }
520  
521  
# Line 494 | Line 528 | public class ConcurrentHashMapTest exten
528              c.put("sadsdf", "asdads");
529              c.remove(null);
530              shouldThrow();
531 <        } catch(NullPointerException e){}
531 >        } catch (NullPointerException e) {}
532      }
533  
534      /**
# Line 506 | Line 540 | public class ConcurrentHashMapTest exten
540              c.put("sadsdf", "asdads");
541              c.remove(null, "whatever");
542              shouldThrow();
543 <        } catch(NullPointerException e){}
543 >        } catch (NullPointerException e) {}
544 >    }
545 >
546 >    /**
547 >     * remove(x, null) returns false
548 >     */
549 >    public void testRemove3() {
550 >        try {
551 >            ConcurrentHashMap c = new ConcurrentHashMap(5);
552 >            c.put("sadsdf", "asdads");
553 >            assertFalse(c.remove("sadsdf", null));
554 >        } catch (NullPointerException e) {
555 >            fail();
556 >        }
557      }
558  
559      /**
560       * A deserialized map equals original
561       */
562 <    public void testSerialization() {
562 >    public void testSerialization() throws Exception {
563          ConcurrentHashMap q = map5();
564  
565 <        try {
566 <            ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
567 <            ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
568 <            out.writeObject(q);
569 <            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));
529 <            assertTrue(r.equals(q));
530 <        } catch(Exception e){
531 <            e.printStackTrace();
532 <            unexpectedException();
533 <        }
565 >        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
566 >        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
567 >        out.writeObject(q);
568 >        out.close();
569 >
570 >        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
571 >        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
572 >        ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
573 >        assertEquals(q.size(), r.size());
574 >        assertTrue(q.equals(r));
575 >        assertTrue(r.equals(q));
576      }
577  
578  
# Line 538 | Line 580 | public class ConcurrentHashMapTest exten
580       * SetValue of an EntrySet entry sets value in the map.
581       */
582      public void testSetValueWriteThrough() {
583 <        // Adapted from a bug report by Eric Zoerner
583 >        // Adapted from a bug report by Eric Zoerner
584          ConcurrentHashMap map = new ConcurrentHashMap(2, 5.0f, 1);
585          assertTrue(map.isEmpty());
586          for (int i = 0; i < 20; i++)
587              map.put(new Integer(i), new Integer(i));
588          assertFalse(map.isEmpty());
589          Map.Entry entry1 = (Map.Entry)map.entrySet().iterator().next();
590 <        
590 >
591          // assert that entry1 is not 16
592          assertTrue("entry is 16, test not valid",
593                     !entry1.getKey().equals(new Integer(16)));
594 <        
595 <        // remove 16 (a different key) from map
594 >
595 >        // remove 16 (a different key) from map
596          // which just happens to cause entry1 to be cloned in map
597          map.remove(new Integer(16));
598          entry1.setValue("XYZ");
599          assertTrue(map.containsValue("XYZ")); // fails
600      }
601 <    
601 >
602   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines