Changeset 6427 in josm

Timestamp:

2013-11-30T22:06:02+01:00 (10 years ago)

Author:

simon04

Message:

fix #9382 - fix OpeningHourTest under Java 8

Instead of implementing yet another getList() extraction
based on jdk.nashorn.api.scripting.ScriptObjectMirror,
use JavaScript to join warnings to a String and
split that String in Java code afterwards.

Also, don't rely on JavaScript exception to obtain
test errors (due to different string representation),
but catch those exceptions in JavaScript and provide
a getErrors() function.

File:

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

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

@@ -5 +5 @@
 
 import java.io.InputStreamReader;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58 +56 @@
             // fake country/state to not get errors on holidays
             ENGINE.eval("var nominatiomJSON = {address: {state: 'Bayern', country_code: 'de'}};");
-            ENGINE.eval("var oh = function (value, mode) {return new opening_hours(value, nominatiomJSON, mode);};");
+            ENGINE.eval("" +
+                    "var oh = function (value, mode) {" +
+                    " try {" +
+                    "    var r= new opening_hours(value, nominatiomJSON, mode);" +
+                    "    r.getErrors = function() {return [];};" +
+                    "    return r;" +
+                    "  } catch(err) {" +
+                    "    return {" +
+                    "      getWarnings: function() {return [];}," +
+                    "      getErrors: function() {return [err.toString()]}" +
+                    "    };" +
+                    "  }" +
+                    "};");
         } else {
             Main.warn("Unable to initialize OpeningHourTest because no JavaScript engine has been found");
@@ -78 +88 @@
 
     @SuppressWarnings("unchecked")
-    protected List<Object> getList(Object obj) {
+    protected List<Object> getList(Object obj) throws ScriptException, NoSuchMethodException {
         if (obj == null || "".equals(obj)) {
             return Arrays.asList();
         } else if (obj instanceof String) {
-            final Object[] strings = ((String) obj).split("\\n");
+            final Object[] strings = ((String) obj).split("\\\\n");
             return Arrays.asList(strings);
         } else if (obj instanceof List) {
             return (List<Object>) obj;
-        } else if ("sun.org.mozilla.javascript.internal.NativeArray".equals(obj.getClass().getName())) {
-            List<Object> list = new ArrayList<Object>();
-            try {
-                Method getIds = obj.getClass().getMethod("getIds");
-                Method get = obj.getClass().getMethod("get", long.class);
-                Object[] ids = (Object[]) getIds.invoke(obj);
-                for (Object id : ids) {
-                    list.add(get.invoke(obj, id));
-                }
-            } catch (NoSuchMethodException e) {
-                Main.error("Unable to run OpeningHourTest because of NoSuchMethodException by reflection: "+e.getMessage());
-            } catch (IllegalArgumentException e) {
-                Main.error("Unable to run OpeningHourTest because of IllegalArgumentException by reflection: "+e.getMessage());
-            } catch (IllegalAccessException e) {
-                Main.error("Unable to run OpeningHourTest because of IllegalAccessException by reflection: "+e.getMessage());
-            } catch (InvocationTargetException e) {
-                Main.error("Unable to run OpeningHourTest because of InvocationTargetException by reflection: "+e.getMessage());
-            }
-            return list;
         } else {
-            throw new IllegalArgumentException("Not expecting class " + obj.getClass());
+            // recursively call getList() with argument converted to newline-separated string
+            return getList(((Invocable) ENGINE).invokeMethod(obj, "join", "\\n"));
         }
     }
@@ -168 +160 @@
                 Main.debug(e.getMessage());
             }
+            for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"))) {
+                errors.add(new OpeningHoursTestError(key + " - " + i.toString().trim(), Severity.ERROR, prettifiedValue));
+            }
             for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {
-                errors.add(new OpeningHoursTestError(i.toString(), Severity.WARNING, prettifiedValue));
+                errors.add(new OpeningHoursTestError(i.toString().trim(), Severity.WARNING, prettifiedValue));
             }
             return errors;
-        } catch (ScriptException ex) {
-            final String message = ex.getMessage()
-                    .replaceAll("[^:]*Exception: ", key+" - ")
-                    .replaceAll("\\(<Unknown source.*", "")
-                    .trim();
-            return Arrays.asList(new OpeningHoursTestError(message, Severity.ERROR));
         } catch (final Exception ex) {
             throw new RuntimeException(ex);