[glib] gsettings: add test for repeated <summary> errors
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsettings: add test for repeated <summary> errors
- Date: Thu, 9 Apr 2015 02:36:15 +0000 (UTC)
commit 3fa0a051a47ca9e7ddcaf56cf842dc133fceede9
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Apr 8 22:11:27 2015 -0400
gsettings: add test for repeated <summary> errors
Make sure error handling on repeated <summary> and <description> is
being done properly, not resulting in glib-compile-schemas throwing a
critical.
https://bugzilla.gnome.org/show_bug.cgi?id=747542
gio/tests/gschema-compile.c | 3 +++
.../summary-xmllang-and-attrs.gschema.xml | 13 +++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c
index 1f2b746..a215a84 100644
--- a/gio/tests/gschema-compile.c
+++ b/gio/tests/gschema-compile.c
@@ -44,6 +44,8 @@ test_schema (gpointer data)
if (test->err)
{
g_test_trap_assert_failed ();
+ g_test_trap_assert_stderr_unmatched ("*CRITICAL*");
+ g_test_trap_assert_stderr_unmatched ("*WARNING*");
g_test_trap_assert_stderr (test->err);
}
else
@@ -128,6 +130,7 @@ static const SchemaTest tests[] = {
{ "flags-with-enum-tag", NULL, "*<flags id='flags'> not (yet) defined*" },
{ "summary-xmllang", NULL, "*Only one <summary> element allowed*" },
{ "description-xmllang", NULL, "*Only one <description> element allowed*" },
+ { "summary-xmllang-and-attrs", NULL, "*attribute 'lang' invalid for element 'summary'*" },
{ "inherit-gettext-domain", NULL, NULL },
{ "range-type-test", NULL, NULL },
{ "cdata", NULL, NULL }
diff --git a/gio/tests/schema-tests/summary-xmllang-and-attrs.gschema.xml
b/gio/tests/schema-tests/summary-xmllang-and-attrs.gschema.xml
new file mode 100644
index 0000000..b1da54e
--- /dev/null
+++ b/gio/tests/schema-tests/summary-xmllang-and-attrs.gschema.xml
@@ -0,0 +1,13 @@
+<schemalist>
+ <schema path="/org/gnome/gnome-screenshot/" id="org.gnome.gnome-screenshot">
+ <key type="b" name="take-window-shot">
+ <default>false</default>
+ <summary>Window-specific screenshot (deprecated)</summary>
+ <summary lang="an">Captura especifica de finestra (obsoleto)</summary>
+ <summary lang="ar">لقطة شاشة مختصّة بنافذة (مُبطل)</summary>
+ <summary lang="as">উইন্ডোৰ ক্ষেত্ৰত নিৰ্দিষ্ট স্ক্ৰিনশ্বট (স্খলিত)</summary>
+ <summary lang="ast">Captura específica de ventana (obsoleto)</summary>
+ <description>Bla</description>
+ </key>
+ </schema>
+</schemalist>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]