Changeset 17590 in josm for trunk

Timestamp:

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

Author:

simon04

Message:

fix #20626 - Update to OpeningHoursParser 0.23.0

Location:

trunk

Files:

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

trunk/ivy.xml

@@ -29 +29 @@
         <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.10"/>
         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.15.0" transitive="false"/>
-        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.22.1"/>
+        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.23.0"/>
         <dependency conf="api->default" org="oauth.signpost" name="signpost-core" rev="2.0.0"/>
         <dependency conf="api->default" org="org.webjars.npm" name="tag2link" rev="2020.10.18"/>
@@ -41 +41 @@
         <dependency conf="sources->sources" org="com.adobe.xmp" name="xmpcore" rev="6.1.10"/>
         <dependency conf="sources->sources" org="com.drewnoakes" name="metadata-extractor" rev="2.15.0" transitive="false"/>
-        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.22.1"/>
+        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.23.0"/>
         <dependency conf="sources->sources" org="oauth.signpost" name="signpost-core" rev="2.0.0"/>
         <dependency conf="sources->default" org="org.webjars.npm" name="tag2link" rev="2020.10.18"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->

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

@@ -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 2%nWas expecting: <EOF>"),
+        assertEquals(String.format("Encountered:  <UNEXPECTED_CHAR> \"p \" at line 1, column 3%nWas expecting: <EOF>"),
                 checkOpeningHourSyntax(key, "5.00 p.m-11.00 p.m").get(0).getDescription());
     }