Changeset 7005 in josm for trunk/test/unit/org/openstreetmap/josm/data

Timestamp:

2014-04-26T17:39:23+02:00 (12 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/test/unit/org/openstreetmap/josm/data

Files:

• osm/FilterTest.java (modified) (2 diffs)
• osm/OsmPrimitiveTest.java (modified) (1 diff)
• osm/QuadBucketsTest.java (modified) (1 diff)
• osm/history/HistoryWayTest.java (modified) (2 diffs)
• projection/ProjectionRefTest.java (modified) (1 diff)
• projection/ProjectionRegressionTest.java (modified) (4 diffs)
• validation/tests/MapCSSTagCheckerTest.java (modified) (1 diff)
• validation/tests/OpeningHourTestTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java

@@ -44 +44 @@
         ds.addPrimitive(n2);
 
-        Collection<OsmPrimitive> all = new HashSet<OsmPrimitive>();
+        Collection<OsmPrimitive> all = new HashSet<>();
         all.addAll(Arrays.asList(new OsmPrimitive[] {n1, n2}));
 
-        List<Filter> filters = new LinkedList<Filter>();
+        List<Filter> filters = new LinkedList<>();
         Filter f1 = new Filter();
         f1.text = "fixme";
@@ -67 +67 @@
             DataSet ds = OsmReader.parseDataSet(new FileInputStream("data_nodist/filterTests.osm"), NullProgressMonitor.INSTANCE);
 
-            List<Filter> filters = new LinkedList<Filter>();
+            List<Filter> filters = new LinkedList<>();
             switch (i) {
             case 1: {

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTest.java

@@ -20 +20 @@
 
     private void compareReferrers(OsmPrimitive actual, OsmPrimitive... expected) {
-        Assert.assertEquals(new HashSet<OsmPrimitive>(Arrays.asList(expected)),
-                new HashSet<OsmPrimitive>(actual.getReferrers()));
+        Assert.assertEquals(new HashSet<>(Arrays.asList(expected)),
+                new HashSet<>(actual.getReferrers()));
     }
 

trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java

@@ -27 +27 @@
 
     private void removeAllTest(DataSet ds) {
-        List<Node> allNodes = new ArrayList<Node>(ds.getNodes());
-        List<Way> allWays = new ArrayList<Way>(ds.getWays());
-        List<Relation> allRelations = new ArrayList<Relation>(ds.getRelations());
+        List<Node> allNodes = new ArrayList<>(ds.getNodes());
+        List<Way> allWays = new ArrayList<>(ds.getWays());
+        List<Relation> allRelations = new ArrayList<>(ds.getRelations());
 
         QuadBuckets<Node> nodes = Reflection.field("nodes").ofType(new TypeRef<QuadBuckets<Node>>() {}).in(ds).get();

trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryWayTest.java

@@ -93 +93 @@
         way.addNode(1);
         way.addNode(2);
-        ArrayList<Long> ids = new ArrayList<Long>();
+        ArrayList<Long> ids = new ArrayList<>();
         for (long id : way.getNodes()) {
             ids.add(id);
@@ -102 +102 @@
         assertEquals(2, (long) ids.get(1));
     }
-
 }

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java

@@ -33 +33 @@
      */
     public static void main(String[] args) {
-        Map<String, Projection> allCodes = new HashMap<String, Projection>();
+        Map<String, Projection> allCodes = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {

trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java

@@ -58 +58 @@
         setUp();
 
-        Map<String, Projection> supportedCodesMap = new HashMap<String, Projection>();
+        Map<String, Projection> supportedCodesMap = new HashMap<>();
         for (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) {
             for (String code : pc.allCodes()) {
@@ -68 +68 @@
         }
 
-        List<TestData> prevData = new ArrayList<TestData>();
+        List<TestData> prevData = new ArrayList<>();
         if (new File(PROJECTION_DATA_FILE).exists()) {
             prevData = readData();
         }
-        Map<String,TestData> prevCodesMap = new HashMap<String,TestData>();
+        Map<String,TestData> prevCodesMap = new HashMap<>();
         for (TestData data : prevData) {
             prevCodesMap.put(data.code, data);
         }
 
-        Set<String> codesToWrite = new LinkedHashSet<String>();
+        Set<String> codesToWrite = new LinkedHashSet<>();
         for (TestData data : prevData) {
             if (supportedCodesMap.containsKey(data.code)) {
@@ -116 +116 @@
     private static List<TestData> readData() throws IOException, FileNotFoundException {
         BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(PROJECTION_DATA_FILE), Utils.UTF_8));
-        List<TestData> result = new ArrayList<TestData>();
+        List<TestData> result = new ArrayList<>();
         String line;
         while ((line = in.readLine()) != null) {
@@ -159 +159 @@
     public void regressionTest() throws IOException, FileNotFoundException {
         List<TestData> allData = readData();
-        Set<String> dataCodes = new HashSet<String>();
+        Set<String> dataCodes = new HashSet<>();
         for (TestData data : allData) {
             dataCodes.add(data.code);

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java

@@ -73 +73 @@
         c.initialize();
 
-        LinkedHashSet<String> assertionErrors = new LinkedHashSet<String>();
+        LinkedHashSet<String> assertionErrors = new LinkedHashSet<>();
         for (final MapCSSTagChecker.TagCheck check : c.checks) {
             System.out.println("Check: "+check);

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -144 +144 @@
     public void testPresetValues() throws Exception {
         final Collection<TaggingPreset> presets = TaggingPresetReader.readFromPreferences(false, false);
-        final Set<Tag> values = new LinkedHashSet<Tag>();
+        final Set<Tag> values = new LinkedHashSet<>();
         for (final TaggingPreset p : presets) {
             for (final TaggingPresetItem i : p.data) {