Changeset 11324 in josm for trunk/test/functional/org/openstreetmap/josm

Timestamp:

2016-11-27T05:16:30+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs

Location:

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

Files:

• MultiFetchServerObjectReaderTest.java (modified) (6 diffs)
• OsmServerBackreferenceReaderTest.java (modified) (1 diff)

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

@@ -15 +15 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Locale;
+import java.util.Random;
 import java.util.logging.Logger;
 
@@ -39 +41 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Unit tests of {@link MultiFetchServerObjectReader}.
  */
+@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
 public class MultiFetchServerObjectReaderTest {
     private static Logger logger = Logger.getLogger(MultiFetchServerObjectReader.class.getName());
@@ -59 +64 @@
         DataSet ds = new DataSet();
         ds.setVersion("0.6");
+        Random rand = new SecureRandom();
 
         int numNodes = 1000;
@@ -81 +87 @@
         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);
+            int numNodesInWay = 2 + (int) Math.round(rand.nextDouble() * 5);
+            int start = (int) Math.round(rand.nextDouble() * numNodes);
             for (int j = 0; j < numNodesInWay; j++) {
                 int idx = (start + j) % numNodes;
@@ -98 +104 @@
             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);
+            int numNodesInRelation = (int) Math.round(rand.nextDouble() * 10);
+            int start = (int) Math.round(rand.nextDouble() * numNodes);
             for (int j = 0; j < numNodesInRelation; j++) {
                 int idx = (start + j) % 500;
@@ -105 +111 @@
                 r.addMember(new RelationMember("role-" + j, n));
             }
-            int numWaysInRelation = (int) Math.round(Math.random() * 10);
-            start = (int) Math.round(Math.random() * numWays);
+            int numWaysInRelation = (int) Math.round(rand.nextDouble() * 10);
+            start = (int) Math.round(rand.nextDouble() * numWays);
             for (int j = 0; j < numWaysInRelation; j++) {
                 int idx = (start + j) % 500;

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

@@ -44 +44 @@
 import org.openstreetmap.josm.tools.Logging;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 /**
  * Reads primitives referring to a particular primitive (ways including a node, relations referring to a relation)
  * @since 1806
  */
+@SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
 public class OsmServerBackreferenceReaderTest {
     private static final Logger logger = Logger.getLogger(OsmServerBackreferenceReader.class.getName());