mirror of
https://github.com/ETLCPP/etl.git
synced 2026-04-30 19:09:10 +08:00
b14f70698f
* Print test names at test time (#1343) * Fix chrono.h year_month_weekday_last and year_month_weekday sysdays() Bug 1: year_month_weekday_last::operator sys_days() — wrong weekday construction The code was constructing a weekday from a raw day count using weekday(unsigned), which treats the value as a weekday encoding (0–6). The fix uses weekday(sys_days), which correctly accounts for the epoch being a Thursday (+4 offset). Bug 2: year_month_weekday::operator sys_days() — same wrong weekday construction + off-by-one in day_of_month Same weekday(unsigned) vs weekday(sys_days) issue. Additionally, the day_of_month calculation was missing the 1 + base — it computed a 0-based offset from day 1, but forgot to add the 1 back when converting to an actual day number. --------- Co-authored-by: John Wellbelove <john.wellbelove@etlcpp.com> Co-authored-by: John Wellbelove <jwellbelove@users.noreply.github.com>
175 lines
7.5 KiB
C++
175 lines
7.5 KiB
C++
/******************************************************************************
|
|
The MIT License(MIT)
|
|
|
|
Embedded Template Library.
|
|
https://github.com/ETLCPP/etl
|
|
https://www.etlcpp.com
|
|
|
|
Documentation:
|
|
|
|
Copyright(c) 2025 John Wellbelove
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
of this software and associated documentation files(the "Software"), to deal
|
|
in the Software without restriction, including without limitation the rights
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
furnished to do so, subject to the following conditions :
|
|
|
|
The above copyright notice and this permission notice shall be included in all
|
|
copies or substantial portions of the Software.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
SOFTWARE.
|
|
******************************************************************************/
|
|
|
|
#include "etl/platform.h"
|
|
|
|
#include "unit_test_framework.h"
|
|
|
|
#include "etl/chrono.h"
|
|
|
|
#include <algorithm>
|
|
#include <vector>
|
|
|
|
// Set to 0 to reference against std::chrono
|
|
#define ETL_USING_ETL_CHRONO 1
|
|
|
|
#if ETL_USING_ETL_CHRONO
|
|
#define Chrono etl::chrono
|
|
#else
|
|
#if ETL_USING_CPP20
|
|
#include <chrono>
|
|
#define Chrono std::chrono
|
|
#else
|
|
#error std::chrono not supported
|
|
#endif
|
|
#endif
|
|
|
|
namespace
|
|
{
|
|
SUITE(test_chrono_year_month_weekday)
|
|
{
|
|
//*************************************************************************
|
|
TEST(test_default_constructor)
|
|
{
|
|
Chrono::year_month_weekday ymwd;
|
|
|
|
CHECK_FALSE(ymwd.ok()); // Default-constructed year_month_weekday is not valid
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_constructor_with_month_and_day)
|
|
{
|
|
Chrono::year_month_weekday ymwd{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
|
|
CHECK_TRUE(ymwd.ok()); // Valid year_month_weekday
|
|
CHECK_EQUAL(2000, (int)ymwd.year());
|
|
CHECK_EQUAL((unsigned)Chrono::January, (unsigned)ymwd.month());
|
|
CHECK_EQUAL(Chrono::Thursday.c_encoding(), ymwd.weekday().c_encoding());
|
|
CHECK_EQUAL(1, ymwd.index());
|
|
CHECK_TRUE(ymwd.weekday_indexed().ok());
|
|
CHECK_EQUAL(Chrono::Thursday.c_encoding(), ymwd.weekday_indexed().weekday().c_encoding());
|
|
CHECK_EQUAL(1, ymwd.weekday_indexed().index());
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_constructor_with_sys_days)
|
|
{
|
|
Chrono::year_month_weekday expected{Chrono::year(2000), Chrono::February, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday actual{Chrono::sys_days(Chrono::days(10990))};
|
|
|
|
CHECK_EQUAL((int)expected.year(), (int)actual.year());
|
|
CHECK_EQUAL((unsigned)expected.month(), (unsigned)actual.month());
|
|
CHECK_EQUAL((unsigned)expected.weekday().c_encoding(), (unsigned)actual.weekday().c_encoding());
|
|
CHECK_EQUAL((unsigned)expected.index(), (unsigned)actual.index());
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_invalid_year_month)
|
|
{
|
|
Chrono::year_month_weekday ymwd{Chrono::year{32768}, Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)}; // Invalid year
|
|
|
|
CHECK_FALSE(ymwd.ok()); // Invalid year_month_weekday
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_invalid_month_in_year_month)
|
|
{
|
|
Chrono::year_month_weekday ymwd{Chrono::year{2000}, Chrono::month{13}, Chrono::weekday_indexed(Chrono::Thursday, 1)}; // Invalid month (13)
|
|
|
|
CHECK_FALSE(ymwd.ok()); // Invalid year_month_weekday
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_invalid_day_in_year_month)
|
|
{
|
|
Chrono::year_month_weekday ymwd{Chrono::year{2000}, Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 6)}; // Invalid day (6)
|
|
|
|
CHECK_FALSE(ymwd.ok()); // Invalid year_month_weekday
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_to_sys_days)
|
|
{
|
|
// 1st Thursday of February 2000 (Feb 3)
|
|
Chrono::year_month_weekday ymwd1{Chrono::year(2000), Chrono::February, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::sys_days sd1 = Chrono::sys_days(ymwd1);
|
|
CHECK_EQUAL(10990, sd1.time_since_epoch().count());
|
|
|
|
// 2nd Wednesday of March 2000 (Mar 8)
|
|
Chrono::year_month_weekday ymwd2{Chrono::year(2000), Chrono::March, Chrono::weekday_indexed(Chrono::Wednesday, 2)};
|
|
Chrono::sys_days sd2 = Chrono::sys_days(ymwd2);
|
|
CHECK_EQUAL(11024, sd2.time_since_epoch().count());
|
|
|
|
// 1st Sunday of January 2000 (Jan 2)
|
|
Chrono::year_month_weekday ymwd3{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Sunday, 1)};
|
|
Chrono::sys_days sd3 = Chrono::sys_days(ymwd3);
|
|
CHECK_EQUAL(10958, sd3.time_since_epoch().count());
|
|
|
|
// 3rd Friday of June 1985 (Jun 21)
|
|
Chrono::year_month_weekday ymwd4{Chrono::year(1985), Chrono::June, Chrono::weekday_indexed(Chrono::Friday, 3)};
|
|
Chrono::sys_days sd4 = Chrono::sys_days(ymwd4);
|
|
CHECK_EQUAL(5650, sd4.time_since_epoch().count());
|
|
|
|
// 2nd Wednesday of March 2024 (Mar 13)
|
|
Chrono::year_month_weekday ymwd5{Chrono::year(2024), Chrono::March, Chrono::weekday_indexed(Chrono::Wednesday, 2)};
|
|
Chrono::sys_days sd5 = Chrono::sys_days(ymwd5);
|
|
CHECK_EQUAL(19795, sd5.time_since_epoch().count());
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_year_month_weekday_equality_operator)
|
|
{
|
|
Chrono::year_month_weekday ym1{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym2{Chrono::year(2001), Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym3{Chrono::year(2000), Chrono::February, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym4{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Friday, 2)};
|
|
|
|
CHECK_TRUE(ym1 == ym1); // Same year/month/day
|
|
CHECK_FALSE(ym1 == ym2); // Different year
|
|
CHECK_FALSE(ym1 == ym3); // Different month
|
|
CHECK_FALSE(ym1 == ym4); // Different day
|
|
}
|
|
|
|
//*************************************************************************
|
|
TEST(test_year_month_weekday_not_equality_operator)
|
|
{
|
|
Chrono::year_month_weekday ym1{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym2{Chrono::year(2001), Chrono::January, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym3{Chrono::year(2000), Chrono::February, Chrono::weekday_indexed(Chrono::Thursday, 1)};
|
|
Chrono::year_month_weekday ym4{Chrono::year(2000), Chrono::January, Chrono::weekday_indexed(Chrono::Friday, 2)};
|
|
|
|
CHECK_FALSE(ym1 != ym1); // Same year/month/day
|
|
CHECK_TRUE(ym1 != ym2); // Different year
|
|
CHECK_TRUE(ym1 != ym3); // Different month
|
|
CHECK_TRUE(ym1 != ym4); // Different day
|
|
}
|
|
}
|
|
} // namespace
|