Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optionally use case-insensitive comparison in CompareStrings()

Browse Source 
Harmonize Mac and MSW versions by using case-sensitive comparison in
both of them by default, but allowing to use a flag to use
case-insensitive comparison instead.
This commit is contained in:
Vadim Zeitlin
2021-08-28 21:13:22 +01:00
parent 5f8483b49d
commit e27497774a
5 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/intl/intltest.cpp
View File

@@ -253,6 +253,9 @@ TEST_CASE("wxUILocale::GetInfo", "[.][uilocale]")
CHECK( loc.GetInfo(wxLOCALE_DECIMAL_POINT) == "." );
}
// Just a small helper to make the test below shorter.
static inline wxString u8(const char* s) { return wxString::FromUTF8(s); }
TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
{
SECTION("English")
@@ -269,9 +272,11 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
CHECK( wxUILocale::CompareStrings("", "a", l) == -1 );
// And for case handling.
CHECK( wxUILocale::CompareStrings("a", "A", l) == 0 );
CHECK( wxUILocale::CompareStrings("b", "A", l) == 1 );
CHECK( wxUILocale::CompareStrings("B", "a", l) == 1 );
CHECK( wxUILocale::CompareStrings("a", "A", l) == -1 );
CHECK( wxUILocale::CompareStrings("a", "A", l,
wxCompare_CaseInsensitive) == 0 );
CHECK( wxUILocale::CompareStrings("b", "A", l) == 1 );
CHECK( wxUILocale::CompareStrings("B", "a", l) == 1 );
}
SECTION("German")
@@ -280,9 +285,10 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
// This is more interesting and shows that CompareStrings() uses German
// dictionary rules (DIN 5007-1 variant 1).
CHECK( wxUILocale::CompareStrings(L"a", L"ä", l) == -1 );
CHECK( wxUILocale::CompareStrings(L"ä", "ae", l) == -1 );
CHECK( wxUILocale::CompareStrings(L"ß", "ss", l) == 0 );
CHECK( wxUILocale::CompareStrings("a", u8("ä"), l) == -1 );
CHECK( wxUILocale::CompareStrings(u8("ä"), "ae", l) == -1 );
CHECK( wxUILocale::CompareStrings(u8("ß"), "ss", l,
wxCompare_CaseInsensitive) == 0 );
}
SECTION("Swedish")
@@ -290,8 +296,8 @@ TEST_CASE("wxUILocale::CompareStrings", "[uilocale]")
const wxLocaleIdent l("sv");
// And this shows that sort order really depends on the language.
CHECK( wxUILocale::CompareStrings(L"ä", "ae", l) == 1 );
CHECK( wxUILocale::CompareStrings(L"ö", "z" , l) == 1 );
CHECK( wxUILocale::CompareStrings(u8("ä"), "ae", l) == 1 );
CHECK( wxUILocale::CompareStrings(u8("ö"), "z" , l) == 1 );
}
}