Skip to content

Unreliable print of solstice in holidays

Alois Spitzbart requested to merge loisspitz/kholidays:solstice into master

When the holiday list is called with date range parseRegionDateRange(region, QDate(2020, 7, 1), QDate(2021, 6, 30)), then the solstice was printed when two years and wintersolstice were involved. See tests.

It was a regression from Compute the astro seasons only once per occurrence

But i do not know why astronomical seasons are included into holidays, since there is a separate function. src/parsers/holidayparserdriver.cpp line 59 to line 72. I have investigated further: This was introduced in astronomical seasons automatically added to all holidays

Shouldn't this part removed since we have this as a module in plasma? image

BUG: 445324

before:

QDEBUG : HolidayRegionTest::testSolistaleInHolidays() This regionCode =  "solstice_in_holidays"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Is valid? =  true
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Country code =  "SOLSTICE"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Language code =  "in"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Name =  "Solstice in normal holidays"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Description =  "A test file for solstice in normal holiday calendar"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-07-01"  end date =  "2021-06-30"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-09-22"  Duration =  1  Name =  "September-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-01-01"  end date =  "2020-12-31"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-11-01"  end date =  "2021-01-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-12-25"  end date =  "2021-07-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-12-25"  end date =  "2022-01-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-03-20"  Duration =  1  Name =  "März-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-06-21"  Duration =  1  Name =  "Sommersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-09-22"  Duration =  1  Name =  "September-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2022-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
PASS   : HolidayRegionTest::testSolistaleInHolidays()

after:

QDEBUG : HolidayRegionTest::testSolistaleInHolidays() This regionCode =  "solstice_in_holidays"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Is valid? =  true
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Country code =  "SOLSTICE"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Language code =  "in"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Name =  "Solstice in normal holidays"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Description =  "A test file for solstice in normal holiday calendar"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-07-01"  end date =  "2021-06-30"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-09-22"  Duration =  1  Name =  "September-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-03-20"  Duration =  1  Name =  "März-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-06-21"  Duration =  1  Name =  "Sommersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-01-01"  end date =  "2020-12-31"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-03-20"  Duration =  1  Name =  "März-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-06-20"  Duration =  1  Name =  "Sommersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-09-22"  Duration =  1  Name =  "September-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-11-01"  end date =  "2021-01-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2020-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-12-25"  end date =  "2021-07-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-03-20"  Duration =  1  Name =  "März-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-06-21"  Duration =  1  Name =  "Sommersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Parsing regionCode =  "solstice_in_holidays"  start date =  "2020-12-25"  end date =  "2022-01-02"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-03-20"  Duration =  1  Name =  "März-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-06-21"  Duration =  1  Name =  "Sommersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-09-22"  Duration =  1  Name =  "September-Tagundnachtgleiche"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2021-12-21"  Duration =  1  Name =  "Wintersonnenwende"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays() Date =  "2022-01-01"  Duration =  1  Name =  "New Years"
QDEBUG : HolidayRegionTest::testSolistaleInHolidays()
PASS   : HolidayRegionTest::testSolistaleInHolidays()
Edited by Alois Spitzbart

Merge request reports