Skip to content

Commit

Permalink
change naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@tinohager
tinohager committed Mar 4, 2024
1 parent e5b723a commit a90e016
Show file tree
Hide file tree
Showing 22 changed files with 89 additions and 89 deletions.
2 changes: 1 addition & 1 deletion src/Nager.Date.Console/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Console.WriteLine("--------------------------------------------------------------------------------------------------");
Console.WriteLine("Date Observed English Name Local Name Type");

var publicHolidays = DateSystem.GetPublicHolidays(year, countryCode);
var publicHolidays = DateSystem.GetHolidays(year, countryCode);
foreach (var publicHoliday in publicHolidays)
{
var counties = publicHoliday.SubdivisionCodes != null ? string.Join(',', publicHoliday.SubdivisionCodes) : "";
Expand Down
10 changes: 5 additions & 5 deletions src/Nager.Date.UnitTest/Common/CountryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void CheckCountries()
{
foreach (CountryCode countryCode in Enum.GetValues(typeof(CountryCode)))
{
var provider = DateSystem.GetPublicHolidayProvider(countryCode);
var provider = DateSystem.GetHolidayProvider(countryCode);

var publicHolidays = provider.GetHolidays(2018);
if (!publicHolidays.Any())
Expand All @@ -36,7 +36,7 @@ public void CheckCounties()

foreach (CountryCode countryCode in Enum.GetValues(typeof(CountryCode)))
{
var provider = DateSystem.GetPublicHolidayProvider(countryCode);
var provider = DateSystem.GetHolidayProvider(countryCode);
var subdivisionCodes = provider is ISubdivisionCodesProvider subdivisionCodesProvider
? subdivisionCodesProvider.GetSubdivisionCodes()
: new Dictionary<string, string>();
Expand All @@ -46,7 +46,7 @@ public void CheckCounties()

for (var year = startYear; year <= endYear; year++)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, countryCode);
var publicHolidays = DateSystem.GetHolidays(year, countryCode);
foreach (var publicHoliday in publicHolidays)
{
if (publicHoliday.SubdivisionCodes == null)
Expand Down Expand Up @@ -77,15 +77,15 @@ public void CheckCounties()
[DataRow("DE")]
public void CheckCaseInsensitive(string countryCode)
{
var result = DateSystem.GetPublicHolidays(2018, countryCode);
var result = DateSystem.GetHolidays(2018, countryCode);

Assert.IsNotNull(result);
}

[TestMethod]
public void ThrowOnUndefinedEnum()
{
Assert.ThrowsException<ArgumentException>(() => DateSystem.GetPublicHolidays(2018, "1000"));
Assert.ThrowsException<ArgumentException>(() => DateSystem.GetHolidays(2018, "1000"));
}
}
}
6 changes: 3 additions & 3 deletions src/Nager.Date.UnitTest/Common/LogicTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void CheckPublicHolidayProviders()

foreach (CountryCode countryCode in Enum.GetValues(typeof(CountryCode)))
{
var publicHolidayProvider = DateSystem.GetPublicHolidayProvider(countryCode);
var publicHolidayProvider = DateSystem.GetHolidayProvider(countryCode);
if (publicHolidayProvider is NoHolidaysHolidayProvider)
{
continue;
Expand Down Expand Up @@ -56,7 +56,7 @@ public void Check_NoPublicHolidays_MoveInAnOtherYear()
{
try
{
var items = DateSystem.GetPublicHolidays(calculationYear, countryCode);
var items = DateSystem.GetHolidays(calculationYear, countryCode);
if (items.Any(o => !o.Date.Year.Equals(calculationYear)))
{
corruptPublicHolidaysFound = true;
Expand Down Expand Up @@ -236,7 +236,7 @@ public void CheckFindDayBetween5()
[ExpectedException(typeof(ArgumentException), "endDate is before startDate")]
public void CheckPublicHolidayWithDateFilter2()
{
DateSystem.GetPublicHolidays(new DateTime(2016, 1, 2), new DateTime(2016, 1, 1), CountryCode.DE).First();
DateSystem.GetHolidays(new DateTime(2016, 1, 2), new DateTime(2016, 1, 1), CountryCode.DE).First();
}

[TestMethod]
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/AustriaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class AustriaTest
public void TestAustria2017()
{
var year = 2017;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.AT).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.AT).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 6), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/CanadaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class CanadaTest
public void TestCanada2017()
{
var year = 2017;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.CA).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.CA).ToArray();

//New Year's Day
Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Expand Down
4 changes: 2 additions & 2 deletions src/Nager.Date.UnitTest/Country/ChileTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class ChileTest

public void TestColumbusDay(int year, int month, int expectedDay)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.CL).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.CL).ToArray();

var publicHoliday = publicHolidays.FirstOrDefault(holiday => holiday.EnglishName == "Columbus Day");
Assert.IsNotNull(publicHoliday);
Expand All @@ -45,7 +45,7 @@ public void TestColumbusDay(int year, int month, int expectedDay)

public void TestReformationDay(int year, int month, int expectedDay)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.CL).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.CL).ToArray();

