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.38 by jsr166, Tue Sep 24 17:03:14 2013 UTC vs.
Revision 1.43 by jsr166, Fri Feb 27 21:43:18 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
9 > import java.util.ArrayList;
10 > import java.util.Arrays;
11 > import java.util.Collection;
12 > import java.util.Collections;
13 > import java.util.Enumeration;
14 > import java.util.Iterator;
15 > import java.util.Map;
16 > import java.util.Random;
17 > import java.util.Set;
18   import java.util.concurrent.ConcurrentHashMap;
19  
20 + import junit.framework.Test;
21 + import junit.framework.TestSuite;
22 +
23   public class ConcurrentHashMapTest extends JSR166TestCase {
24      public static void main(String[] args) {
25          junit.textui.TestRunner.run(suite());
# Line 103 | Line 113 | public class ConcurrentHashMapTest exten
113       * class are found.
114       */
115      public void testComparableFamily() {
116 +        int size = 500;         // makes measured test run time -> 60ms
117          ConcurrentHashMap<BI, Boolean> m =
118              new ConcurrentHashMap<BI, Boolean>();
119 <        for (int i = 0; i < 1000; i++) {
119 >        for (int i = 0; i < size; i++) {
120              assertTrue(m.put(new CI(i), true) == null);
121          }
122 <        for (int i = 0; i < 1000; i++) {
122 >        for (int i = 0; i < size; i++) {
123              assertTrue(m.containsKey(new CI(i)));
124              assertTrue(m.containsKey(new DI(i)));
125          }
# Line 119 | Line 130 | public class ConcurrentHashMapTest exten
130       * on Comparable can be inserted and found.
131       */
132      public void testGenericComparable() {
133 +        int size = 120;         // makes measured test run time -> 60ms
134          ConcurrentHashMap<Object, Boolean> m =
135              new ConcurrentHashMap<Object, Boolean>();
136 <        for (int i = 0; i < 1000; i++) {
136 >        for (int i = 0; i < size; i++) {
137              BI bi = new BI(i);
138              BS bs = new BS(String.valueOf(i));
139              LexicographicList<BI> bis = new LexicographicList<BI>(bi);
# Line 132 | Line 144 | public class ConcurrentHashMapTest exten
144                  assertTrue(m.containsKey(bss));
145              assertTrue(m.containsKey(bis));
146          }
147 <        for (int i = 0; i < 1000; i++) {
148 <            assertTrue(m.containsKey(new ArrayList(Collections.singleton(new BI(i)))));
147 >        for (int i = 0; i < size; i++) {
148 >            assertTrue(m.containsKey(Collections.singletonList(new BI(i))));
149          }
150      }
151  
# Line 143 | Line 155 | public class ConcurrentHashMapTest exten
155       * inserted and found.
156       */
157      public void testGenericComparable2() {
158 +        int size = 500;         // makes measured test run time -> 60ms
159          ConcurrentHashMap<Object, Boolean> m =
160              new ConcurrentHashMap<Object, Boolean>();
161 <        for (int i = 0; i < 1000; i++) {
162 <            m.put(new ArrayList(Collections.singleton(new BI(i))), true);
161 >        for (int i = 0; i < size; i++) {
162 >            m.put(Collections.singletonList(new BI(i)), true);
163          }
164  
165 <        for (int i = 0; i < 1000; i++) {
165 >        for (int i = 0; i < size; i++) {
166              LexicographicList<BI> bis = new LexicographicList<BI>(new BI(i));
167              assertTrue(m.containsKey(bis));
168          }
# Line 274 | Line 287 | public class ConcurrentHashMapTest exten
287          assertEquals("A", (String)map.get(one));
288          ConcurrentHashMap empty = new ConcurrentHashMap();
289          assertNull(map.get("anything"));
290 +        assertNull(empty.get("anything"));
291      }
292  
293      /**
# Line 524 | Line 538 | public class ConcurrentHashMapTest exten
538          try {
539              new ConcurrentHashMap(-1, .75f);
540              shouldThrow();
541 <        } catch (IllegalArgumentException e) {}
541 >        } catch (IllegalArgumentException success) {}
542  
543          try {
544              new ConcurrentHashMap(16, -1);
545              shouldThrow();
546 <        } catch (IllegalArgumentException e) {}
546 >        } catch (IllegalArgumentException success) {}
547      }
548  
549      /**
# Line 540 | Line 554 | public class ConcurrentHashMapTest exten
554          try {
555              new ConcurrentHashMap(-1, .75f, 1);
556              shouldThrow();
557 <        } catch (IllegalArgumentException e) {}
557 >        } catch (IllegalArgumentException success) {}
558  
559          try {
560              new ConcurrentHashMap(16, -1, 1);
561              shouldThrow();
562 <        } catch (IllegalArgumentException e) {}
562 >        } catch (IllegalArgumentException success) {}
563  
564          try {
565              new ConcurrentHashMap(16, .75f, -1);
566              shouldThrow();
567 <        } catch (IllegalArgumentException e) {}
567 >        } catch (IllegalArgumentException success) {}
568      }
569  
570      /**
# Line 561 | Line 575 | public class ConcurrentHashMapTest exten
575          try {
576              new ConcurrentHashMap(null);
577              shouldThrow();
578 <        } catch (NullPointerException e) {}
578 >        } catch (NullPointerException success) {}
579      }
580  
581      /**
# Line 576 | Line 590 | public class ConcurrentHashMapTest exten
590          assertFalse(map2.equals(map1));
591      }
592  
579 –
593      /**
594       * get(null) throws NPE
595       */

Diff Legend

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