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.8 by jsr166, Sun Oct 18 07:32:34 2015 UTC vs.
Revision 1.11 by jsr166, Sat Oct 21 06:47:09 2017 UTC

# Line 23 | Line 23
23  
24   /*
25   * @test
26 < * @bug     4904067 5023830 7129185
26 > * @bug     4904067 5023830 7129185 8072015
27   * @summary Unit test for Collections.checkedMap
28   * @author  Josh Bloch
29   * @run testng CheckedMapBash
# Line 36 | Line 36 | import org.testng.annotations.Test;
36   import org.testng.annotations.DataProvider;
37  
38   import static org.testng.Assert.fail;
39 – import static org.testng.Assert.assertTrue;
39  
40   public class CheckedMapBash {
41      static final Random rnd = new Random();
# Line 147 | Line 146 | public class CheckedMapBash {
146          ArrayList<Object[]> iters = new ArrayList<>(makeCheckedMaps());
147          iters.ensureCapacity(numItr * iters.size());
148          for (int each=1; each < numItr; each++) {
149 <            iters.addAll( makeCheckedMaps());
149 >            iters.addAll(makeCheckedMaps());
150          }
151          return iters.iterator();
152      }
# Line 158 | Line 157 | public class CheckedMapBash {
157      }
158  
159      public static Collection<Object[]> makeCheckedMaps() {
160 <        return Arrays.asList(
161 <            new Object[]{"Collections.checkedMap(HashMap)",
162 <                (Supplier) () -> {return Collections.checkedMap(new HashMap(), Integer.class, Integer.class);}},
163 <            new Object[]{"Collections.checkedMap(TreeMap(reverseOrder))",
164 <                (Supplier) () -> {return Collections.checkedMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class);}},
165 <            new Object[]{"Collections.checkedMap(TreeMap.descendingMap())",
166 <                (Supplier) () -> {return Collections.checkedMap(new TreeMap().descendingMap(), Integer.class, Integer.class);}},
167 <            new Object[]{"Collections.checkedNavigableMap(TreeMap)",
168 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class);}},
169 <            new Object[]{"Collections.checkedNavigableMap(TreeMap(reverseOrder))",
170 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class);}},
171 <            new Object[]{"Collections.checkedNavigableMap(TreeMap.descendingMap())",
172 <                (Supplier) () -> {return Collections.checkedNavigableMap(new TreeMap().descendingMap(), Integer.class, Integer.class);}}
173 <            );
160 >        Object[][] params = {
161 >            {"Collections.checkedMap(HashMap)",
162 >             (Supplier) () -> Collections.checkedMap(new HashMap(), Integer.class, Integer.class)},
163 >            {"Collections.checkedMap(TreeMap(reverseOrder))",
164 >             (Supplier) () -> Collections.checkedMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
165 >            {"Collections.checkedMap(TreeMap.descendingMap())",
166 >             (Supplier) () -> Collections.checkedMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
167 >            {"Collections.checkedNavigableMap(TreeMap)",
168 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(), Integer.class, Integer.class)},
169 >            {"Collections.checkedNavigableMap(TreeMap(reverseOrder))",
170 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap(Collections.reverseOrder()), Integer.class, Integer.class)},
171 >            {"Collections.checkedNavigableMap(TreeMap.descendingMap())",
172 >             (Supplier) () -> Collections.checkedNavigableMap(new TreeMap().descendingMap(), Integer.class, Integer.class)},
173 >        };
174 >        return Arrays.asList(params);
175      }
176   }

Diff Legend

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