Skip to content

[libc++][locale] Update grouping tests #119463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 16, 2024
Merged

[libc++][locale] Update grouping tests #119463

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
092a73b
[𝘀𝗽𝗿] initial version
vitalybuka Dec 10, 2024
d7d008b
Merge branch 'main' into users/vitalybuka/spr/libclocale-update-group…
vitalybuka Dec 11, 2024
a7f0da5
Merge branch 'main' into users/vitalybuka/spr/libclocale-update-group…
vitalybuka Dec 13, 2024
0743c83
Remove include added for debugging
vitalybuka Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 9 additions & 18 deletions ...calization/locale.categories/category.monetary/locale.moneypunct.byname/grouping.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

// string grouping() const;

#include <iostream>
#include <locale>
#include <limits>
#include <cassert>
Expand Down Expand Up @@ -89,27 +90,22 @@ int main(int, char**)
}
#endif

#if defined( _WIN32) || defined(_AIX)
std::string us_grouping = "\3";
#else
std::string us_grouping = "\3\3";
#endif
{
Fnf f(LOCALE_en_US_UTF_8, 1);
assert(f.grouping() == us_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
{
Fnt f(LOCALE_en_US_UTF_8, 1);
assert(f.grouping() == us_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
Fwf f(LOCALE_en_US_UTF_8, 1);
assert(f.grouping() == us_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
{
Fwt f(LOCALE_en_US_UTF_8, 1);
assert(f.grouping() == us_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
#endif

Expand All @@ -132,27 +128,22 @@ int main(int, char**)
}
#endif

#if defined( _WIN32) || defined(_AIX)
std::string ru_grouping = "\3";
#else
std::string ru_grouping = "\3\3";
#endif
{
Fnf f(LOCALE_ru_RU_UTF_8, 1);
assert(f.grouping() == ru_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
{
Fnt f(LOCALE_ru_RU_UTF_8, 1);
assert(f.grouping() == ru_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
Fwf f(LOCALE_ru_RU_UTF_8, 1);
assert(f.grouping() == ru_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
{
Fwt f(LOCALE_ru_RU_UTF_8, 1);
assert(f.grouping() == ru_grouping);
assert(f.grouping() == "\3" || f.grouping() == "\3\3");
}
#endif

Expand Down
12 changes: 2 additions & 10 deletions ...td/localization/locale.categories/facet.numpunct/locale.numpunct.byname/grouping.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,13 @@ int main(int, char**)
{
typedef char C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
#if defined(_WIN32) || defined(_AIX)
assert(np.grouping() == "\3");
#else
assert(np.grouping() == "\3\3");
#endif
assert(np.grouping() == "\3" || np.grouping() == "\3\3");
}
#ifndef TEST_HAS_NO_WIDE_CHARACTERS
{
typedef wchar_t C;
const std::numpunct<C>& np = std::use_facet<std::numpunct<C> >(l);
# if defined(_WIN32) || defined(_AIX)
assert(np.grouping() == "\3");
# else
assert(np.grouping() == "\3\3");
# endif
assert(np.grouping() == "\3" || np.grouping() == "\3\3");
}
#endif
}
Expand Down
Loading