[glib] gsettings tests: use g_settings_schema_list_keys()
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] gsettings tests: use g_settings_schema_list_keys()
- Date: Fri, 5 Jun 2015 19:28:26 +0000 (UTC)
commit 6cf867fb2a5086d2c5c0ac6c71ac795008cd13ae
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Nov 19 12:45:06 2014 -0500
gsettings tests: use g_settings_schema_list_keys()
Stop using g_settings_list_keys() because soon it will be deprecated.
https://bugzilla.gnome.org/show_bug.cgi?id=740308
gio/tests/gsettings.c | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 4b20795..d0bc5aa 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -2107,13 +2107,15 @@ strv_set_equal (gchar **strv, ...)
static void
test_list_items (void)
{
+ GSettingsSchema *schema;
GSettings *settings;
gchar **children;
gchar **keys;
settings = g_settings_new ("org.gtk.test");
+ g_object_get (settings, "settings-schema", &schema, NULL);
children = g_settings_list_children (settings);
- keys = g_settings_list_keys (settings);
+ keys = g_settings_schema_list_keys (schema);
g_assert (strv_set_equal (children, "basic-types", "complex-types", "localized", NULL));
g_assert (strv_set_equal (keys, "greeting", "farewell", NULL));
@@ -2121,6 +2123,7 @@ test_list_items (void)
g_strfreev (children);
g_strfreev (keys);
+ g_settings_schema_unref (schema);
g_object_unref (settings);
}
@@ -2322,6 +2325,27 @@ test_schema_source (void)
}
static void
+test_schema_list_keys (void)
+{
+ gchar **keys;
+ GSettingsSchemaSource *src = g_settings_schema_source_get_default ();
+ GSettingsSchema *schema = g_settings_schema_source_lookup (src, "org.gtk.test", TRUE);
+ g_assert (schema != NULL);
+
+ keys = g_settings_schema_list_keys (schema);
+
+ g_assert (strv_set_equal ((gchar **)keys,
+ "greeting",
+ "farewell",
+ NULL));
+
+
+ g_strfreev (keys);
+ g_settings_schema_unref (schema);
+ g_settings_schema_source_unref (src);
+}
+
+static void
test_actions (void)
{
GAction *string, *toggle;
@@ -2526,14 +2550,17 @@ test_default_value (void)
static void
test_extended_schema (void)
{
+ GSettingsSchema *schema;
GSettings *settings;
gchar **keys;
settings = g_settings_new_with_path ("org.gtk.test.extends.extended", "/test/extendes/");
- keys = g_settings_list_keys (settings);
+ g_object_get (settings, "settings-schema", &schema, NULL);
+ keys = g_settings_schema_list_keys (schema);
g_assert (strv_set_equal (keys, "int32", "string", "another-int32", NULL));
g_strfreev (keys);
g_object_unref (settings);
+ g_settings_schema_unref (schema);
}
int
@@ -2646,6 +2673,7 @@ main (int argc, char *argv[])
g_test_add_func ("/gsettings/mapped", test_get_mapped);
g_test_add_func ("/gsettings/get-range", test_get_range);
g_test_add_func ("/gsettings/schema-source", test_schema_source);
+ g_test_add_func ("/gsettings/schema-list-keys", test_schema_list_keys);
g_test_add_func ("/gsettings/actions", test_actions);
g_test_add_func ("/gsettings/null-backend", test_null_backend);
g_test_add_func ("/gsettings/memory-backend", test_memory_backend);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]