Changeset 11324 in josm for trunk/test/performance/org

Timestamp:

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

Author:

Don-vip

Message:

findbugs

Location:

trunk/test/performance/org/openstreetmap/josm

Files:

• PerformanceTestUtils.java (modified) (1 diff)
• data/osm/KeyValuePerformanceTest.java (modified) (2 diffs)
• data/osm/OsmDataGenerator.java (modified) (5 diffs)
• gui/mappaint/MapRendererPerformanceTest.java (modified) (2 diffs)

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -112 +112 @@
     }
 
+    @SuppressFBWarnings(value = "DM_GC")
     private static void cleanSystem() {
         System.gc();

trunk/test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java

@@ -8 +8 @@
 import static org.junit.Assert.assertTrue;
 
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Random;
@@ -125 +126 @@
     public void generateTestStrings() {
         testStrings.clear();
-        random = new Random(123);
+        random = new SecureRandom();
         for (int i = 0; i < TEST_STRING_COUNT; i++) {
             testStrings.add(RandomStringUtils.random(10, 0, 0, true, true, null, random));

trunk/test/performance/org/openstreetmap/josm/data/osm/OsmDataGenerator.java

@@ -3 +3 @@
 
 import java.io.File;
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Random;
@@ -41 +42 @@
          */
         public RandomStringList(int seed, int size) {
-            random = new Random(seed);
+            random = new SecureRandom();
+            random.setSeed(seed);
             strings = new String[size];
             interned = new String[size];
@@ -88 +90 @@
         protected DataGenerator(String datasetName) {
             this.datasetName = datasetName;
-            this.random = new Random(1234);
+            this.random = new SecureRandom();
         }
 
@@ -126 +128 @@
          */
         public File getFile() {
-            return new File(DATA_DIR + File.separator + datasetName + ".osm");
+            return new File(DATA_DIR, datasetName + ".osm");
         }
 
@@ -139 +141 @@
         @Override
         public String toString() {
-            return "DataGenerator [datasetName=" + datasetName + "]";
+            return "DataGenerator [datasetName=" + datasetName + ']';
         }
     }

trunk/test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java

@@ -166 +166 @@
         public int noIterations = 7;
         public boolean dumpImage = DUMP_IMAGE;
-        public boolean skipDraw = false;
         public boolean clearStyleCache = true;
         public String label = "";
@@ -264 +263 @@
         test.bounds = BOUNDS_CITY_ALL;
         test.label = "big";
-        test.skipDraw = true;
         test.dumpImage = false;
         test.noWarmup = 3;