Changeset 16178 in josm

Timestamp:

2020-03-20T21:06:06+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18956 - allow TestError to be built with an empty list of primitives + make OpeningHourTestTest work on Windows

Location:

trunk

Files:

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

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -220 +220 @@
          *
          * @return a new test error with the specified values
-         * @throws IllegalArgumentException when {@link #message} or {@link #primitives} is null/empty.
+         * @throws IllegalArgumentException when {@link #message} or {@link #primitives} is null.
          */
         public TestError build() {
             CheckParameterUtil.ensureParameterNotNull(message, "message not set");
             CheckParameterUtil.ensureParameterNotNull(primitives, "primitives not set");
-            CheckParameterUtil.ensureThat(!primitives.isEmpty(), "primitives is empty");
             if (this.highlighted == null) {
                 this.highlighted = Collections.emptySet();

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

@@ -46 +46 @@
      * @param message The error message
      * @param key The incriminated key, used for display.
+     * @param value The incriminated value, used for comparison with prettified value.
      * @param prettifiedValue The prettified value
      * @param p The incriminated OSM primitive.
      * @return The real test error given to JOSM validator. Can be fixable or not if a prettified values has been determined.
      */
-    private TestError createTestError(Severity severity, String message, String key, String prettifiedValue, OsmPrimitive p) {
+    private TestError createTestError(Severity severity, String message, String key, String value, String prettifiedValue, OsmPrimitive p) {
         final TestError.Builder error = TestError.builder(this, severity, 2901)
                 .message(tr("Opening hours syntax"), message) // todo obtain English message for ignore functionality
-                .primitives(p);
-        if (prettifiedValue == null || prettifiedValue.equals(p.get(key))) {
+                .primitives(p != null ? new OsmPrimitive[] {p} : new OsmPrimitive[] {});
+        if (p == null || prettifiedValue == null || prettifiedValue.equals(value)) {
             return error.build();
         } else {
@@ -96 +97 @@
             }
         } catch (ParseException e) {
-            return Collections.singletonList(createTestError(Severity.WARNING, e.getMessage(), key, prettifiedValue, p));
+            return Collections.singletonList(createTestError(Severity.WARNING, e.getMessage(), key, value, prettifiedValue, p));
         }
 
-        if (!includeOtherSeverityChecks() || Objects.equals(value, prettifiedValue) || p == null) {
+        if (!includeOtherSeverityChecks() || Objects.equals(value, prettifiedValue)) {
             return Collections.emptyList();
         } else {
             final String message = tr("{0} value can be prettified", key);
-            return Collections.singletonList(createTestError(Severity.OTHER, message, key, prettifiedValue, p));
+            return Collections.singletonList(createTestError(Severity.OTHER, message, key, value, prettifiedValue, p));
         }
     }

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

@@ -83 +83 @@
         final String key = "opening_hours";
         String value = ".";
-        assertEquals("Vorgefunden wurde:  \".\" \". \" in Zeile 0, Spalte 0\nErwartet wurde: <EOF>",
+        assertEquals(String.format("Vorgefunden wurde:  \".\" \". \" in Zeile 0, Spalte 0%nErwartet wurde: <EOF>"),
                 checkOpeningHourSyntax(key, value, Locale.GERMAN).get(0).getDescription());
-        assertEquals("Encountered:  \".\" \". \" at line 0, column 0\nWas expecting: <EOF>",
+        assertEquals(String.format("Encountered:  \".\" \". \" at line 0, column 0%nWas expecting: <EOF>"),
                 checkOpeningHourSyntax(key, value, Locale.ENGLISH).get(0).getDescription());
         value = "Mon-Thu 12-18";
@@ -140 +140 @@
         final String key = "opening_hours";
         assertThat(checkOpeningHourSyntax(key, "badtext"), hasSize(1));
-        assertEquals("Encountered:  <UNEXPECTED_CHAR> \"b \" at line 0, column 0\nWas expecting: <EOF>",
+        assertEquals(String.format("Encountered:  <UNEXPECTED_CHAR> \"b \" at line 0, column 0%nWas expecting: <EOF>"),
                 checkOpeningHourSyntax(key, "badtext").get(0).getDescription().trim());
         assertThat(checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m"), hasSize(1));
-        assertEquals("Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 2\nWas expecting: <EOF>",
+        assertEquals(String.format("Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 2%nWas expecting: <EOF>"),
                 checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getDescription());
     }