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

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/osm

Files:

• FilterTest.java (modified) (2 diffs)
• OsmPrimitiveTest.java (modified) (1 diff)
• QuadBucketsTest.java (modified) (1 diff)
• history/HistoryWayTest.java (modified) (2 diffs)

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));
     }
-
 }