nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Flatpak test locale hack, just use en_US.UTF-8 for now

Browse source 
FDO 19.08 runtime now includes C.UTF-8 locale, but since Fedora
now ships one that collates high-bit chars, it differs compared
to Debian et al's and FDO.

As a result, just use en_US.UTF-8 for now, probably until glibc
actually ships it and so they all agree.
This commit is contained in:
Michael Gratton 2019-10-07 19:22:22 +11:00 • committed by Michael James Gratton
parent 8814cd6c29
commit 8206cf434d
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/engine/imap-db/imap-db-database-test.vala
View file

@ -143,23 +143,13 @@ class Geary.ImapDB.DatabaseTest : TestCase {
db.exec("""
CREATE TABLE Test (id INTEGER PRIMARY KEY, test_str TEXT);
INSERT INTO Test (test_str) VALUES ('a');
INSERT INTO Test (test_str) VALUES ('b');
INSERT INTO Test (test_str) VALUES ('B');
INSERT INTO Test (test_str) VALUES ('BB');
INSERT INTO Test (test_str) VALUES ('🤯');
INSERT INTO Test (test_str) VALUES ('á');
""");
string[] expected = { "a", "BB", "B", "🤯" };
// Distros don't ship well-known locales other than C.UTF-8 by
// default, but Flatpak does not currently ship C.UTF-8 at
// all, so need to support both. :(
//
// See test-engine.vala and
// https://gitlab.com/freedesktop-sdk/freedesktop-sdk/issues/812
if (GLib.Intl.setlocale(LocaleCategory.COLLATE, null) != "C.UTF-8") {
// en_US.UTF-8:
expected = { "BB", "B", "a", "🤯" };
}
string[] expected = { "BB", "B", "b", "á", "a" };
Db.Result result = db.query(
"SELECT test_str FROM Test ORDER BY test_str COLLATE UTF8COLL DESC"
);

7
test/test-client.vala
View file

@ -27,8 +27,11 @@ int main(string[] args) {
*/
// Ensure things like e.g. GLib's formatting routines uses a
// UTF-8-based locale rather ASCII
GLib.Intl.setlocale(LocaleCategory.ALL, "C.UTF-8");
// well-known UTF-8-based locale rather ASCII. Would like to use
// C.UTF-8 here, but currently only Debian et al and Fedora ship
// it, and as of Fedora 32 they disagree on collation order for
// non-ASCII chars.
GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8");
Gtk.init(ref args);
Test.init(ref args);

15
test/test-engine.vala
View file

@ -11,16 +11,11 @@ int main(string[] args) {
*/
// Ensure things like e.g. GLib's formatting routines uses a
// well-known UTF-8-based locale rather ASCII.
//
// Distros don't ship well-known locales other than C.UTF-8 by
// default, but Flatpak does not currently support C.UTF-8, so
// need to try both. :(
// https://gitlab.com/freedesktop-sdk/freedesktop-sdk/issues/812
string? locale = GLib.Intl.setlocale(LocaleCategory.ALL, "C.UTF-8");
if (locale == null) {
GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8");
}
// well-known UTF-8-based locale rather ASCII. Would like to use
// C.UTF-8 here, but currently only Debian et al and Fedora ship
// it, and as of Fedora 32 they disagree on collation order for
// non-ASCII chars.
GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8");
Test.init(ref args);