Changeset 13296 in josm for trunk

Timestamp:

2018-01-07T23:36:55+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15582 - more public APIs for opening_hours parsing

File:

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

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

@@ -232 +232 @@
             String prettifiedValue = null;
             try {
-                prettifiedValue = (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
+                prettifiedValue = getOpeningHoursPrettifiedValues(r);
             } catch (ScriptException | NoSuchMethodException e) {
                 Logging.warn(e);
             }
-            for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"))) {
+            for (final Object i : getOpeningHoursErrors(r)) {
                 errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.ERROR, prettifiedValue));
             }
-            for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {
+            for (final Object i : getOpeningHoursWarnings(r)) {
                 errors.add(new OpeningHoursTestError(getErrorMessage(key, i), Severity.WARNING, prettifiedValue));
             }
@@ -249 +249 @@
         }
         return errors;
+    }
+
+    /**
+     * Returns the prettified value returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the prettified value returned by the opening hours parser
+     * @throws NoSuchMethodException if method "prettifyValue" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final String getOpeningHoursPrettifiedValues(Object r) throws NoSuchMethodException, ScriptException {
+        return (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
+    }
+
+    /**
+     * Returns the list of errors returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the list of errors returned by the opening hours parser
+     * @throws NoSuchMethodException if method "getErrors" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final List<Object> getOpeningHoursErrors(Object r) throws NoSuchMethodException, ScriptException {
+        return getList(((Invocable) ENGINE).invokeMethod(r, "getErrors"));
+    }
+
+    /**
+     * Returns the list of warnings returned by the opening hours parser.
+     * @param r result of {@link #parse}
+     * @return the list of warnings returned by the opening hours parser
+     * @throws NoSuchMethodException if method "getWarnings" or matching argument types cannot be found
+     * @throws ScriptException if an error occurs during invocation of the JavaScript method
+     * @since 13296
+     */
+    public final List<Object> getOpeningHoursWarnings(Object r) throws NoSuchMethodException, ScriptException {
+        return getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"));
     }