Merge branch 'emoji-layout-test' into 'master'

Emoji layout test

See merge request GNOME/pango!52

5 files changed, 37 insertions, 9 deletions

diff --git a/tests/layouts/valid-1.expected b/tests/layouts/valid-1.expected
index 91660b9c..e03bf31d 100644
--- a/tests/layouts/valid-1.expected
+++ b/tests/layouts/valid-1.expected
@@ -23,11 +23,11 @@ i=2, index=49, paragraph-start=1, dir=ltr ''
 
 ---
 
-i=1, index=0, chars=22, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, 'This is a test of the '
-i=2, index=22, chars=11, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, 'automatic e'
+i=1, index=0, chars=22, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'This is a test of the '
+i=2, index=22, chars=11, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'automatic e'
   [22 41] foreground #00000000ffff
   [22 41] underline 1
-i=3, index=33, chars=15, level=0, gravity=south, flags=2, font=OMITTED, script=common, language=c, 'mergency brake!'
+i=3, index=33, chars=15, level=0, gravity=south, flags=2, font=OMITTED, script=common, language=en-us, 'mergency brake!'
   [0 2147483647] fallback 0
   [22 41] foreground #00000000ffff
   [22 41] underline 1
diff --git a/tests/layouts/valid-2.expected b/tests/layouts/valid-2.expected
index 4de28dc3..1467dd25 100644
--- a/tests/layouts/valid-2.expected
+++ b/tests/layouts/valid-2.expected
@@ -24,11 +24,11 @@ i=2, index=33, paragraph-start=1, dir=ltr ''
 
 ---
 
-i=1, index=0, chars=9, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, 'test the '
-i=2, index=9, chars=4, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, 'blue'
-i=3, index=13, chars=7, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, ' drink '
-i=4, index=20, chars=5, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, 'after'
+i=1, index=0, chars=9, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'test the '
+i=2, index=9, chars=4, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'blue'
+i=3, index=13, chars=7, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, ' drink '
+i=4, index=20, chars=5, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'after'
   [20 25] underline 1
-i=5, index=25, chars=7, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=c, ' dinner'
+i=5, index=25, chars=7, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, ' dinner'
 i=6, index=32, no run, line end
 i=7, index=33, no run, line end
diff --git a/tests/layouts/valid-3.expected b/tests/layouts/valid-3.expected
new file mode 100644
index 00000000..ce983c34
--- /dev/null
+++ b/tests/layouts/valid-3.expected
@@ -0,0 +1,25 @@
+ABC😀️D
+
+---
+
+wrapped: 0
+ellipsized: 0
+lines: 2
+
+---
+
+range 0 2147483647
+
+---
+
+i=1, index=0, paragraph-start=1, dir=ltr 'ABC😀️D
+'
+i=2, index=12, paragraph-start=1, dir=ltr ''
+
+---
+
+i=1, index=0, chars=3, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'ABC'
+i=2, index=3, chars=2, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, '😀️'
+i=3, index=10, chars=1, level=0, gravity=south, flags=0, font=OMITTED, script=latin, language=en-us, 'D'
+i=4, index=11, no run, line end
+i=5, index=12, no run, line end
diff --git a/tests/layouts/valid-3.markup b/tests/layouts/valid-3.markup
new file mode 100644
index 00000000..4e394a42
--- /dev/null
+++ b/tests/layouts/valid-3.markup
@@ -0,0 +1,2 @@
+
+ABC😀️D
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 4bce4439..c4d01ccc 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -261,6 +261,7 @@ test_file (const gchar *filename, GString *string)
   g_assert (p);
   markup = p + 1;
   *p = '\0';
+  length = strlen (markup);
 
   parse_params (contents, &width, &ellipsize_at, &ellipsize, &wrap);
 
@@ -347,7 +348,7 @@ main (int argc, char *argv[])
   const gchar *name;
   gchar *path;
 
-  g_setenv ("LC_ALL", "C", TRUE);
+  g_setenv ("LC_ALL", "en_US.UTF-8", TRUE);
   setlocale (LC_ALL, "");
 
   g_test_init (&argc, &argv, NULL);