Changeset 15277 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

Timestamp:

2019-08-04T21:29:37+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17932 - Update OpeningHourTest to enable propper logging

See ​https://github.com/opening-hours/opening_hours.java/issues/1

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (modified) (4 diffs)

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

@@ -13 +13 @@
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -19 +20 @@
 import org.openstreetmap.josm.data.validation.Test;
 import org.openstreetmap.josm.data.validation.TestError;
+import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -52 +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(reader);
                 ENGINE.eval("var opening_hours = require('opening_hours');");
@@ -247 +252 @@
         } catch (ScriptException | NoSuchMethodException ex) {
             Logging.error(ex);
+            new Notification(Utils.getRootCause(ex).getMessage()).setIcon(JOptionPane.ERROR_MESSAGE).show();
         }
         return errors;