mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-12-08 06:09:58 +00:00
AK: Add UnixDateTime::parse() method
Copy parse() method from LibCore::DateTime::parse(). Augment the method to handle parsing from GMT time. Fix incorrect handling of year in '%D' format specifier. Remove all format specifiers related to time zones. Copy relevant tests and add additional ones.
This commit is contained in:
Tomasz Strejczek
Jelle Raaijmakers
parent
820fee434e
commit
ea32e39d68
Notes:
github-actions[bot]
2025-09-30 10:40:58 +00:00
Author: https://github.com/tomaszstrejczek
Commit: ea32e39d68
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/5167
Reviewed-by: https://github.com/R-Goc
Reviewed-by: https://github.com/gmta ✅
3 changed files with 395 additions and 0 deletions
|
|
@ -8,6 +8,11 @@
|
|||
|
||||
#include <AK/Time.h>
|
||||
|
||||
#ifdef AK_OS_WINDOWS
|
||||
# include <time.h>
|
||||
# define gmtime_r(time, tm) gmtime_s(tm, time)
|
||||
#endif
|
||||
|
||||
using AK::Duration;
|
||||
|
||||
#if (defined(__TIMESIZE) && __TIMESIZE < 64) || defined(AK_OS_WINDOWS) // NOTE: See AK/Time.h, on Windows we hardcode to long's for timeval
|
||||
|
|
@ -757,3 +762,131 @@ TEST_CASE(time_to_string)
|
|||
test("%t"sv, "\t"sv, 2023, 1, 1, 0, 0, 0);
|
||||
test("%%"sv, "%"sv, 2023, 1, 1, 0, 0, 0);
|
||||
}
|
||||
|
||||
TEST_CASE(parse_time)
|
||||
{
|
||||
auto test = [](auto format, auto time, int year, int month, int day, int hour, int minute, int second = 0) {
|
||||
auto result = AK::UnixDateTime::parse(format, time);
|
||||
VERIFY(result.has_value());
|
||||
|
||||
auto result_time = result.value().to_timespec();
|
||||
struct tm tm;
|
||||
#ifdef AK_OS_WINDOWS
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) == 0);
|
||||
#else
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) != nullptr);
|
||||
#endif
|
||||
|
||||
EXPECT_EQ(year, tm.tm_year + 1900);
|
||||
EXPECT_EQ(month, tm.tm_mon + 1);
|
||||
EXPECT_EQ(day, tm.tm_mday);
|
||||
EXPECT_EQ(hour, tm.tm_hour);
|
||||
EXPECT_EQ(minute, tm.tm_min);
|
||||
EXPECT_EQ(second, tm.tm_sec);
|
||||
};
|
||||
|
||||
test("%d-%m-%Y %H:%M"sv, "05-01-2023 00:00"sv, 2023, 1, 5, 0, 0);
|
||||
test("%d-%m-%Y %H:%M GMT"sv, "05-01-2023 00:00 GMT"sv, 2023, 1, 5, 0, 0);
|
||||
test("%Y/%m/%d %R"sv, "2023/01/23 10:50"sv, 2023, 1, 23, 10, 50);
|
||||
test("%Y-%m-%d %H:%M"sv, "1999-12-31 23:59"sv, 1999, 12, 31, 23, 59);
|
||||
test("%Y/%m/%d %R"sv, "1970/01/01 00:00"sv, 1970, 1, 1, 0, 0);
|
||||
test("%Y/%m/%d %R"sv, "2000/02/29 12:34"sv, 2000, 2, 29, 12, 34); // Leap year
|
||||
|
||||
// %T: full time with seconds
|
||||
test("%Y-%m-%d %T"sv, "2023-01-23 10:50:15"sv, 2023, 1, 23, 10, 50, 15);
|
||||
// %S: seconds
|
||||
test("%Y-%m-%d %H:%M:%S"sv, "2023-01-23 10:50:42"sv, 2023, 1, 23, 10, 50, 42);
|
||||
// %I: 12-hour clock, %p: AM/PM
|
||||
test("%Y-%m-%d %I:%M %p"sv, "2023-01-23 03:21 PM"sv, 2023, 1, 23, 15, 21, 0);
|
||||
test("%Y-%m-%d %I:%M %p"sv, "2023-01-23 12:01 AM"sv, 2023, 1, 23, 0, 1, 0);
|
||||
// %D: shortcut for %m/%d/%y
|
||||
test("%D %H:%M:%S"sv, "01/23/23 10:50:59"sv, 2023, 1, 23, 10, 50, 59);
|
||||
// %y: two-digit year, %C: century
|
||||
test("%y %C %m %d %H:%M:%S"sv, "23 20 01 23 10:50:11"sv, 2023, 1, 23, 10, 50, 11);
|
||||
// %a/%A: short/long weekday name (parsing ignores names, but test for correct date)
|
||||
test("%Y-%m-%d %a"sv, "2023-01-23 Mon"sv, 2023, 1, 23, 0, 0, 0);
|
||||
test("%Y-%m-%d %A"sv, "2023-01-23 Monday"sv, 2023, 1, 23, 0, 0, 0);
|
||||
// %b/%B: short/long month name (parsing ignores names, but test for correct date)
|
||||
test("%d %b %Y"sv, "05 Jan 2023"sv, 2023, 1, 5, 0, 0, 0);
|
||||
test("%d %B %Y"sv, "05 January 2023"sv, 2023, 1, 5, 0, 0, 0);
|
||||
// %j: day of year
|
||||
test("%Y %j %H:%M:%S"sv, "2023 023 10:50:12"sv, 2023, 1, 23, 10, 50, 12);
|
||||
// %w: weekday number (0=Sunday)
|
||||
test("%Y-%m-%d %w %H:%M:%S"sv, "2023-01-23 1 10:50:13"sv, 2023, 1, 23, 10, 50, 13);
|
||||
// %n: newline, %t: tab, %%: literal %
|
||||
test("%Y-%m-%d%n%H:%M:%S"sv, "2023-01-23\n10:50:14"sv, 2023, 1, 23, 10, 50, 14);
|
||||
test("%Y-%m-%d%t%H:%M:%S"sv, "2023-01-23\t10:50:15"sv, 2023, 1, 23, 10, 50, 15);
|
||||
test("%Y-%m-%d %% %H:%M:%S"sv, "2023-01-23 % 10:50:16"sv, 2023, 1, 23, 10, 50, 16);
|
||||
}
|
||||
|
||||
TEST_CASE(parse_wildcard_characters)
|
||||
{
|
||||
EXPECT(!AK::UnixDateTime::parse("%+"sv, ""sv).has_value());
|
||||
EXPECT(!AK::UnixDateTime::parse("foo%+"sv, "foo"sv).has_value());
|
||||
EXPECT(!AK::UnixDateTime::parse("[%*]"sv, "[foo"sv).has_value());
|
||||
EXPECT(!AK::UnixDateTime::parse("[%*]"sv, "foo]"sv).has_value());
|
||||
EXPECT(!AK::UnixDateTime::parse("%+%b"sv, "fooJan"sv).has_value());
|
||||
|
||||
auto test = [](auto format, auto time, int year, int month, int day) {
|
||||
auto result = AK::UnixDateTime::parse(format, time);
|
||||
VERIFY(result.has_value());
|
||||
|
||||
auto result_time = result.value().to_timespec();
|
||||
struct tm tm;
|
||||
#ifdef AK_OS_WINDOWS
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) == 0);
|
||||
#else
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) != nullptr);
|
||||
#endif
|
||||
|
||||
EXPECT_EQ(year, tm.tm_year + 1900);
|
||||
EXPECT_EQ(month, tm.tm_mon + 1);
|
||||
EXPECT_EQ(day, tm.tm_mday);
|
||||
};
|
||||
|
||||
test("%Y %+ %m %d"sv, "2023 whf 01 23"sv, 2023, 01, 23);
|
||||
test("%Y %m %d %+"sv, "2023 01 23 whf"sv, 2023, 01, 23);
|
||||
test("%Y [%+] %m %d"sv, "2023 [well hello friends!] 01 23"sv, 2023, 01, 23);
|
||||
test("%Y %m %d [%+]"sv, "2023 01 23 [well hello friends!]"sv, 2023, 01, 23);
|
||||
}
|
||||
|
||||
TEST_CASE(parse_time_from_gmt)
|
||||
{
|
||||
// Test parsing with from_gmt = true (GMT time)
|
||||
auto gmt_result = AK::UnixDateTime::parse("%Y-%m-%d %H:%M:%S"sv,
|
||||
"2023-01-15 12:00:00"sv, true);
|
||||
VERIFY(gmt_result.has_value());
|
||||
|
||||
// Parse a known GMT time and verify the timestamp
|
||||
auto test_gmt = AK::UnixDateTime::parse("%Y-%m-%d %H:%M:%S"sv,
|
||||
"1970-01-01 00:00:00"sv, true);
|
||||
VERIFY(test_gmt.has_value());
|
||||
EXPECT_EQ(test_gmt.value().seconds_since_epoch(), 0);
|
||||
|
||||
// Test another GMT time
|
||||
auto test_gmt2 = AK::UnixDateTime::parse("%Y-%m-%d %H:%M:%S"sv,
|
||||
"1970-01-01 01:00:00"sv, true);
|
||||
VERIFY(test_gmt2.has_value());
|
||||
EXPECT_EQ(test_gmt2.value().seconds_since_epoch(), 3600);
|
||||
|
||||
// Test with date components
|
||||
auto test_gmt3 = AK::UnixDateTime::parse("%Y-%m-%d %H:%M:%S"sv,
|
||||
"2023-06-15 18:30:45"sv, true);
|
||||
VERIFY(test_gmt3.has_value());
|
||||
|
||||
// Verify the parsed time by converting back to tm structure
|
||||
auto result_time = test_gmt3.value().to_timespec();
|
||||
struct tm tm;
|
||||
#ifdef AK_OS_WINDOWS
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) == 0);
|
||||
#else
|
||||
VERIFY(gmtime_r(&result_time.tv_sec, &tm) != nullptr);
|
||||
#endif
|
||||
|
||||
EXPECT_EQ(tm.tm_year + 1900, 2023);
|
||||
EXPECT_EQ(tm.tm_mon + 1, 6);
|
||||
EXPECT_EQ(tm.tm_mday, 15);
|
||||
EXPECT_EQ(tm.tm_hour, 18);
|
||||
EXPECT_EQ(tm.tm_min, 30);
|
||||
EXPECT_EQ(tm.tm_sec, 45);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue