Changeset 6568 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-30T23:57:06+01:00 (10 years ago)

Author:

simon04

Message:

fix #9462 - fix preset values for opening_hour/… such that the OpeningHourTest does not yield warnings, add unit test that validates all preset values

File:

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

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

@@ -123 +123 @@
 
         /**
-         * Constructs a new {@code OpeningHoursTestError}.
-         * @param message The error message
-         * @param severity The error severity
-         */
-        public OpeningHoursTestError(String message, Severity severity) {
-            this(message, severity, null);
-        }
-
-        /**
          * Returns the real test error given to JOSM validator.
          * @param p The incriminated OSM primitive.
@@ -168 +159 @@
         public Severity getSeverity() {
             return severity;
+        }
+
+        @Override
+        public String toString() {
+            return getMessage() + " => " + getPrettifiedValue();
         }
     }
@@ -217 +213 @@
      */
     public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value) {
-        return checkOpeningHourSyntax(key, value, CheckMode.TIME_RANGE);
+        return checkOpeningHourSyntax(key, value, "opening_hours".equals(key) ? CheckMode.TIME_RANGE : CheckMode.BOTH);
     }