Changeset 8510 in josm for trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java

Timestamp:

2015-06-20T23:42:21+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle: enable relevant whitespace checks and fix them

File:

• trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java (modified) (14 diffs)

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

@@ -57 +57 @@
         // create a set of nodes
         //
-        for (int i=0; i< numNodes; i++) {
+        for (int i = 0; i < numNodes; i++) {
             Node n = new Node();
-            n.setCoor(new LatLon(-36.6,47.6));
+            n.setCoor(new LatLon(-36.6, 47.6));
             n.put("name", "node-"+i);
             ds.addPrimitive(n);
@@ -65 +65 @@
         }
 
-        // create a set of ways, each with a random number of
-        // nodes
+        // create a set of ways, each with a random number of nodes
         //
-        for (int i=0; i< numWays; i++) {
+        for (int i = 0; i < numWays; i++) {
             Way w = new Way();
-            int numNodesInWay = 2 + (int)Math.round(Math.random() * 5);
-            int start = (int)Math.round(Math.random() * numNodes);
-            for (int j = 0; j < numNodesInWay;j++) {
+            int numNodesInWay = 2 + (int) Math.round(Math.random() * 5);
+            int start = (int) Math.round(Math.random() * numNodes);
+            for (int j = 0; j < numNodesInWay; j++) {
                 int idx = (start + j) % numNodes;
                 Node n = nodes.get(idx);
@@ -82 +81 @@
         }
 
-        // create a set of relations each with a random number of nodes,
-        // and ways
+        // create a set of relations each with a random number of nodes, and ways
         //
-        for (int i=0; i< numRelations; i++) {
+        for (int i = 0; i < numRelations; i++) {
             Relation r = new Relation();
             r.put("name", "relation-" +i);
-            int numNodesInRelation = (int)Math.round(Math.random() * 10);
-            int start = (int)Math.round(Math.random() * numNodes);
-            for (int j = 0; j < numNodesInRelation;j++) {
+            int numNodesInRelation = (int) Math.round(Math.random() * 10);
+            int start = (int) Math.round(Math.random() * numNodes);
+            for (int j = 0; j < numNodesInRelation; j++) {
                 int idx = (start + j) % 500;
                 Node n = nodes.get(idx);
                 r.addMember(new RelationMember("role-" + j, n));
             }
-            int numWaysInRelation = (int)Math.round(Math.random() * 10);
-            start = (int)Math.round(Math.random() * numWays);
-            for (int j = 0; j < numWaysInRelation;j++) {
+            int numWaysInRelation = (int) Math.round(Math.random() * 10);
+            start = (int) Math.round(Math.random() * numWays);
+            for (int j = 0; j < numWaysInRelation; j++) {
                 int idx = (start + j) % 500;
                 Way w = ways.get(idx);
@@ -167 +165 @@
                 w.footer();
             }
-        } catch(IOException e) {
+        } catch (IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
@@ -191 +189 @@
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
-        for (int i =0; i< 10; i++) {
+        for (int i = 0; i < 10; i++) {
             reader.append(nodes.get(i));
         }
@@ -197 +195 @@
         assertEquals(10, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1);
+            Node n2 = (Node) ds.getPrimitiveById(n1);
             assertNotNull(n2);
-            assertEquals(n2.get("name"),n2.get("name"));
+            assertEquals(n2.get("name"), n2.get("name"));
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
@@ -207 +205 @@
     public void testMultiGet10Ways() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Way> ways= new ArrayList<>(ds.getWays());
-        for (int i =0; i< 10; i++) {
+        ArrayList<Way> ways = new ArrayList<>(ds.getWays());
+        for (int i = 0; i < 10; i++) {
             reader.append(ways.get(i));
         }
@@ -214 +212 @@
         assertEquals(10, out.getWays().size());
         for (Way w1: out.getWays()) {
-            Way w2 = (Way)ds.getPrimitiveById(w1);
+            Way w2 = (Way) ds.getPrimitiveById(w1);
             assertNotNull(w2);
             assertEquals(w2.getNodesCount(), w1.getNodesCount());
-            assertEquals(w2.get("name"),w1.get("name"));
+            assertEquals(w2.get("name"), w1.get("name"));
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
@@ -225 +223 @@
     public void testMultiGet10Relations() throws OsmTransferException {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        ArrayList<Relation> relations= new ArrayList<>(ds.getRelations());
-        for (int i =0; i< 10; i++) {
+        ArrayList<Relation> relations = new ArrayList<>(ds.getRelations());
+        for (int i = 0; i < 10; i++) {
             reader.append(relations.get(i));
         }
@@ -232 +230 @@
         assertEquals(10, out.getRelations().size());
         for (Relation r1: out.getRelations()) {
-            Relation r2 = (Relation)ds.getPrimitiveById(r1);
+            Relation r2 = (Relation) ds.getPrimitiveById(r1);
             assertNotNull(r2);
             assertEquals(r2.getMembersCount(), r1.getMembersCount());
-            assertEquals(r2.get("name"),r2.get("name"));
+            assertEquals(r2.get("name"), r2.get("name"));
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
@@ -244 +242 @@
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
-        for (int i =0; i< 812; i++) {
+        for (int i = 0; i < 812; i++) {
             reader.append(nodes.get(i));
         }
@@ -250 +248 @@
         assertEquals(812, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1);
+            Node n2 = (Node) ds.getPrimitiveById(n1);
             assertNotNull(n2);
-            assertEquals(n2.get("name"),n2.get("name"));
+            assertEquals(n2.get("name"), n2.get("name"));
         }
         assertTrue(reader.getMissingPrimitives().isEmpty());
@@ -261 +259 @@
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
         ArrayList<Node> nodes = new ArrayList<>(ds.getNodes());
-        for (int i =0; i< 10; i++) {
+        for (int i = 0; i < 10; i++) {
             reader.append(nodes.get(i));
         }
@@ -269 +267 @@
         assertEquals(10, out.getNodes().size());
         for (Node n1:out.getNodes()) {
-            Node n2 = (Node)ds.getPrimitiveById(n1);
+            Node n2 = (Node) ds.getPrimitiveById(n1);
             assertNotNull(n2);
-            assertEquals(n2.get("name"),n2.get("name"));
+            assertEquals(n2.get("name"), n2.get("name"));
         }
         assertFalse(reader.getMissingPrimitives().isEmpty());