Changeset 7005 in josm for trunk/test/functional/org

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/test/functional/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReaderTest.java (modified) (7 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (9 diffs)

trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

@@ -55 +55 @@
         int numRelations = 1000;
 
-        ArrayList<Node> nodes = new ArrayList<Node>();
-        ArrayList<Way> ways = new ArrayList<Way>();
+        ArrayList<Node> nodes = new ArrayList<>();
+        ArrayList<Way> ways = new ArrayList<>();
 
         // create a set of nodes
@@ -122 +122 @@
     static public void createDataSetOnServer(DataSet ds) throws OsmTransferException {
         logger.info("creating data set on the server ...");
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+        ArrayList<OsmPrimitive> primitives = new ArrayList<>();
         primitives.addAll(testDataSet.getNodes());
         primitives.addAll(testDataSet.getWays());
@@ -246 +246 @@
     public void testMultiGet10Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));
@@ -263 +263 @@
     public void testMultiGet10Ways() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Way> ways= new ArrayList<Way>(ds.getWays());
+        ArrayList<Way> ways= new ArrayList<>(ds.getWays());
         for (int i =0; i< 10; i++) {
             reader.append(ways.get(i));
@@ -281 +281 @@
     public void testMultiGet10Relations() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Relation> relations= new ArrayList<Relation>(ds.getRelations());
+        ArrayList<Relation> relations= new ArrayList<>(ds.getRelations());
         for (int i =0; i< 10; i++) {
             reader.append(relations.get(i));
@@ -299 +299 @@
     public void testMultiGet800Nodes() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 812; i++) {
             reader.append(nodes.get(i));
@@ -316 +316 @@
     public void multiGetWithNonExistingNode() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Node> nodes = new ArrayList<Node>(ds.getNodes());
+        ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
         for (int i =0; i< 10; i++) {
             reader.append(nodes.get(i));

trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java

@@ -127 +127 @@
     static public void createDataSetOnServer(DataSet ds) throws OsmTransferException {
         logger.info("creating data set on the server ...");
-        ArrayList<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
+        ArrayList<OsmPrimitive> primitives = new ArrayList<>();
         primitives.addAll(ds.getNodes());
         primitives.addAll(ds.getWays());
@@ -328 +328 @@
         }
         assertEquals(2, referers.getRelations().size());  // two relations referring to
-        Set<Long> expectedNodeIds = new HashSet<Long>();
+        Set<Long> expectedNodeIds = new HashSet<>();
         for (Way way : referers.getWays()) {
             Way orig = (Way) ds.getPrimitiveById(way);
@@ -359 +359 @@
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
 
-        Set<Long> referringRelationsIds = new HashSet<Long>();
+        Set<Long> referringRelationsIds = new HashSet<>();
         r = lookupRelation(referers, 6);
         assertNotNull(r);
@@ -386 +386 @@
         // ways are incomplete after reading.
         //
-        Set<Long> expectedWayIds = new HashSet<Long>();
+        Set<Long> expectedWayIds = new HashSet<>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
             if (m.isWay()) {
@@ -420 +420 @@
 
     protected Set<Long> getNodeIdsInWay(Way way) {
-        HashSet<Long> ret = new HashSet<Long>();
+        HashSet<Long> ret = new HashSet<>();
         if (way == null)return ret;
         for (Node n: way.getNodes()) {
@@ -429 +429 @@
 
     protected Set<Long> getNodeIdsInRelation(Relation r) {
-        HashSet<Long> ret = new HashSet<Long>();
+        HashSet<Long> ret = new HashSet<>();
         if (r == null) return ret;
         for (RelationMember m: r.getMembers()) {
@@ -455 +455 @@
         DataSet referers = reader.parseOsm(NullProgressMonitor.INSTANCE);
 
-        Set<Long> referringRelationsIds = new HashSet<Long>();
+        Set<Long> referringRelationsIds = new HashSet<>();
         r = lookupRelation(referers, 6);
         assertNotNull(r);
@@ -482 +482 @@
         // ways are completely read after reading the relations
         //
-        Set<Long> expectedWayIds = new HashSet<Long>();
+        Set<Long> expectedWayIds = new HashSet<>();
         for (RelationMember m : lookupRelation(ds, 6).getMembers()) {
             if (m.isWay()) {
@@ -509 +509 @@
         }
 
-        Set<Long> expectedNodeIds = new HashSet<Long>();
+        Set<Long> expectedNodeIds = new HashSet<>();
         for (int i = 6; i < 10; i++) {
             Relation r1 = lookupRelation(ds, i);