Fix french holidays

Signed-off-by: XSpielinbox <[email protected]>
focus-shift · Sep 25, 2023 · d16714e · d16714e
1 parent e33ba51
commit d16714e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_fr.xml b/jollyday-core/src/main/resources/holidays/Holidays_fr.xml
@@ -13,7 +13,6 @@
     <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
     <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
     <ChristianHoliday type="ASCENSION_DAY" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
     <ChristianHoliday type="WHIT_MONDAY" validTo="2003" descriptionPropertiesKey="christian.WHIT_MONDAY"/>

diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayFRTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayFRTest.java
@@ -13,7 +13,7 @@ class HolidayFRTest extends AbstractCountryTestBase {
 
   @Test
   void testManagerFRStructure() {
-    validateCalendarData(ISO_CODE, YEAR);
+    validateCalendarData(ISO_CODE, YEAR, true);
   }
 
   @Test

diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_fr_2010.xml
@@ -12,9 +12,9 @@
     <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
     <Fixed month="NOVEMBER" day="11" descriptionPropertiesKey="REMEMBRANCE"/>
     <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
-    <Fixed month="APRIL" day="5" descriptionPropertiesKey="EASTER_MONDAY"/>
-    <Fixed month="MAY" day="13" descriptionPropertiesKey="ASCENSION_DAY"/>
-    <Fixed month="MAY" day="24" descriptionPropertiesKey="WHIT_MONDAY"/>
+    <Fixed month="APRIL" day="5" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <Fixed month="MAY" day="13" descriptionPropertiesKey="christian.ASCENSION_DAY"/>
+    <Fixed month="MAY" day="24" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
   </Holidays>
   <SubConfigurations hierarchy="ma"
                      description="Martinique">
@@ -42,14 +42,14 @@
   <SubConfigurations hierarchy="br" description="Bas-Rhin">
     <Holidays>
       <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="hr"
                      description="Haut-Rhin">
     <Holidays>
       <Fixed month="DECEMBER" day="26"/>
-      <ChristianHoliday type="GOOD_FRIDAY"/>
+      <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
     </Holidays>
   </SubConfigurations>
   <SubConfigurations hierarchy="mo" description="Moselle">