Changeset 16805 in josm

Timestamp:

2020-07-22T21:40:47+02:00 (4 years ago)

Author:

simon04

Message:

fix #19571 - Update to OpeningHoursParser 0.22.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.13.0" transitive="false"/>
-        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.21.4"/>
+        <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.22.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.7.15"/>
@@ -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.21.4"/>
+        <dependency conf="sources->sources" org="ch.poole" name="OpeningHoursParser" rev="0.22.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.7.15"/><!-- sources->default sic! (tag2link-sources.jar is empty, see #19335) -->

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

@@ -191 +191 @@
         // assertThat(checkOpeningHourSyntax(key, "Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00"), isEmpty());
         assertThat(checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00"), hasSize(1));
-        assertFixEquals("Mo-Fr 00:00-00:30,04:00-00:30; PH,Sa,Su 00:00-24:00",
+        assertFixEquals("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00",
                 checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00").get(0));
-        assertFixEquals("Mo-Fr 00:00-00:30,04:00-00:30; PH,Sa,Su 00:00-24:00",
+        assertFixEquals("Mo-Fr 00:00-00:30,04:00-00:30; Sa,Su,PH 00:00-24:00",
                 checkOpeningHourSyntax(key, "Mo-Fr 0:00-0:30,4:00-00:30; Sa,Su,PH 0:00-24:00").get(0));
     }