var publicHoliday = publicHolidays.FirstOrDefault(holiday => holiday.EnglishName == "Reformation Day");
Assert.IsNotNull(publicHoliday);
Expand Down
12 changes: 6 additions & 6 deletions src/Nager.Date.UnitTest/Country/ChinaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ public class ChinaTest
[TestMethod]
public void TestChina2015()
{
var publicHolidays = DateSystem.GetPublicHolidays(2015, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2015, CountryCode.CN).ToArray();
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2015, 9, 27) && o.EnglishName == "Mid-Autumn Festival"));
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2015, 4, 5) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)"));
}

[TestMethod]
public void TestChina2016()
{
var publicHolidays = DateSystem.GetPublicHolidays(2016, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2016, CountryCode.CN).ToArray();
var test1 = publicHolidays.Any(o => o.Date == new DateTime(2016, 9, 15) && o.EnglishName == "Mid-Autumn Festival");
var test2 = publicHolidays.Any(o => o.Date == new DateTime(2016, 4, 4) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)");

Expand All @@ -36,7 +36,7 @@ public void TestChina2016()
[TestMethod]
public void TestChina2017()
{
var publicHolidays = DateSystem.GetPublicHolidays(2017, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2017, CountryCode.CN).ToArray();
var test1 = publicHolidays.Any(o => o.Date == new DateTime(2017, 10, 4) && o.EnglishName == "Mid-Autumn Festival");
var test2 = publicHolidays.Any(o => o.Date == new DateTime(2017, 4, 4) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)");

Expand All @@ -53,23 +53,23 @@ public void TestChina2017()
[TestMethod]
public void TestChina2018()
{
var publicHolidays = DateSystem.GetPublicHolidays(2018, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2018, CountryCode.CN).ToArray();
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2018, 9, 24) && o.EnglishName == "Mid-Autumn Festival"));
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2018, 4, 5) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)"));
}

[TestMethod]
public void TestChina2019()
{
var publicHolidays = DateSystem.GetPublicHolidays(2019, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2019, CountryCode.CN).ToArray();
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2019, 9, 13) && o.EnglishName == "Mid-Autumn Festival"));
Assert.IsTrue(publicHolidays.Any(o => o.Date == new DateTime(2019, 4, 5) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)"));
}

