Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Further test improvements #700

Merged
merged 2 commits into from
Dec 21, 2024
Merged

Further test improvements #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
071cf95
tests: improve turkey tests
derTobsch Dec 21, 2024
c9d70dc
tests: improve Uruguay tests
derTobsch Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions jollyday-core/src/main/resources/holidays/Holidays_tr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
<Fixed month="JULY" day="15" descriptionPropertiesKey="TURKEY_DEMOCRATIC_UNITY_DAY"/>
<Fixed month="AUGUST" day="30" descriptionPropertiesKey="TURKEY_VICTORY_DAY"/>
<Fixed month="OCTOBER" day="29" descriptionPropertiesKey="TURKEY_REPUBLIC_DAY"/>
<IslamicHoliday type="ID_AL_FITR"
descriptionPropertiesKey="islamic.ID_AL_FITR"/> <!-- Ramazan / Şeker bayramı -->
<IslamicHoliday type="ID_AL_FITR" descriptionPropertiesKey="islamic.ID_AL_FITR"/> <!-- Ramazan / Şeker bayramı -->
<IslamicHoliday type="ID_UL_ADHA" descriptionPropertiesKey="islamic.ID_UL_ADHA"/> <!-- Kurban bayramı -->
</Holidays>
</Configuration>
93 changes: 40 additions & 53 deletions jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayTRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,52 @@
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 org.junit.jupiter.api.Test;

import java.time.LocalDate;
import java.time.Year;
import java.util.Set;

import static org.assertj.core.api.Assertions.assertThat;
import static de.focus_shift.jollyday.core.HolidayCalendar.TURKEY;
import static de.focus_shift.jollyday.tests.CalendarCheckerApi.assertFor;
import static java.time.Month.APRIL;
import static java.time.Month.AUGUST;
import static java.time.Month.JANUARY;
import static java.time.Month.JULY;
import static java.time.Month.MAY;
import static java.time.Month.OCTOBER;

class HolidayTRTest extends AbstractCountryTestBase {
class HolidayTRTest {

private static final String ISO_CODE = "tr";
private static final Year YEAR = Year.of(2019);


@Test
void testManagerTRStructure() {
validateCalendarData(ISO_CODE, YEAR);
}

@Test
void testNumberOfHolidays() {
final HolidayManager holidayManager = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.TURKEY));
final Set<Holiday> holidays = holidayManager.getHolidays(YEAR);
assertThat(holidays).hasSize(9);
}

@Test
void testRamazan2019() {
// Actually, in Turkey, Ramadan is one day after Eid Mubarak, for keep the Eid al Fitr for now
final LocalDate expected = LocalDate.of(YEAR.getValue(), 6, 4);
final HolidayManager holidayManager = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.TURKEY));
final Set<Holiday> holidays = holidayManager.getHolidays(YEAR);
assertThat(holidays).hasSize(9);
boolean found = false;
for (Holiday holiday : holidays) {
if (holiday.getPropertiesKey().equals("islamic.ID_AL_FITR") && holiday.getDate().equals(expected)) {
found = true;
break;
}
}
assertThat(found).isTrue();
}
private static final Year YEAR_FROM = Year.of(1900);
private static final Year YEAR_TO = Year.of(2173);

@Test
void testKurban2019() {
final LocalDate expected = LocalDate.of(YEAR.getValue(), 8, 11);
final HolidayManager holidayManager = HolidayManager.getInstance(ManagerParameters.create(HolidayCalendar.TURKEY));
final Set<Holiday> holidays = holidayManager.getHolidays(YEAR);
assertThat(holidays).hasSize(9);
boolean found = false;
for (Holiday holiday : holidays) {
if (holiday.getPropertiesKey().equals("islamic.ID_UL_ADHA") && holiday.getDate().equals(expected)) {
found = true;
break;
}
}
assertThat(found).isTrue();
void ensuresHolidays() {

assertFor(TURKEY)
.hasFixedHoliday("NEW_YEAR", JANUARY, 1)
.between(YEAR_FROM, YEAR_TO)
.and()
.hasFixedHoliday("TURKEY_CHILDRENS_DAY", APRIL, 23)
.between(YEAR_FROM, YEAR_TO)
.and()
.hasFixedHoliday("LABOUR_DAY", MAY, 1)
.between(YEAR_FROM, YEAR_TO)
.and()
.hasFixedHoliday("TURKEY_COMMEMORATION_OF_ATATURK", MAY, 19)
.between(Year.of(2004), YEAR_TO)
.and()
.hasFixedHoliday("TURKEY_DEMOCRATIC_UNITY_DAY", JULY, 15)
.between(YEAR_FROM, YEAR_TO).and()
.hasFixedHoliday("TURKEY_VICTORY_DAY", AUGUST, 30)
.between(Year.of(2003), YEAR_TO)
.and()
.hasFixedHoliday("TURKEY_REPUBLIC_DAY", OCTOBER, 29)
.between(Year.of(2003), YEAR_TO)
.and()
.hasIslamicHoliday("ID_AL_FITR")
.between(YEAR_FROM, YEAR_TO)
.and()
.hasIslamicHoliday("ID_UL_ADHA")
.between(YEAR_FROM, YEAR_TO)
.check();
}
}
118 changes: 48 additions & 70 deletions jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayUYTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,80 +1,58 @@
package de.focus_shift.jollyday.tests.country;

