ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/jtreg/util/Collections/CheckedMapBash.java
(Generate patch)

Comparing jsr166/src/test/jtreg/util/Collections/CheckedMapBash.java (file contents):
Revision 1.9 by jsr166, Sun Oct 18 07:38:56 2015 UTC vs.
Revision 1.10 by jsr166, Sun Oct 18 17:34:26 2015 UTC

# Line 147 | Line 147 | public class CheckedMapBash {
147          ArrayList<Object[]> iters = new ArrayList<>(makeCheckedMaps());
148          iters.ensureCapacity(numItr * iters.size());
149          for (int each=1; each < numItr; each++) {
150 <            iters.addAll( makeCheckedMaps());
150 >            iters.addAll(makeCheckedMaps());
151          }
152          return iters.iterator();
153      }
# Line 158 | Line 158 | public class CheckedMapBash {
158      }
159  
160      public static Collection<Object[]> makeCheckedMaps() {
161 <        return Arrays.asList(
162 <            new Object[]{"Collections.checkedMap(HashMap)",
163 <                (Supplier) () -> {return Collections.checkedMap(new HashMap(), Integer.class, Integer.class);}},
164 <            new Object[]{"Collections.checkedMap(TreeMap(reverseOrder))",
165 <                (Supplier) () -> {return Collections.checkedMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class);}},
166 <            new Object[]{"Collections.checkedMap(TreeMap.descendingMap())",
167 <                (Supplier) () -> {return Collections.checkedMap(new TreeMap().descendingMap(), Integer.class, Integer.class);}},
168 <            new Object[]{"Collections.checkedNavigableMap(TreeMap)",
169 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class);}},
170 <            new Object[]{"Collections.checkedNavigableMap(TreeMap(reverseOrder))",
171 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class);}},
172 <            new Object[]{"Collections.checkedNavigableMap(TreeMap.descendingMap())",
173 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap().descendingMap(), Integer.class, Integer.class);}}
174 <            );
161 >        Object[][] params = {
162 >            {"Collections.checkedMap(HashMap)",
163 >             (Supplier) () -> Collections.checkedMap(new HashMap(), Integer.class, Integer.class)},
164 >            {"Collections.checkedMap(TreeMap(reverseOrder))",
165 >             (Supplier) () -> Collections.checkedMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
166 >            {"Collections.checkedMap(TreeMap.descendingMap())",
167 >             (Supplier) () -> Collections.checkedMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
168 >            {"Collections.checkedNavigableMap(TreeMap)",
169 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class)},
170 >            {"Collections.checkedNavigableMap(TreeMap(reverseOrder))",
171 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
172 >            {"Collections.checkedNavigableMap(TreeMap.descendingMap())",
173 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
174 >        };
175 >        return Arrays.asList(params);
176      }
177   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines