Changeset 13175 in josm

Timestamp:

2017-12-01T19:28:25+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - minor fixes, performance test still failing

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/MapViewState.java (modified) (1 diff)
• test/performance/org/openstreetmap/josm/data/osm/KeyValuePerformanceTest.java (modified) (2 diffs)
• test/performance/org/openstreetmap/josm/gui/mappaint/MapRendererPerformanceTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -378 +378 @@
     /**
      * Create the default {@link MapViewState} object for the given map view. The screen position won't be set so that this method can be used
-     * before the view was added to the hirarchy.
+     * before the view was added to the hierarchy.
      * @param width The view width
      * @param height The view height

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

@@ -14 +14 @@
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.PerformanceTestUtils;
 import org.openstreetmap.josm.PerformanceTestUtils.PerformanceTestTimer;
 import org.openstreetmap.josm.data.osm.OsmDataGenerator.KeyValueDataGenerator;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -48 +47 @@
      * Prepare the test.
      */
-    @BeforeClass
-    public static void createJOSMFixture() {
-        JOSMFixture.createPerformanceTestFixture().init(true);
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().projection();
 
     /**

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

@@ -50 +50 @@
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
+/**
+ * Performance test of map renderer.
+ */
 public class MapRendererPerformanceTest {
 
@@ -87 +90 @@
     public Timeout globalTimeout = Timeout.seconds(15*60);
 
+    /**
+     * Initializes test environment.
+     * @throws Exception if any error occurs
+     */
     @BeforeClass
     public static void load() throws Exception {
@@ -152 +159 @@
     }
 
+    /**
+     * Cleanup test environment.
+     */
     @AfterClass
     public static void cleanUp() {
@@ -319 +329 @@
 
     private static void setFilterStyleActive(boolean active) {
-        if (filterStyle.active != active) {
-            MapPaintStyles.toggleStyleActive(filterStyleIdx);
-        }
-        Assert.assertEquals(active, filterStyle.active);
+        if (filterStyle != null) {
+            if (filterStyle.active != active) {
+                MapPaintStyles.toggleStyleActive(filterStyleIdx);
+            }
+            Assert.assertEquals(active, filterStyle.active);
+        }
     }