Changeset 15400 in josm for trunk

Timestamp:

2019-10-01T02:20:06+02:00 (5 years ago)

Author:

Don-vip

Message:

Force metric measurement system only in tests requiring it as it creates a new preference entry

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/layer/GpxLayerTest.java (modified) (1 diff)
• testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

@@ -41 +41 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection().i18n();
+    public JOSMTestRules test = new JOSMTestRules().main().projection().i18n().metricSystem();
 
     private static String getHtml(GpxLayer layer) {

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -101 +101 @@
     private boolean territories;
     private boolean rlTraffic;
+    private boolean metric;
     private boolean main;
 
@@ -283 +284 @@
         territories();
         rlTraffic = true;
+        return this;
+    }
+
+    /**
+     * Force metric measurement system.
+     * @return this instance, for easy chaining
+     * @since 15400
+     */
+    public JOSMTestRules metricSystem() {
+        metric = true;
         return this;
     }
@@ -502 +513 @@
 
         // Make sure we're using the metric system
-        SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+        if (metric) {
+            SystemOfMeasurement.setSystemOfMeasurement(SystemOfMeasurement.METRIC.getName());
+        }
 
         if (useHttps) {