Changeset 17591 in josm for trunk

Timestamp:

2021-03-19T19:52:15+01:00 (4 years ago)

Author:

simon04

Message:

see #20626 - OpeningHoursParser: report multiple parse exceptions

Location:

trunk

Files:

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

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

@@ -11 +11 @@
 import java.util.Locale;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
 
+import ch.poole.openinghoursparser.OpeningHoursParseException;
 import ch.poole.openinghoursparser.OpeningHoursParser;
-import ch.poole.openinghoursparser.ParseException;
 import ch.poole.openinghoursparser.Rule;
 import ch.poole.openinghoursparser.Util;
@@ -106 +107 @@
                 new OpeningHoursParser(new StringReader(value)).rules(true);
             }
-        } catch (ParseException e) {
-            return Collections.singletonList(createTestError(Severity.WARNING, e.getMessage(), key, value, prettifiedValue, p));
+        } catch (OpeningHoursParseException e) {
+            String message = e.getExceptions().stream()
+                    .map(OpeningHoursParseException::getMessage)
+                    .distinct()
+                    .collect(Collectors.joining("; "));
+            return Collections.singletonList(createTestError(Severity.WARNING, message, key, value, prettifiedValue, p));
         }
 

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

@@ -90 +90 @@
                 checkOpeningHourSyntax(key, value, Locale.ENGLISH).get(0).getDescription());
         value = "Mon-Thu 12-18";
-        assertEquals("Wochentag mit 3 Buchstaben in Zeile 1, Spalte 4",
+        assertEquals("Wochentag mit 3 Buchstaben in Zeile 1, Spalte 4; Wochentag mit 3 Buchstaben in Zeile 1, Spalte 9; Stunden ohne Minuten",
                 checkOpeningHourSyntax(key, value, Locale.GERMAN).get(0).getDescription());
-        assertEquals("Three character weekday at line 1, column 4",
+        assertEquals("Three character weekday at line 1, column 4; Three character weekday at line 1, column 9; Hours without minutes",
                 checkOpeningHourSyntax(key, value, Locale.ENGLISH).get(0).getDescription());
     }
@@ -118 +118 @@
         assertThat(errors, hasSize(1));
         assertFixEquals("Sa-Su 10:00-20:00", errors.get(0));
-        assertEquals("Invalid minutes at line 1, column 12", errors.get(0).getDescription());
+        assertEquals("Invalid minutes at line 1, column 12; Invalid minutes at line 1, column 17", errors.get(0).getDescription());
         assertEquals(Severity.WARNING, errors.get(0).getSeverity());
     }
@@ -145 +145 @@
                 checkOpeningHourSyntax(key, "badtext").get(0).getDescription().trim());
         assertThat(checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m"), hasSize(1));
-        assertEquals(String.format("Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 3%nWas expecting: <EOF>"),
+        assertEquals(String.format("Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 3%nWas expecting: <EOF>; " +
+                        "Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 13%n" +
+                        "Was expecting: <EOF>"),
                 checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getDescription());
     }