Changeset 16114 in josm

Timestamp:

2020-03-11T23:51:11+01:00 (4 years ago)

Author:

simon04

Message:

see #18140 - Update OpeningHoursParser to 0.21.1

Updated translations, removed annotations as a runtime dependency.

Location:

trunk

Files:

• ivy.xml (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (modified) (1 diff)

trunk/ivy.xml

@@ -22 +22 @@
         <dependency org="org.tukaani" name="xz" rev="1.8" conf="api->default"/>
         <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.13.0" conf="api->default"/>
-        <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.0" conf="api->default"/>
+        <dependency org="ch.poole" name="OpeningHoursParser" rev="0.21.1" conf="api->default"/>
     </dependencies>
 </ivy-module>

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, Zeichen 0\nErwartet wurde: <EOF>",
+        assertEquals("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>",
                 checkOpeningHourSyntax(key, value, Locale.ENGLISH).get(0).getDescription());
         value = "Mon-Thu 12-18";
-        assertEquals("Wochentag mit 3 Buchstaben in Zeile 1, Zeichen 4",
+        assertEquals("Wochentag mit 3 Buchstaben in Zeile 1, Spalte 4",
                 checkOpeningHourSyntax(key, value, Locale.GERMAN).get(0).getDescription());
         assertEquals("Three character weekday at line 1, column 4",