aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Zverovich <viz@meta.com>2023-10-08 08:45:37 -0700
committerVictor Zverovich <viz@meta.com>2023-10-08 09:21:02 -0700
commit8e0ca0589fb76def40b5a212a91bbbd074bd1f48 (patch)
treeb9243df40c295d88d8d2a4207d09ad2bd2ebbbf9
parentbf497ac068aec604f9998c650be3fb6fd831279f (diff)
downloadfmtlib-8e0ca0589fb76def40b5a212a91bbbd074bd1f48.tar.gz
Use a more sensible locale in tests
-rw-r--r--test/chrono-test.cc17
-rw-r--r--test/util.cc3
2 files changed, 9 insertions, 11 deletions
diff --git a/test/chrono-test.cc b/test/chrono-test.cc
index c218a873..07760688 100644
--- a/test/chrono-test.cc
+++ b/test/chrono-test.cc
@@ -743,21 +743,20 @@ TEST(chrono_test, unsigned_duration) {
}
TEST(chrono_test, weekday) {
- auto loc = get_locale("ru_RU.UTF-8");
+ auto loc = get_locale("es_ES.UTF-8");
std::locale::global(loc);
- auto mon = fmt::weekday(1);
+ auto sat = fmt::weekday(6);
auto tm = std::tm();
- tm.tm_wday = static_cast<int>(mon.c_encoding());
+ tm.tm_wday = static_cast<int>(sat.c_encoding());
- EXPECT_EQ(fmt::format("{}", mon), "Mon");
- EXPECT_EQ(fmt::format("{:%a}", tm), "Mon");
+ EXPECT_EQ(fmt::format("{}", sat), "Sat");
+ EXPECT_EQ(fmt::format("{:%a}", tm), "Sat");
if (loc != std::locale::classic()) {
- EXPECT_THAT((std::vector<std::string>{"пн", "Пн", "пнд", "Пнд"}),
- Contains(fmt::format(loc, "{:L}", mon)));
- EXPECT_THAT((std::vector<std::string>{"пн", "Пн", "пнд", "Пнд"}),
- Contains(fmt::format(loc, "{:%a}", tm)));
+ auto saturdays = std::vector<std::string>{"sáb", "sá."};
+ EXPECT_THAT(saturdays, Contains(fmt::format(loc, "{:L}", sat)));
+ EXPECT_THAT(saturdays, Contains(fmt::format(loc, "{:%a}", tm)));
}
}
diff --git a/test/util.cc b/test/util.cc
index f4cb74ca..4ff34a91 100644
--- a/test/util.cc
+++ b/test/util.cc
@@ -37,9 +37,8 @@ std::locale do_get_locale(const char* name) {
std::locale get_locale(const char* name, const char* alt_name) {
auto loc = do_get_locale(name);
- if (loc == std::locale::classic() && alt_name) {
+ if (loc == std::locale::classic() && alt_name)
loc = do_get_locale(alt_name);
- }
if (loc == std::locale::classic())
fmt::print(stderr, "{} locale is missing.\n", name);
return loc;