Merge pull request #699 from focus-shift/698-easter-monday

switzerland: move easter monday from valais to vaud
focus-shift · Dec 19, 2024 · 9525d6a · 9525d6a
2 parents 7ef6e31 + fed4575
commit 9525d6a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_ch.xml b/jollyday-core/src/main/resources/holidays/Holidays_ch.xml
@@ -279,6 +279,7 @@
         <FixedWeekday which="THIRD" weekday="SUNDAY" month="SEPTEMBER"/>
       </RelativeToWeekdayInMonth>
       <ChristianHoliday type="GOOD_FRIDAY" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <ChristianHoliday type="WHIT_MONDAY" descriptionPropertiesKey="christian.WHIT_MONDAY"/>
     </Holidays>
   </SubConfigurations>
@@ -289,7 +290,6 @@
       <Fixed month="AUGUST" day="15" descriptionPropertiesKey="ASSUMPTION_DAY"/>
       <Fixed month="NOVEMBER" day="1" descriptionPropertiesKey="ALL_SAINTS"/>
       <Fixed month="DECEMBER" day="8" descriptionPropertiesKey="IMMACULATE_CONCEPTION"/>
-      <ChristianHoliday type="EASTER_MONDAY" descriptionPropertiesKey="christian.EASTER_MONDAY"/>
       <ChristianHoliday type="CORPUS_CHRISTI" descriptionPropertiesKey="christian.CORPUS_CHRISTI"/>
     </Holidays>
   </SubConfigurations>

diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayCHTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayCHTest.java
@@ -8,6 +8,7 @@
 import static java.time.Month.AUGUST;
 import static java.time.Month.DECEMBER;
 import static java.time.Month.JANUARY;
+import static java.time.Month.MARCH;
 import static java.time.Month.NOVEMBER;
 
 
@@ -23,32 +24,28 @@ void ensuresHolidays() {
       .hasChristianHoliday("EASTER").and()
 
       /* Aargau */
-      .hasFixedHoliday("ST_BERCHTHOLD", JANUARY, 2)
-        .inSubdivision("ag")
-      .and()
-      .hasFixedHoliday("ASSUMPTION_DAY", AUGUST, 15)
-        .inSubdivision("ag")
-      .and()
-      .hasFixedHoliday("ALL_SAINTS", NOVEMBER, 1)
-        .inSubdivision("ag")
-      .and()
-      .hasFixedHoliday("STEPHENS", DECEMBER, 26)
-        .inSubdivision("ag")
-      .and()
-      .hasFixedHoliday("IMMACULATE_CONCEPTION", DECEMBER, 8)
-        .inSubdivision("ag")
-      .and()
-      .hasChristianHoliday("GOOD_FRIDAY")
-        .inSubdivision("ag")
-      .and()
-      .hasChristianHoliday("EASTER_MONDAY")
-        .inSubdivision("ag")
-      .and()
-      .hasChristianHoliday("WHIT_MONDAY")
-        .inSubdivision("ag")
-      .and()
-      .hasChristianHoliday("CORPUS_CHRISTI")
-        .inSubdivision("ag")
+      .hasFixedHoliday("ST_BERCHTHOLD", JANUARY, 2).inSubdivision("ag").and()
+      .hasFixedHoliday("ASSUMPTION_DAY", AUGUST, 15).inSubdivision("ag").and()
+      .hasFixedHoliday("ALL_SAINTS", NOVEMBER, 1).inSubdivision("ag").and()
+      .hasFixedHoliday("STEPHENS", DECEMBER, 26).inSubdivision("ag").and()
+      .hasFixedHoliday("IMMACULATE_CONCEPTION", DECEMBER, 8).inSubdivision("ag").and()
+      .hasChristianHoliday("GOOD_FRIDAY").inSubdivision("ag").and()
+      .hasChristianHoliday("EASTER_MONDAY").inSubdivision("ag").and()
+      .hasChristianHoliday("WHIT_MONDAY").inSubdivision("ag").and()
+      .hasChristianHoliday("CORPUS_CHRISTI").inSubdivision("ag").and()
+
+      /* Vaud */
+      .hasFixedHoliday("ST_BERCHTHOLD", JANUARY, 2).inSubdivision("vd").and()
+      .hasChristianHoliday("GOOD_FRIDAY").inSubdivision("vd").and()
+      .hasChristianHoliday("EASTER_MONDAY").inSubdivision("vd").and()
+      .hasChristianHoliday("WHIT_MONDAY").inSubdivision("vd").and()
+
+      /* Valais */
+      .hasFixedHoliday("ST_JOSEPH", MARCH, 19).inSubdivision("vs").and()
+      .hasFixedHoliday("ASSUMPTION_DAY", AUGUST, 15).inSubdivision("vs").and()
+      .hasFixedHoliday("ALL_SAINTS", NOVEMBER, 1).inSubdivision("vs").and()
+      .hasFixedHoliday("IMMACULATE_CONCEPTION", DECEMBER, 8).inSubdivision("vs").and()
+      .hasChristianHoliday("CORPUS_CHRISTI").inSubdivision("vs")
 
       .check();
   }