Merge pull request #508 from XSpielinbox/Improve_british_crown_tests

Improve british crown dependencies tests
focus-shift · Apr 11, 2024 · 93448f8 · 93448f8
2 parents 4755327 + 38e8c80
commit 93448f8
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayGGTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayGGTest.java
@@ -42,7 +42,7 @@ void ensuresThatKingsCoronationForKingCharlesIIIIn2023() {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {2010, 2017, 2018, 2019, 2020, 2021, 2022, 2023})
+  @ValueSource(ints = {2010, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024})
   void testManagerGGStructure(final int year) {
     validateCalendarData(ISO_CODE, year, true);
   }

diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayJETest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayJETest.java
@@ -42,7 +42,7 @@ void ensuresThatKingsCoronationForKingCharlesIIIIn2023() {
   }
 
   @ParameterizedTest
-  @ValueSource(ints = {2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023})
+  @ValueSource(ints = {2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024})
   void testManagerJEStructure(final int year) {
     validateCalendarData(ISO_CODE, year, true);
   }

diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_gg_2024.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_gg_2024.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration hierarchy="gg" description="Guernsey"
+               xmlns="https://focus_shift.de/jollyday/schema/holiday"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
+  <Holidays>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="MARCH" day="29" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <Fixed month="APRIL" day="1" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <Fixed month="MAY" day="6" descriptionPropertiesKey="MAY_DAY_BANK_HOLIDAY"/>
+    <Fixed month="MAY" day="9" descriptionPropertiesKey="LIBERATION"/>
+    <Fixed month="MAY" day="27" descriptionPropertiesKey="SPRING_BANK_HOLIDAY"/>
+    <Fixed month="AUGUST" day="26" descriptionPropertiesKey="SUMMER_BANK_HOLIDAY"/>
+    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+    <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY"/>
+  </Holidays>
+</Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_je_2024.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_je_2024.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration hierarchy="je" description="Jersey"
+               xmlns="https://focus_shift.de/jollyday/schema/holiday"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
+  <Holidays>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="MARCH" day="29" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <Fixed month="APRIL" day="1" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
+    <Fixed month="MAY" day="6" descriptionPropertiesKey="EARLY_MAY_BANK_HOLIDAY"/>
+    <Fixed month="MAY" day="9" descriptionPropertiesKey="LIBERATION"/>
+    <Fixed month="MAY" day="27" descriptionPropertiesKey="SPRING_BANK_HOLIDAY"/>
+    <Fixed month="AUGUST" day="26" descriptionPropertiesKey="SUMMER_BANK_HOLIDAY"/>
+    <Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+    <Fixed month="DECEMBER" day="26" descriptionPropertiesKey="BOXING_DAY"/>
+  </Holidays>
+</Configuration>