From ea1066bbe3f8b78bdce623a7d8d7312ea82968f7 Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Thu, 28 Dec 2023 16:56:42 -0800 Subject: [PATCH] Cleanup test --- test/chrono-test.cc | 118 ++++++++++++++++++-------------------------- 1 file changed, 47 insertions(+), 71 deletions(-) diff --git a/test/chrono-test.cc b/test/chrono-test.cc index fea296e8..3ff1c5b5 100644 --- a/test/chrono-test.cc +++ b/test/chrono-test.cc @@ -269,9 +269,8 @@ TEST(chrono_test, system_clock_time_point) { EXPECT_EQ(strftime_full_utc(t1), fmt::format("{:%Y-%m-%d %H:%M:%S}", t1)); EXPECT_EQ(strftime_full_utc(t1), fmt::format("{}", t1)); EXPECT_EQ(strftime_full_utc(t1), fmt::format("{:}", t1)); - using time_point = - std::chrono::time_point; - auto t2 = time_point(std::chrono::seconds(42)); + + auto t2 = sys_time(std::chrono::seconds(42)); EXPECT_EQ(strftime_full_utc(t2), fmt::format("{:%Y-%m-%d %H:%M:%S}", t2)); std::vector spec_list = { @@ -713,27 +712,26 @@ TEST(chrono_test, invalid_colons) { } TEST(chrono_test, negative_durations) { - EXPECT_EQ("-12345", fmt::format("{:%Q}", std::chrono::seconds(-12345))); - EXPECT_EQ("-03:25:45", - fmt::format("{:%H:%M:%S}", std::chrono::seconds(-12345))); - EXPECT_EQ("-00:01", - fmt::format("{:%M:%S}", std::chrono::duration(-1))); - EXPECT_EQ("s", fmt::format("{:%q}", std::chrono::seconds(-12345))); - EXPECT_EQ("-00.127", - fmt::format("{:%S}", - std::chrono::duration{-127})); + EXPECT_EQ(fmt::format("{:%Q}", std::chrono::seconds(-12345)), "-12345"); + EXPECT_EQ(fmt::format("{:%H:%M:%S}", std::chrono::seconds(-12345)), + "-03:25:45"); + EXPECT_EQ(fmt::format("{:%M:%S}", std::chrono::duration(-1)), + "-00:01"); + EXPECT_EQ(fmt::format("{:%q}", std::chrono::seconds(-12345)), "s"); + EXPECT_EQ(fmt::format("{:%S}", + std::chrono::duration(-127)), + "-00.127"); auto min = std::numeric_limits::min(); EXPECT_EQ(fmt::format("{}", min), fmt::format("{:%Q}", std::chrono::duration(min))); } TEST(chrono_test, special_durations) { - auto value = fmt::format("{:%S}", std::chrono::duration(1e20)); - EXPECT_EQ(value, "40"); + EXPECT_EQ(fmt::format("{:%S}", std::chrono::duration(1e20)), "40"); auto nan = std::numeric_limits::quiet_NaN(); EXPECT_EQ( - "nan nan nan nan nan:nan nan", - fmt::format("{:%I %H %M %S %R %r}", std::chrono::duration(nan))); + fmt::format("{:%I %H %M %S %R %r}", std::chrono::duration(nan)), + "nan nan nan nan nan:nan nan"); EXPECT_EQ(fmt::format("{}", std::chrono::duration(1)), "1Es"); EXPECT_EQ(fmt::format("{}", std::chrono::duration(1)), @@ -742,13 +740,13 @@ TEST(chrono_test, special_durations) { "03:33"); EXPECT_EQ(fmt::format("{:%T}", std::chrono::duration{2}), "03:33:20"); - EXPECT_EQ("01.234", - fmt::format("{:.3%S}", - std::chrono::duration(1.234e12))); + EXPECT_EQ( + fmt::format("{:.3%S}", std::chrono::duration(1.234e12)), + "01.234"); } TEST(chrono_test, unsigned_duration) { - EXPECT_EQ("42s", fmt::format("{}", std::chrono::duration(42))); + EXPECT_EQ(fmt::format("{}", std::chrono::duration(42)), "42s"); } TEST(chrono_test, weekday) { @@ -862,7 +860,8 @@ TEST(chrono_test, utc_clock) { #endif TEST(chrono_test, timestamp_ratios) { - auto t1 = sys_time(std::chrono::milliseconds(67890)); + auto t1 = + sys_time(std::chrono::milliseconds(67890)); EXPECT_EQ(fmt::format("{:%M:%S}", t1), "01:07.890"); auto t2 = sys_time(std::chrono::minutes(7)); @@ -877,8 +876,8 @@ TEST(chrono_test, timestamp_ratios) { EXPECT_EQ(fmt::format("{:%M:%S}", t4), "01:03"); if (sizeof(time_t) > 4) { - auto tp = sys_time( - std::chrono::seconds(32503680000)); + auto tp = + sys_time(std::chrono::seconds(32503680000)); EXPECT_EQ(fmt::format("{:%Y-%m-%d}", tp), "3000-01-01"); } @@ -890,79 +889,56 @@ TEST(chrono_test, timestamp_ratios) { } } -TEST(chrono_test, timestamps_sub_seconds) { - std::chrono::time_point>> - t1(std::chrono::duration>(4)); - +TEST(chrono_test, timestamp_sub_seconds) { + auto t1 = sys_time>>( + std::chrono::duration>(4)); EXPECT_EQ(fmt::format("{:%S}", t1), "01.333333"); - std::chrono::time_point>> - t2(std::chrono::duration>(4)); - + auto t2 = sys_time>>( + std::chrono::duration>(4)); EXPECT_EQ(fmt::format("{:%S}", t2), "01.333333"); - const std::chrono::time_point - t3(std::chrono::seconds(2)); - + auto t3 = sys_time(std::chrono::seconds(2)); EXPECT_EQ(fmt::format("{:%S}", t3), "02"); - const std::chrono::time_point> - t4(std::chrono::duration>(9.5)); - + auto t4 = sys_time>( + std::chrono::duration>(9.5)); EXPECT_EQ(fmt::format("{:%S}", t4), "09.500000"); - const std::chrono::time_point> - t5(std::chrono::duration>(9)); - + auto t5 = sys_time>( + std::chrono::duration>(9)); EXPECT_EQ(fmt::format("{:%S}", t5), "09"); - const std::chrono::time_point - t6(std::chrono::seconds(1) + std::chrono::milliseconds(120)); - + auto t6 = sys_time(std::chrono::seconds(1) + + std::chrono::milliseconds(120)); EXPECT_EQ(fmt::format("{:%S}", t6), "01.120"); - const std::chrono::time_point - t7(std::chrono::microseconds(1234567)); - + auto t7 = + sys_time(std::chrono::microseconds(1234567)); EXPECT_EQ(fmt::format("{:%S}", t7), "01.234567"); - const std::chrono::time_point - t8(std::chrono::nanoseconds(123456789)); - + auto t8 = + sys_time(std::chrono::nanoseconds(123456789)); EXPECT_EQ(fmt::format("{:%S}", t8), "00.123456789"); - const auto t9 = std::chrono::time_point_cast( + auto t9 = std::chrono::time_point_cast( std::chrono::system_clock::now()); - const auto t9_sec = std::chrono::time_point_cast(t9); + auto t9_sec = std::chrono::time_point_cast(t9); auto t9_sub_sec_part = fmt::format("{0:09}", (t9 - t9_sec).count()); - EXPECT_EQ(fmt::format("{}.{}", strftime_full_utc(t9_sec), t9_sub_sec_part), fmt::format("{:%Y-%m-%d %H:%M:%S}", t9)); EXPECT_EQ(fmt::format("{}.{}", strftime_full_utc(t9_sec), t9_sub_sec_part), fmt::format("{:%Y-%m-%d %T}", t9)); - const std::chrono::time_point - t10(std::chrono::milliseconds(2000)); - + auto t10 = + sys_time(std::chrono::milliseconds(2000)); EXPECT_EQ(fmt::format("{:%S}", t10), "02.000"); - { - const auto epoch = std::chrono::time_point(); - const auto d = std::chrono::milliseconds(250); - - EXPECT_EQ("59.750", fmt::format("{:%S}", epoch - d)); - EXPECT_EQ("00.000", fmt::format("{:%S}", epoch)); - EXPECT_EQ("00.250", fmt::format("{:%S}", epoch + d)); - } + auto epoch = sys_time(); + auto d = std::chrono::milliseconds(250); + EXPECT_EQ("59.750", fmt::format("{:%S}", epoch - d)); + EXPECT_EQ("00.000", fmt::format("{:%S}", epoch)); + EXPECT_EQ("00.250", fmt::format("{:%S}", epoch + d)); } TEST(chrono_test, glibc_extensions) {