import de.focus_shift.jollyday.core.Holiday;
import de.focus_shift.jollyday.core.HolidayManager;
import de.focus_shift.jollyday.core.ManagerParameters;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.time.LocalDate;
import java.time.Year;
import java.util.Set;
import java.time.DayOfWeek;

import static de.focus_shift.jollyday.core.HolidayCalendar.URUGUAY;
import static org.assertj.core.api.Assertions.assertThat;

class HolidayUYTest extends AbstractCountryTestBase {

private HolidayManager holidayManager;

@BeforeEach
void init() {
holidayManager = HolidayManager.getInstance(ManagerParameters.create(URUGUAY));
}

@Test
void testManagerUYStructure() {
validateCalendarData("uy", Year.of(2016));
}

@Test
void testManagerUYLanding33EasternersMovingDaysWhenLanding33EasternersOnTuesday() {
final int year = 2016;
final LocalDate landing33Easterners = LocalDate.of(year, 4, 18);
assertThat(contains(landing33Easterners, holidayManager.getHolidays(Year.of(year)))).isTrue();
}

@Test
void testManagerUYLanding33EasternersMovingDaysWhenLanding33EasternersOnThursday() {
final int year = 2007;
final LocalDate landing33Easterners = LocalDate.of(year, 4, 23);
assertThat(contains(landing33Easterners, holidayManager.getHolidays(Year.of(year)))).isTrue();
}

@Test
void testManagerUYRaceMovingDaysWhenRaceOnWednesday() {
final int year = 2016;
final LocalDate race = LocalDate.of(year, 10, 10);
assertThat(contains(race, holidayManager.getHolidays(Year.of(year)))).isTrue();
}

@Test
void testManagerUYRaceMovingDaysWhenRaceOnFriday() {
final int year = 2007;
final LocalDate race = LocalDate.of(year, 10, 15);
assertThat(contains(race, holidayManager.getHolidays(Year.of(year)))).isTrue();
}

@Test
void testManagerUYLasPiedrasMovingDaysWhenLasPiedrasOnTuesday() {
final int year = 2016;
final LocalDate lasPiedras = LocalDate.of(year, 5, 16);
assertThat(contains(lasPiedras, holidayManager.getHolidays(Year.of(year)))).isTrue();
}
import static de.focus_shift.jollyday.tests.CalendarChecker.Adjuster.PREVIOUS;
import static de.focus_shift.jollyday.tests.CalendarCheckerApi.assertFor;
import static java.time.Month.APRIL;
import static java.time.Month.AUGUST;
import static java.time.Month.DECEMBER;
import static java.time.Month.JANUARY;
import static java.time.Month.JULY;
import static java.time.Month.JUNE;
import static java.time.Month.MAY;
import static java.time.Month.NOVEMBER;
import static java.time.Month.OCTOBER;

class HolidayUYTest {

@Test
void testManagerUYLasPiedrasMovingDaysWhenLasPiedrasOnFriday() {
final int year = 2007;
final LocalDate lasPiedras = LocalDate.of(year, 5, 21);
assertThat(contains(lasPiedras, holidayManager.getHolidays(Year.of(year)))).isTrue();
}

private boolean contains(LocalDate localDate, Set<Holiday> holidays) {
for (Holiday h : holidays) {
if (localDate.equals(h.getDate())) {
return true;
}
}
return false;
void ensuresHolidays() {
assertFor(URUGUAY)
.hasFixedHoliday("NEW_YEAR", JANUARY, 1).and()
.hasFixedHoliday("EPIPHANY", JANUARY, 6).and()
.hasFixedHoliday("LANDING_33_EASTERNERS", APRIL, 19)
.canBeenShiftedFrom(DayOfWeek.TUESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.WEDNESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.THURSDAY, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.FRIDAY, DayOfWeek.MONDAY)
.and()
.hasFixedHoliday("LABOUR_DAY", MAY, 1).and()
.hasFixedHoliday("LAS_PIEDRAS", MAY, 18)
.canBeenShiftedFrom(DayOfWeek.TUESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.WEDNESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.THURSDAY, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.FRIDAY, DayOfWeek.MONDAY)
.and()
.hasFixedHoliday("ARTIGAS", JUNE, 19).and()
.hasFixedHoliday("CONSTITUTION_DAY", JULY, 18).and()
.hasFixedHoliday("INDEPENDENCE_DAY", AUGUST, 25).and()
.hasFixedHoliday("ALL_SOULS", NOVEMBER, 2).and()
.hasFixedHoliday("CHRISTMAS", DECEMBER, 25).and()
.hasFixedHoliday("RACE", OCTOBER, 12)
.canBeenShiftedFrom(DayOfWeek.TUESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.WEDNESDAY, PREVIOUS, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.THURSDAY, DayOfWeek.MONDAY)
.canBeenShiftedFrom(DayOfWeek.FRIDAY, DayOfWeek.MONDAY)
.and()
.hasChristianHoliday("EASTER").and()
.hasChristianHoliday("SHROVE_MONDAY").and()
.hasChristianHoliday("CARNIVAL").and()
.hasChristianHoliday("MAUNDY_THURSDAY").and()
.hasChristianHoliday("GOOD_FRIDAY")
.check();
}
}
9 changes: 0 additions & 9 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_tr_2019.xml
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions jollyday-tests/src/test/resources/holidays/Holidays_test_uy_2016.xml
View file
Open in desktop

This file was deleted.

Loading