[TestMethod]
public void TestChina2020()
{
var publicHolidays = DateSystem.GetPublicHolidays(2020, CountryCode.CN).ToArray();
var publicHolidays = DateSystem.GetHolidays(2020, CountryCode.CN).ToArray();

var test1 = publicHolidays.Any(o => o.Date == new DateTime(2020, 10, 1) && o.EnglishName == "Mid-Autumn Festival");
var test2 = publicHolidays.Any(o => o.Date == new DateTime(2020, 4, 4) && o.EnglishName == "Qingming Festival (Tomb-Sweeping Day)");
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/ColombiaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class ColombiaTest
[TestMethod]
public void TestColombia_2022()
{
var publicHolidays = DateSystem.GetPublicHolidays(2022, CountryCode.CO).ToArray();
var publicHolidays = DateSystem.GetHolidays(2022, CountryCode.CO).ToArray();

var saintJosephsDay = publicHolidays.SingleOrDefault(o => o.EnglishName == "Saint Joseph's Day");
Assert.AreEqual(new DateTime(2022, 03, 21), saintJosephsDay.ObservedDate);
Expand Down
8 changes: 4 additions & 4 deletions src/Nager.Date.UnitTest/Country/GermanyTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public void TestGermanyCorpusChristi()
var yearToTest = 2017;

var catholicProvider = new MockPublicHolidayProvider(new CatholicProvider());
var publicHolidays = DateSystem.GetPublicHolidays(yearToTest, CountryCode.DE);
var publicHolidays = DateSystem.GetHolidays(yearToTest, CountryCode.DE);
var easterSunday = catholicProvider.EasterSunday(yearToTest);
var corpusChristi = publicHolidays.First(x => x.LocalName == "Fronleichnam").Date;
Assert.AreEqual(easterSunday.AddDays(60), corpusChristi);
Expand All @@ -26,7 +26,7 @@ public void TestGermanyCorpusChristi2017()
{
var yearToTest = 2017;

var publicHolidays = DateSystem.GetPublicHolidays(yearToTest, CountryCode.DE);
var publicHolidays = DateSystem.GetHolidays(yearToTest, CountryCode.DE);
var corpusChristi = publicHolidays.First(x => x.LocalName == "Fronleichnam").Date;
var expectedDate = new DateTime(yearToTest, 6, 15);
Assert.AreEqual(expectedDate, corpusChristi);
Expand All @@ -37,7 +37,7 @@ public void TestGermanyCorpusChristi2026()
{
var yearToTest = 2026;

var publicHolidays = DateSystem.GetPublicHolidays(yearToTest, CountryCode.DE);
var publicHolidays = DateSystem.GetHolidays(yearToTest, CountryCode.DE);
var corpusChristi = publicHolidays.First(x => x.LocalName == "Fronleichnam").Date;
var expectedDate = new DateTime(yearToTest, 6, 4);
Assert.AreEqual(expectedDate, corpusChristi);
Expand All @@ -46,7 +46,7 @@ public void TestGermanyCorpusChristi2026()
[TestMethod]
public void TestGermanyLiberationDay2020()
{
var publicHolidays = DateSystem.GetPublicHolidays(
var publicHolidays = DateSystem.GetHolidays(
new DateTime(2019, 5, 8),
new DateTime(2021, 5, 8),
CountryCode.DE);
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/HungaryTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class HungaryTest
public void TestHungaryHoliday2018()
{
var year = 2018;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.HU).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.HU).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 3, 15), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand Down
4 changes: 2 additions & 2 deletions src/Nager.Date.UnitTest/Country/JapanTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class JapanTest
[DataRow(2022, 2022, 03, 21)]
public void Check_VernalEquinoxDay(int year, int expectedYear, int expectedMonth, int expectedDay)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.JP).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.JP).ToArray();
var publicHoliday = publicHolidays.Where(o => o.EnglishName == "Vernal Equinox Day").SingleOrDefault();

Assert.AreEqual(new DateTime(expectedYear, expectedMonth, expectedDay), publicHoliday.Date);
Expand All @@ -37,7 +37,7 @@ public void Check_VernalEquinoxDay(int year, int expectedYear, int expectedMonth
[DataRow(2022, 2022, 09, 23)]
public void Check_AutumnalEquinoxDay(int year, int expectedYear, int expectedMonth, int expectedDay)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.JP).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.JP).ToArray();
var publicHoliday = publicHolidays.Where(o => o.EnglishName == "Autumnal Equinox Day").SingleOrDefault();

Assert.AreEqual(new DateTime(expectedYear, expectedMonth, expectedDay), publicHoliday.Date);
Expand Down
4 changes: 2 additions & 2 deletions src/Nager.Date.UnitTest/Country/PapuaNewGuineaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class PapuaNewGuineaTest
[TestMethod]
public void CheckQueensBirthdayFor2018()
{
var publicHolidays = DateSystem.GetPublicHolidays(2018, CountryCode.PG).ToArray();
var publicHolidays = DateSystem.GetHolidays(2018, CountryCode.PG).ToArray();

var publicHoliday = publicHolidays.FirstOrDefault(holiday => holiday.EnglishName.Equals("Queen's Birthday"));
Assert.AreEqual(new DateTime(2018, 6, 11), publicHoliday.Date);
Expand All @@ -19,7 +19,7 @@ public void CheckQueensBirthdayFor2018()
[TestMethod]
public void CheckQueensBirthdayFor2021()
{
var publicHolidays = DateSystem.GetPublicHolidays(2021, CountryCode.PG).ToArray();
var publicHolidays = DateSystem.GetHolidays(2021, CountryCode.PG).ToArray();

var publicHoliday = publicHolidays.FirstOrDefault(holiday => holiday.EnglishName.Equals("Queen's Birthday"));
Assert.AreEqual(new DateTime(2021, 6, 14), publicHoliday.Date);
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/PuertoRicoTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class PuertoRicoTest
[TestMethod]
public void PuertoRicoHasGoodFridayHoliday()
{
var holidays = DateSystem.GetPublicHolidays(2017, CountryCode.PR);
var holidays = DateSystem.GetHolidays(2017, CountryCode.PR);

var catholic = new MockPublicHolidayProvider(new CatholicProvider());
var expectedGoodFriday = catholic.EasterSunday(2017).AddDays(-2);
Expand Down
10 changes: 5 additions & 5 deletions src/Nager.Date.UnitTest/Country/RomaniaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class RomaniaTest
public void TestRomania2017()
{
var year = 2017;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.RO).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.RO).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 2), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand All @@ -35,7 +35,7 @@ public void TestRomania2017()
public void TestRomania2018()
{
var year = 2018;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.RO).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.RO).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 2), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand All @@ -58,7 +58,7 @@ public void TestRomania2018()
public void TestRomania2019()
{
var year = 2019;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.RO).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.RO).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 2), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand All @@ -81,7 +81,7 @@ public void TestRomania2019()
public void TestRomania2020()
{
var year = 2020;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.RO).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.RO).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 2), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand All @@ -104,7 +104,7 @@ public void TestRomania2020()
public void TestRomania2021()
{
var year = 2021;
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.RO).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.RO).ToArray();

