Changeset 17085 in josm for trunk

Timestamp:

2020-10-05T19:28:46+02:00 (4 years ago)

Author:

simon04

Message:

fix #19743, fix #19879 - Update to OpeningHoursParser 0.22.1

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.13.0" transitive="false"/>
-        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.22.0"/>
+        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.22.1"/>
         <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.8.3"/>
@@ -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.13.0" transitive="false"/>
-        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.22.0"/>
+        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.22.1"/>
         <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.8.3"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->

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

@@ -74 +74 @@
         assertThat(checkOpeningHourSyntax(key, "09:00-21:00"), isEmpty());
         assertThat(checkOpeningHourSyntax(key, "Su-Th sunset-24:00,04:00-sunrise; Fr-Sa sunset-sunrise"), isEmpty());
+        assertThat(checkOpeningHourSyntax(key, "PH Su 10:00-12:00"), isEmpty()); // see #19743
+        assertThat(checkOpeningHourSyntax(key, "SH Mo-Fr 09:33-15:35"), isEmpty()); // see #19743
     }