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

Comparing jsr166/src/test/loops/MapCheck.java (file contents):
Revision 1.13 by jsr166, Tue Mar 15 19:47:05 2011 UTC vs.
Revision 1.19 by jsr166, Sun Oct 23 03:03:23 2016 UTC

# Line 12 | Line 12
12   * can create one from a real dictionary (1 line per word) and then run
13   * linux "shuf" to randomize entries.
14   */
15 – import java.util.*;
15   import java.io.*;
16 + import java.util.*;
17  
18   public class MapCheck {
19      static final Object MISSING = new Object();
20      static TestTimer timer = new TestTimer();
21 <    static Class eclass;
22 <    static Class mapClass = java.util.concurrent.ConcurrentHashMap.class;
21 >    static Class<?> eclass;
22 >    static Class<?> mapClass = java.util.concurrent.ConcurrentHashMap.class;
23  
24      static final LoopHelpers.SimpleRandom srng = new LoopHelpers.SimpleRandom();
25      static final Random rng = new Random(3152688);
# Line 79 | Line 79 | public class MapCheck {
79          Object[] absent = new Object[size];
80          initializeKeys(key, absent, size);
81  
82 <        precheck(size,  key, absent);
82 >        precheck(size, key, absent);
83  
84          for (int rep = 0; rep < numTests; ++rep) {
85              mainTest(newMap(), key, absent);
# Line 99 | Line 99 | public class MapCheck {
99  
100      static Map newMap() {
101          try {
102 <            return (Map) mapClass.newInstance();
102 >            return (Map) mapClass.getConstructor().newInstance();
103          } catch (Exception e) {
104              throw new RuntimeException("Can't instantiate " + mapClass + ": " + e);
105          }
# Line 143 | Line 143 | public class MapCheck {
143          if (m.get(null) != null) throw new Error();
144      }
145  
146 –
146      static void getTest(String nm, int n, Map s, Object[] key, int expect) {
147          int sum = 0;
148          timer.start(nm, n);
# Line 157 | Line 156 | public class MapCheck {
156          checkSum += sum;
157      }
158  
160 –
159      // unused
160      static void getTestBoxed(String nm, int n, Map s, Object[] key, int expect) {
161          int sum = 0;
# Line 244 | Line 242 | public class MapCheck {
242          checkSum += sum;
243      }
244  
247 –
245      static Object kitTest(Map s, int size) {
246          Object last = null;
247          int sum = 0;
# Line 511 | Line 508 | public class MapCheck {
508          reallyAssert(s.size() == size);
509      }
510  
514 –
515 –
511      static void initializeKeys(Object[] key, Object[] absent, int size) {
512          if (eclass == Object.class) {
513              for (int i = 0; i < size; ++i) key[i] = new Object();
# Line 621 | Line 616 | public class MapCheck {
616          }
617      }
618  
624 –
619      static void randomWords(Object[] ws, int origin, int size) {
620          for (int i = origin; i < size; ++i) {
621              int k = 0;
# Line 702 | Line 696 | public class MapCheck {
696          }
697      }
698  
705 –
699      static void shuffle(Object[] keys) {
700          int size = keys.length;
701 <        for (int i= size; i>1; i--) {
701 >        for (int i = size; i > 1; i--) {
702              int r = rng.nextInt(i);
703              Object t = keys[i-1];
704              keys[i-1] = keys[r];
# Line 715 | Line 708 | public class MapCheck {
708  
709      static void shuffle(ArrayList keys) {
710          int size = keys.size();
711 <        for (int i= size; i>1; i--) {
711 >        for (int i = size; i > 1; i--) {
712              int r = rng.nextInt(i);
713              Object t = keys.get(i-1);
714              keys.set(i-1, keys.get(r));

Diff Legend

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