Assert.AreEqual(new DateTime(year, 1, 1), publicHolidays[0].Date, $"{publicHolidays[0].EnglishName} is wrong");
Assert.AreEqual(new DateTime(year, 1, 2), publicHolidays[1].Date, $"{publicHolidays[1].EnglishName} is wrong");
Expand Down
4 changes: 2 additions & 2 deletions src/Nager.Date.UnitTest/Country/SingaporeTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class SingaporeTest
[TestMethod]
public void TestSingapore()
{
var publicHolidays = DateSystem.GetPublicHolidays(2022, CountryCode.SG).ToArray();
var publicHolidays = DateSystem.GetHolidays(2022, CountryCode.SG).ToArray();

Assert.AreEqual("New Year's Day", publicHolidays[0].EnglishName);
}
Expand All @@ -19,7 +19,7 @@ public void HolidayCount()
{
for (var year = 2018; year <= 2022; year++)
{
var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.SG).ToArray();
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.SG).ToArray();
Assert.AreEqual(11, publicHolidays.Length);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/SouthAfricaTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void CheckChristmasDayShiftIn2022(int year, int day)
{
var expectedDate = new DateTime(year, 12, day);

var publicHolidays = DateSystem.GetPublicHolidays(year, CountryCode.ZA);
var publicHolidays = DateSystem.GetHolidays(year, CountryCode.ZA);
var publicHoliday = publicHolidays.Where(publicHoliday => publicHoliday.EnglishName == "Christmas Day").FirstOrDefault();

Assert.AreEqual(expectedDate, publicHoliday.ObservedDate);
Expand Down
2 changes: 1 addition & 1 deletion src/Nager.Date.UnitTest/Country/SpainTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void CheckDayOfMadridIsThirdMayIn2021()
var yearToTest = 2021;
var expectedDate = new DateTime(yearToTest, 5, 3);

var publicHolidays = DateSystem.GetPublicHolidays(yearToTest, CountryCode.ES);
var publicHolidays = DateSystem.GetHolidays(yearToTest, CountryCode.ES);
var publicHoliday = publicHolidays.Where(publicHoliday => publicHoliday.EnglishName == "Day of Madrid").FirstOrDefault();
Assert.AreEqual(expectedDate, publicHoliday.ObservedDate);
}
Expand Down
Loading

0 comments on commit a90e016

Please sign in to comment.