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.23 by jsr166, Tue Mar 15 19:47:06 2011 UTC vs.
Revision 1.34 by dl, Sat Jul 20 16:50:12 2013 UTC

# Line 8 | Line 8
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 {
14      public static void main(String[] args) {
# Line 21 | Line 19 | public class ConcurrentHashMapTest exten
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);
# Line 36 | Line 34 | public class ConcurrentHashMapTest exten
34          return map;
35      }
36  
37 +    /** Re-implement Integer.compare for old java versions */
38 +    static int compare(int x, int y) { return x < y ? -1 : x > y ? 1 : 0; }
39 +
40 +    // classes for testing Comparable fallbacks
41 +    static class BI implements Comparable<BI> {
42 +        private final int value;
43 +        BI(int value) { this.value = value; }
44 +        public int compareTo(BI other) {
45 +            return compare(value, other.value);
46 +        }
47 +        public boolean equals(Object x) {
48 +            return (x instanceof BI) && ((BI)x).value == value;
49 +        }
50 +        public int hashCode() { return 42; }
51 +    }
52 +    static class CI extends BI { CI(int value) { super(value); } }
53 +    static class DI extends BI { DI(int value) { super(value); } }
54 +
55 +    static class BS implements Comparable<BS> {
56 +        private final String value;
57 +        BS(String value) { this.value = value; }
58 +        public int compareTo(BS other) {
59 +            return value.compareTo(other.value);
60 +        }
61 +        public boolean equals(Object x) {
62 +            return (x instanceof BS) && value.equals(((BS)x).value);
63 +        }
64 +        public int hashCode() { return 42; }
65 +    }
66 +
67 +    static class LexicographicList<E extends Comparable<E>> extends ArrayList<E>
68 +        implements Comparable<LexicographicList<E>> {
69 +        LexicographicList(Collection<E> c) { super(c); }
70 +        LexicographicList(E e) { super(Collections.singleton(e)); }
71 +        public int compareTo(LexicographicList<E> other) {
72 +            int common = Math.min(size(), other.size());
73 +            int r = 0;
74 +            for (int i = 0; i < common; i++) {
75 +                if ((r = get(i).compareTo(other.get(i))) != 0)
76 +                    break;
77 +            }
78 +            if (r == 0)
79 +                r = compare(size(), other.size());
80 +            return r;
81 +        }
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.
104 +     */
105 +    public void testComparableFamily() {
106 +        ConcurrentHashMap<BI, Boolean> m =
107 +            new ConcurrentHashMap<BI, Boolean>();
108 +        for (int i = 0; i < 1000; i++) {
109 +            assertTrue(m.put(new CI(i), true) == null);
110 +        }
111 +        for (int i = 0; i < 1000; i++) {
112 +            assertTrue(m.containsKey(new CI(i)));
113 +            assertTrue(m.containsKey(new DI(i)));
114 +        }
115 +    }
116 +
117 +    /**
118 +     * Elements of classes with erased generic type parameters based
119 +     * on Comparable can be inserted and found.
120 +     */
121 +    public void testGenericComparable() {
122 +        ConcurrentHashMap<Object, Boolean> m =
123 +            new ConcurrentHashMap<Object, Boolean>();
124 +        for (int i = 0; i < 1000; i++) {
125 +            BI bi = new BI(i);
126 +            BS bs = new BS(String.valueOf(i));
127 +            LexicographicList<BI> bis = new LexicographicList<BI>(bi);
128 +            LexicographicList<BS> bss = new LexicographicList<BS>(bs);
129 +            assertTrue(m.putIfAbsent(bis, true) == null);
130 +            assertTrue(m.containsKey(bis));
131 +            if (m.putIfAbsent(bss, true) == null)
132 +                assertTrue(m.containsKey(bss));
133 +            assertTrue(m.containsKey(bis));
134 +        }
135 +        for (int i = 0; i < 1000; i++) {
136 +            assertTrue(m.containsKey(new ArrayList(Collections.singleton(new BI(i)))));
137 +        }
138 +    }
139 +
140 +    /**
141 +     * Elements of non-comparable classes equal to those of classes
142 +     * with erased generic type parameters based on Comparable can be
143 +     * inserted and found.
144 +     */
145 +    public void testGenericComparable2() {
146 +        ConcurrentHashMap<Object, Boolean> m =
147 +            new ConcurrentHashMap<Object, Boolean>();
148 +        for (int i = 0; i < 1000; i++) {
149 +            m.put(new ArrayList(Collections.singleton(new BI(i))), true);
150 +        }
151 +
152 +        for (int i = 0; i < 1000; i++) {
153 +            LexicographicList<BI> bis = new LexicographicList<BI>(new BI(i));
154 +            assertTrue(m.containsKey(bis));
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       */
196      public void testClear() {
197          ConcurrentHashMap map = map5();
198          map.clear();
199 <        assertEquals(map.size(), 0);
199 >        assertEquals(0, map.size());
200      }
201  
202      /**
# Line 275 | Line 429 | public class ConcurrentHashMapTest exten
429          assertEquals("Z", map.get(one));
430      }
431  
278
432      /**
433       * replace value fails when the given key not mapped to expected value
434       */
# Line 296 | Line 449 | public class ConcurrentHashMapTest exten
449          assertEquals("Z", map.get(one));
450      }
451  
299
452      /**
453       * remove removes the correct key-value pair from the map
454       */
# Line 337 | Line 489 | public class ConcurrentHashMapTest exten
489          ConcurrentHashMap map = map5();
490          String s = map.toString();
491          for (int i = 1; i <= 5; ++i) {
492 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
492 >            assertTrue(s.contains(String.valueOf(i)));
493          }
494      }
495  
# Line 483 | Line 635 | public class ConcurrentHashMapTest exten
635          } catch (NullPointerException success) {}
636      }
637  
486
638      /**
639       * replace(x, null) throws NPE
640       */
# Line 517 | Line 668 | public class ConcurrentHashMapTest exten
668          } catch (NullPointerException success) {}
669      }
670  
520
671      /**
672       * remove(null) throws NPE
673       */
# Line 555 | Line 705 | public class ConcurrentHashMapTest exten
705       * A deserialized map equals original
706       */
707      public void testSerialization() throws Exception {
708 <        ConcurrentHashMap q = map5();
708 >        Map x = map5();
709 >        Map y = serialClone(x);
710  
711 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
712 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
713 <        out.writeObject(q);
714 <        out.close();
564 <
565 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
566 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
567 <        ConcurrentHashMap r = (ConcurrentHashMap)in.readObject();
568 <        assertEquals(q.size(), r.size());
569 <        assertTrue(q.equals(r));
570 <        assertTrue(r.equals(q));
711 >        assertNotSame(x, y);
712 >        assertEquals(x.size(), y.size());
713 >        assertEquals(x, y);
714 >        assertEquals(y, x);
715      }
716  
573
717      /**
718       * SetValue of an EntrySet entry sets value in the map.
719       */
# Line 582 | Line 725 | public class ConcurrentHashMapTest exten
725              map.put(new Integer(i), new Integer(i));
726          assertFalse(map.isEmpty());
727          Map.Entry entry1 = (Map.Entry)map.entrySet().iterator().next();
728 <
729 <        // assert that entry1 is not 16
730 <        assertTrue("entry is 16, test not valid",
731 <                   !entry1.getKey().equals(new Integer(16)));
732 <
733 <        // remove 16 (a different key) from map
734 <        // which just happens to cause entry1 to be cloned in map
735 <        map.remove(new Integer(16));
736 <        entry1.setValue("XYZ");
594 <        assertTrue(map.containsValue("XYZ")); // fails
728 >        // Unless it happens to be first (in which case remainder of
729 >        // test is skipped), remove a possibly-colliding key from map
730 >        // which, under some implementations, may cause entry1 to be
731 >        // cloned in map
732 >        if (!entry1.getKey().equals(new Integer(16))) {
733 >            map.remove(new Integer(16));
734 >            entry1.setValue("XYZ");
735 >            assertTrue(map.containsValue("XYZ")); // fails if write-through broken
736 >        }
737      }
738  
739   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines