Changeset 15318 in josm for trunk

Timestamp:

2019-08-24T13:05:11+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17932 - fix error message localization

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -54 +54 @@
             try (CachedFile cf = new CachedFile("resource://data/validator/opening_hours.js");
                  Reader reader = cf.getContentReader()) {
-                ENGINE.eval(
-                        "var global=this;var window=this;var process={env:{}};" +
-                        "var console={};console.debug=print;console.log=print;console.warn=print;console.error=print;");
+                ENGINE.eval("var console={};console.debug=print;console.log=print;console.warn=print;console.error=print;");
                 ENGINE.eval(reader);
                 ENGINE.eval("var opening_hours = require('opening_hours');");

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -234 +235 @@
         }
     }
+
+    /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/17932">Bug #17932</a>.
+     */
+    @Test
+    public void testTicket17932() {
+        Logging.clearLastErrorAndWarnings();
+        assertTrue(openingHourTest.checkOpeningHourSyntax("opening_hours", "SH off").isEmpty());
+        List<String> errors = Logging.getLastErrorAndWarnings();
+        assertFalse(errors.isEmpty());
+        assertTrue(errors.get(0), errors.get(0).contains("no SH definition"));
+    }
 }