[glib] Add some more schema compiler tests
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Add some more schema compiler tests
- Date: Wed, 21 Apr 2010 04:45:59 +0000 (UTC)
commit c83a9762453ea996c5619b8a681d3d1fd2cf473f
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Apr 21 00:43:55 2010 -0400
Add some more schema compiler tests
gio/tests/Makefile.am | 7 +-
gio/tests/gschema-compile.c | 143 ++++++--------------------
gio/tests/schema-tests/bad-key.gschema.xml | 7 ++
gio/tests/schema-tests/bad-key2.gschema.xml | 7 ++
gio/tests/schema-tests/bad-key3.gschema.xml | 7 ++
gio/tests/schema-tests/bad-key4.gschema.xml | 7 ++
gio/tests/schema-tests/empty-key.gschema.xml | 7 ++
7 files changed, 75 insertions(+), 110 deletions(-)
---
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 88c69b2..1c39896 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -159,7 +159,12 @@ EXTRA_DIST += \
schema-tests/missing-quotes.gschema.xml \
schema-tests/no-default.gschema.xml \
schema-tests/wrong-category.gschema.xml \
- schema-tests/overflow.gschema.xml
+ schema-tests/overflow.gschema.xml \
+ schema-tests/bad-key.gschema.xml \
+ schema-tests/bad-key2.gschema.xml \
+ schema-tests/bad-key3.gschema.xml \
+ schema-tests/bad-key4.gschema.xml \
+ schema-tests/empty-key.gschema.xml
MISC_STUFF = gschemas.compiled test.mo
diff --git a/gio/tests/gschema-compile.c b/gio/tests/gschema-compile.c
index b848986..9020c3a 100644
--- a/gio/tests/gschema-compile.c
+++ b/gio/tests/gschema-compile.c
@@ -5,140 +5,65 @@
#include <gio.h>
#include <gstdio.h>
-static void
-test_no_default (void)
-{
- g_remove ("gschemas.compiled");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- {
- gchar *argv[] = {
- "../gschema-compile",
- SRCDIR "/schema-tests/no-default/",
- "--targetdir=.",
- NULL
- };
- gchar *envp[] = { NULL };
- execve (argv[0], argv, envp);
- }
- g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*<default> is required in <key>*");
-}
-
-static void
-test_missing_quotes (void)
-{
- g_remove ("gschemas.compiled");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- {
- gchar *argv[] = {
- "../gschema-compile",
- SRCDIR "/schema-tests/missing-quotes/",
- "--targetdir=.",
- NULL
- };
- gchar *envp[] = { NULL };
- execve (argv[0], argv, envp);
- }
- g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*unknown keyword*");
-}
-
-static void
-test_incomplete_list (void)
-{
- g_remove ("gschemas.compiled");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- {
- gchar *argv[] = {
- "../gschema-compile",
- SRCDIR "/schema-tests/incomplete-list/",
- "--targetdir=.",
- NULL
- };
- gchar *envp[] = { NULL };
- execve (argv[0], argv, envp);
- }
- g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*to follow array element*");
-}
-
-static void
-test_wrong_category (void)
-{
- g_remove ("gschemas.compiled");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- {
- gchar *argv[] = {
- "../gschema-compile",
- SRCDIR "/schema-tests/wrong-category/",
- "--targetdir=.",
- NULL
- };
- gchar *envp[] = { NULL };
- execve (argv[0], argv, envp);
- }
- g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*attribute 'l10n' invalid*");
-}
+typedef struct {
+ const gchar *name;
+ const gchar *stderr;
+} SchemaTest;
static void
-test_bad_type (void)
+test_schema (gpointer data)
{
- g_remove ("gschemas.compiled");
+ SchemaTest *test = (SchemaTest *) data;
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
{
+ gchar *filename = g_strconcat (test->name, ".gschema.xml", NULL);
+ gchar *path = g_build_filename (SRCDIR, "schema-tests", filename, NULL);
gchar *argv[] = {
"../gschema-compile",
- SRCDIR "/schema-tests/bad-type/",
- "--targetdir=.",
+ "--dry-run",
+ "--one-schema-file", path,
NULL
};
gchar *envp[] = { NULL };
execve (argv[0], argv, envp);
+ g_free (filename);
+ g_free (path);
}
g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*invalid GVariant type string*");
+ g_test_trap_assert_stderr (test->stderr);
}
-static void
-test_overflow (void)
-{
- g_remove ("gschemas.compiled");
-
- if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
- {
- gchar *argv[] = {
- "../gschema-compile",
- SRCDIR "/schema-tests/overflow/",
- "--targetdir=.",
- NULL
- };
- gchar *envp[] = { NULL };
- execve (argv[0], argv, envp);
- }
- g_test_trap_assert_failed ();
- g_test_trap_assert_stderr ("*out of range*");
-}
+static const SchemaTest tests[] = {
+ { "no-default", "*<default> is required in <key>*" },
+ { "missing-quotes", "*unknown keyword*" },
+ { "incomplete-list", "*to follow array element*" },
+ { "wrong-category", "*attribute 'l10n' invalid*" },
+ { "bad-type", "*invalid GVariant type string*" },
+ { "overflow", "*out of range*" },
+ { "bad-key", "*invalid name*" },
+ { "bad-key2", "*invalid name*" },
+ { "bad-key3", "*invalid name*" },
+ { "bad-key4", "*invalid name*" },
+ { "empty-key", "*empty names*" },
+};
int
main (int argc, char *argv[])
{
+ guint i;
+
setlocale (LC_ALL, "");
g_type_init ();
g_test_init (&argc, &argv, NULL);
- g_test_add_func ("/gschema/no-default", test_no_default);
- g_test_add_func ("/gschema/missing-quotes", test_missing_quotes);
- g_test_add_func ("/gschema/incomplete-list", test_incomplete_list);
- g_test_add_func ("/gschema/wrong-category", test_wrong_category);
- g_test_add_func ("/gschema/bad-type", test_bad_type);
- g_test_add_func ("/gschema/overflow", test_overflow);
+ for (i = 0; i < G_N_ELEMENTS (tests); ++i)
+ {
+ gchar *name = g_strdup_printf ("/gschema/%s", tests[i].name);
+ g_test_add_data_func (name, &tests[i], (gpointer) test_schema);
+ g_free (name);
+ }
return g_test_run ();
}
diff --git a/gio/tests/schema-tests/bad-key.gschema.xml b/gio/tests/schema-tests/bad-key.gschema.xml
new file mode 100644
index 0000000..0174553
--- /dev/null
+++ b/gio/tests/schema-tests/bad-key.gschema.xml
@@ -0,0 +1,7 @@
+<schemalist>
+ <schema id="no-default" path="/tests/">
+ <key name="bad_key" type="s">
+ <default></default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/gio/tests/schema-tests/bad-key2.gschema.xml b/gio/tests/schema-tests/bad-key2.gschema.xml
new file mode 100644
index 0000000..7cd8e60
--- /dev/null
+++ b/gio/tests/schema-tests/bad-key2.gschema.xml
@@ -0,0 +1,7 @@
+<schemalist>
+ <schema id="no-default" path="/tests/">
+ <key name="BAD-key" type="s">
+ <default></default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/gio/tests/schema-tests/bad-key3.gschema.xml b/gio/tests/schema-tests/bad-key3.gschema.xml
new file mode 100644
index 0000000..aca7693
--- /dev/null
+++ b/gio/tests/schema-tests/bad-key3.gschema.xml
@@ -0,0 +1,7 @@
+<schemalist>
+ <schema id="no-default" path="/tests/">
+ <key name="bad--key" type="s">
+ <default></default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/gio/tests/schema-tests/bad-key4.gschema.xml b/gio/tests/schema-tests/bad-key4.gschema.xml
new file mode 100644
index 0000000..f529132
--- /dev/null
+++ b/gio/tests/schema-tests/bad-key4.gschema.xml
@@ -0,0 +1,7 @@
+<schemalist>
+ <schema id="no-default" path="/tests/">
+ <key name="bad-key-" type="s">
+ <default></default>
+ </key>
+ </schema>
+</schemalist>
diff --git a/gio/tests/schema-tests/empty-key.gschema.xml b/gio/tests/schema-tests/empty-key.gschema.xml
new file mode 100644
index 0000000..3c5c05c
--- /dev/null
+++ b/gio/tests/schema-tests/empty-key.gschema.xml
@@ -0,0 +1,7 @@
+<schemalist>
+ <schema id="no-default" path="/tests/">
+ <key name="" type="s">
+ <default></default>
+ </key>
+ </schema>
+</schemalist>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]