Add Singapore public holidays

Signed-off-by: XSpielinbox <[email protected]>
focus-shift · Sep 14, 2023 · 72d1499 · 72d1499
1 parent d4a065c
commit 72d1499
Show file tree

Hide file tree

Showing 16 changed files with 527 additions and 1 deletion.
diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
@@ -26,7 +26,7 @@ public enum HolidayCalendar {
   NETHERLANDS("NL"), NEW_ZEALAND("NZ"), NICARAGUA("NI"), NIGERIA("NG"), NORWAY("NO"), NYSE("NYSE"),
   PANAMA("PA"), PARAGUAY("PY"), PERU("PE"), POLAND("PL"), PORTUGAL("PT"),
   ROMANIA("RO"), RUSSIA("RU"),
-  SAUDI_ARABIA("SA"), SERBIA("RS"), SLOWAKIA("SK"), SLOWENIA("SI"), SOUTH_AFRICA("ZA"), SPAIN("ES"), SWEDEN("SE"), SWITZERLAND("CH"),
+  SAUDI_ARABIA("SA"), SERBIA("RS"), SINGAPORE("SG"), SLOWAKIA("SK"), SLOWENIA("SI"), SOUTH_AFRICA("ZA"), SPAIN("ES"), SWEDEN("SE"), SWITZERLAND("CH"),
   TARGET("TARGET"), TURKEY("TR"),
   UKRAINE("UA"), UNITED_ARAB_EMIRATES("AE"), UNITED_KINGDOM("GB"), UNITED_STATES(Locale.US.getCountry()), URUGUAY("UY"),
   VENEZUELA("VE");

diff --git a/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties b/jollyday-core/src/main/resources/descriptions/holiday_descriptions.properties
@@ -47,6 +47,7 @@ holiday.description.CESAR_CHAVEZ                     = César Chávez's Birthday
 holiday.description.CHACO_ARMISTICE                  = Chaco Armistice
 holiday.description.CHATHAM_ISLANDS_ANNIVERSARY      = Chatham Islands Anniversary
 holiday.description.CHILDRENS_DAY                    = Children's Day
+holiday.description.CHINESE_NEW_YEAR                 = Chinese New Year
 holiday.description.CHINESE_SPRING_FESTIVAL          = Chinese Spring Festival
 holiday.description.CHRISTMAS                        = Christmas
 holiday.description.CHRISTMAS_EVE                    = Christmas Eve
@@ -74,6 +75,7 @@ holiday.description.DAY_OF_PEACE                     = Day of peace
 holiday.description.DAY_OF_THE_GORANS                = Day of the Gorans
 holiday.description.DAY_OF_THE_TURKS                 = Day of the Turks
 holiday.description.DECLARATION_OF_INDEPENDENCE_DAY  = Declaration of Independence day
+holiday.description.DEEPAVALI                        = Deepavali
 holiday.description.DEFENDER_FATHERLAND              = Defender of the Fatherland
 holiday.description.DEFENDER_OF_UKRAINE              = Defender of Ukraine Day
 holiday.description.DISCOVERY_DAY                    = Discovery Day
@@ -123,6 +125,8 @@ holiday.description.GOODWILL                         = Day of Goodwill
 holiday.description.GOVERNMENT_CHANGE                = Change of Federal Government
 holiday.description.GREENERY_DAY                     = Greenery Day
 holiday.description.GUANACASTE                       = Guanacaste Day
+holiday.description.HARI_RAYA_HAJI                   = Hari Raya Haji
+holiday.description.HARI_RAYA_PUASA                  = Hari Raya Puasa
 holiday.description.HAWKES_BAY_ANNIVERSARY           = Hawke's Bay Anniversary
 holiday.description.HEALTH_SPORTS                    = Health and Sports Day
 holiday.description.HERITAGE                         = Heritage day
@@ -208,6 +212,7 @@ holiday.description.PICHINCHA                        = Battle of Pichincha
 holiday.description.PICNIC                           = Picnic Day
 holiday.description.PIONEER                          = Pioneer Day
 holiday.description.PLEBISCITE                       = Day of the plebiscite
+holiday.description.POLLING_DAY                      = Polling Day
 holiday.description.PRESEREN                         = Prešeren Day
 holiday.description.PRESIDENTS_DAY                   = Presidents Day
 holiday.description.PROCLAMATION                     = Proclamation Day
@@ -245,6 +250,7 @@ holiday.description.SERVICE_REDUCTION                = Service Reduction Day
 holiday.description.SETTE_GIUGNO                     = Sette Giugno
 holiday.description.SETTLER                          = Settlers' Day
 holiday.description.SEWARD                           = Seward's Day
+holiday.description.SG50_PUBLIC_HOLIDAY              = SG50 Public Holiday
 holiday.description.SHOWA_DAY                        = Showa Day
 holiday.description.SOLIDARITY_DAY                   = Solidarity Day
 holiday.description.SOMERS_DAY                       = Somers Day
@@ -290,6 +296,7 @@ holiday.description.TYNWALD                          = Tynwald Day
 holiday.description.UGAADI                           = Ugaadi
 holiday.description.UNIFICATION                      = Unification Day
 holiday.description.UNIFICATION_GERMANY              = German Unity Day
+holiday.description.VESAK_DAY                        = Vesak Day
 holiday.description.VETERANS_DAY                     = Veterans Day
 holiday.description.VICTORIA_DAY                     = Queen Victorias Birthday
 holiday.description.VICTORY                          = Victory Day

diff --git a/jollyday-core/src/main/resources/holidays/Holidays_sg.xml b/jollyday-core/src/main/resources/holidays/Holidays_sg.xml
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidaySGTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidaySGTest.java
@@ -0,0 +1,66 @@
+package de.focus_shift.jollyday.tests.country;
+
+import de.focus_shift.jollyday.core.Holiday;
+import de.focus_shift.jollyday.core.HolidayCalendar;
+import de.focus_shift.jollyday.core.HolidayManager;
+import de.focus_shift.jollyday.core.ManagerParameters;
+import de.focus_shift.jollyday.tests.country.base.AbstractCountryTestBase;
+import de.focus_shift.jollyday.core.util.CalendarUtil;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
+
+public class HolidaySGTest extends AbstractCountryTestBase {
+
+  private static final String ISO_CODE = "sg";
+
+  private final CalendarUtil calendarUtil = new CalendarUtil();
+
+  @ParameterizedTest
+  @ValueSource(ints = {2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024})
+  void testManagerVGStructure(final int year) {
+    validateCalendarData(ISO_CODE, year, true);
+  }
+
+  @Test
+  void testManagerVGInterval() {
+    try {
+      final HolidayManager instance = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.SINGAPORE, null));
+      final LocalDate startDateInclusive = calendarUtil.create(2022, 10, 1);
+      final LocalDate endDateInclusive = calendarUtil.create(2023, 1, 31);
+      final Set<Holiday> holidays = instance.getHolidays(startDateInclusive, endDateInclusive);
+      final List<LocalDate> expected = List.of(calendarUtil.create(2022, 10, 24),
+        calendarUtil.create(2022, 12, 26), calendarUtil.create(2023, 1, 2),
+        calendarUtil.create(2023, 1, 24), calendarUtil.create(2023, 1, 23));
+      assertThat(holidays).hasSameSizeAs(expected);
+      for (LocalDate d : expected) {
+        assertThat(calendarUtil.contains(holidays, d)).isTrue();
+      }
+    } catch (Exception e) {
+      fail("Unexpected error occurred: " + e.getClass().getName() + " - " + e.getMessage());
+    }
+  }
+
+  @Test
+  void testManagerDifferentInstance() {
+    final Locale defaultLocale = Locale.getDefault();
+    Locale.setDefault(Locale.US);
+    try {
+      final HolidayManager defaultManager = HolidayManager.getInstance();
+      final HolidayManager virginIslandsManager = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.SINGAPORE, null));
+      assertThat(defaultManager).isNotEqualTo(virginIslandsManager);
+    } catch (Exception e) {
+      fail("Unexpected error occurred: " + e.getClass().getName() + " - " + e.getMessage());
+    } finally {
+      Locale.setDefault(defaultLocale);
+    }
+  }
+}
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2013.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2013.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="11" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="MARCH" day="29" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="24" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="AUGUST" day="8" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="OCTOBER" day="15" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="NOVEMBER" day="2" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2014.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2014.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="JANUARY" day="31" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="1" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="18" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="13" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JULY" day="28" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="OCTOBER" day="6" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="OCTOBER" day="22" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2015.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2015.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="19" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="20" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="3" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="JUNE" day="1" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JULY" day="17" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="7" descriptionPropertiesKey="SG50_PUBLIC_HOLIDAY"/>
+    <tns:Fixed month="AUGUST" day="10" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="SEPTEMBER" day="11" descriptionPropertiesKey="POLLING_DAY"/>
+    <tns:Fixed month="SEPTEMBER" day="24" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="NOVEMBER" day="10" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2016.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2016.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="8" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="9" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="MARCH" day="25" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="2" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="21" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JULY" day="6" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="SEPTEMBER" day="12" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="OCTOBER" day="29" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2017.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2017.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="2" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="JANUARY" day="28" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="JANUARY" day="30" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="14" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="10" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JUNE" day="26" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="SEPTEMBER" day="1" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="OCTOBER" day="18" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2018.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2018.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="16" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="17" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="MARCH" day="30" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="29" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JUNE" day="15" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="AUGUST" day="22" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="NOVEMBER" day="6" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2019.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2019.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="5" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="6" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="19" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="20" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JUNE" day="5" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="AUGUST" day="12" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="OCTOBER" day="28" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2020.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2020.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="JANUARY" day="25" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="JANUARY" day="27" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="10" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="7" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="MAY" day="25" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="JULY" day="10" descriptionPropertiesKey="POLLING_DAY"/>
+    <tns:Fixed month="JULY" day="31" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="AUGUST" day="10" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="NOVEMBER" day="14" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2021.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2021.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="12" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="13" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="2" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="13" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="MAY" day="26" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JULY" day="20" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="NOVEMBER" day="4" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="25" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>
diff --git a/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2022.xml b/jollyday-tests/src/test/resources/holidays/Holidays_test_sg_2022.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:Configuration hierarchy="sg" description="Singapore" xmlns:tns="http://www.example.org/Holiday"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.example.org/Holiday /Holiday.xsd">
+  <tns:Holidays>
+    <tns:Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="1" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="FEBRUARY" day="2" descriptionPropertiesKey="CHINESE_NEW_YEAR"/>
+    <tns:Fixed month="APRIL" day="15" descriptionPropertiesKey="christian.GOOD_FRIDAY"/>
+    <tns:Fixed month="MAY" day="2" descriptionPropertiesKey="LABOUR_DAY"/>
+    <tns:Fixed month="MAY" day="3" descriptionPropertiesKey="HARI_RAYA_PUASA"/>
+    <tns:Fixed month="MAY" day="16" descriptionPropertiesKey="VESAK_DAY"/>
+    <tns:Fixed month="JULY" day="11" descriptionPropertiesKey="HARI_RAYA_HAJI"/>
+    <tns:Fixed month="AUGUST" day="9" descriptionPropertiesKey="NATIONAL_DAY"/>
+    <tns:Fixed month="OCTOBER" day="24" descriptionPropertiesKey="DEEPAVALI"/>
+    <tns:Fixed month="DECEMBER" day="26" descriptionPropertiesKey="CHRISTMAS"/>
+  </tns:Holidays>
+</tns:Configuration>