[kdbus] Fix problem with receiving async messages

[platform/upstream/glib.git] / gio / tests / gsettings.c

diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index e2c19de..4b20795 100644 (file)
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -44,7 +44,7 @@ test_basic (void)
   settings = g_settings_new ("org.gtk.test");
 
   g_object_get (settings,
-                "schema", &str,
+                "schema-id", &str,
                 "backend", &b,
                 "path", &path,
                 "has-unapplied", &has_unapplied,
@@ -440,6 +440,8 @@ test_delay_apply (void)
   GSettings *settings2;
   gchar *str;
   gboolean writable;
+  GVariant *v;
+  const gchar *s;
 
   settings = g_settings_new ("org.gtk.test");
   settings2 = g_settings_new ("org.gtk.test");
@@ -469,6 +471,11 @@ test_delay_apply (void)
   g_free (str);
   str = NULL;
 
+  v = g_settings_get_user_value (settings, "greeting");
+  s = g_variant_get_string (v, NULL);
+  g_assert_cmpstr (s, ==, "greetings from test_delay_apply");
+  g_variant_unref (v);
+
   g_settings_get (settings2, "greeting", "s", &str);
   g_assert_cmpstr (str, ==, "top o' the morning");
   g_free (str);
@@ -563,6 +570,43 @@ test_delay_revert (void)
 }
 
 static void
+test_delay_child (void)
+{
+  GSettings *base;
+  GSettings *settings;
+  GSettings *child;
+  guint8 byte;
+  gboolean delay;
+
+  base = g_settings_new ("org.gtk.test.basic-types");
+  g_settings_set (base, "test-byte", "y", 36);
+
+  settings = g_settings_new ("org.gtk.test");
+  g_settings_delay (settings);
+  g_object_get (settings, "delay-apply", &delay, NULL);
+  g_assert (delay);
+
+  child = g_settings_get_child (settings, "basic-types");
+  g_assert (child != NULL);
+
+  g_object_get (child, "delay-apply", &delay, NULL);
+  g_assert (!delay);
+
+  g_settings_get (child, "test-byte", "y", &byte);
+  g_assert_cmpuint (byte, ==, 36);
+
+  g_settings_set (child, "test-byte", "y", 42);
+
+  /* make sure the child was delayed too */
+  g_settings_get (base, "test-byte", "y", &byte);
+  g_assert_cmpuint (byte, ==, 36);
+
+  g_object_unref (child);
+  g_object_unref (settings);
+  g_object_unref (base);
+}
+
+static void
 keys_changed_cb (GSettings    *settings,
                  const GQuark *keys,
                  gint          n_keys)
@@ -1584,9 +1628,10 @@ test_keyfile (void)
   gsize len;
   gboolean called = FALSE;
 
-  g_remove ("gsettings.store");
+  g_remove ("keyfile/gsettings.store");
+  g_rmdir ("keyfile");
 
-  kf_backend = g_keyfile_settings_backend_new ("gsettings.store", "/", "root");
+  kf_backend = g_keyfile_settings_backend_new ("keyfile/gsettings.store", "/", "root");
   settings = g_settings_new_with_backend ("org.gtk.test", kf_backend);
   g_object_unref (kf_backend);
 
@@ -1608,7 +1653,7 @@ test_keyfile (void)
   g_settings_apply (settings);
 
   keyfile = g_key_file_new ();
-  g_assert (g_key_file_load_from_file (keyfile, "gsettings.store", 0, NULL));
+  g_assert (g_key_file_load_from_file (keyfile, "keyfile/gsettings.store", 0, NULL));
 
   str = g_key_file_get_string (keyfile, "tests", "greeting", NULL);
   g_assert_cmpstr (str, ==, "'see if this works'");
@@ -1617,20 +1662,49 @@ test_keyfile (void)
   str = g_key_file_get_string (keyfile, "tests", "farewell", NULL);
   g_assert_cmpstr (str, ==, "'cheerio'");
   g_free (str);
+  g_key_file_free (keyfile);
 
+  g_settings_reset (settings, "greeting");
+  g_settings_apply (settings);
+  keyfile = g_key_file_new ();
+  g_assert (g_key_file_load_from_file (keyfile, "keyfile/gsettings.store", 0, NULL));
+
+  str = g_key_file_get_string (keyfile, "tests", "greeting", NULL);
+  g_assert (str == NULL);
+
+  called = FALSE;
   g_signal_connect (settings, "changed::greeting", G_CALLBACK (key_changed_cb), &called);
 
-  g_key_file_set_string (keyfile, "tests", "greeting", "howdy");
+  g_key_file_set_string (keyfile, "tests", "greeting", "'howdy'");
   data = g_key_file_to_data (keyfile, &len, NULL);
-  g_file_set_contents ("gsettings.store", data, len, &error);
+  g_file_set_contents ("keyfile/gsettings.store", data, len, &error);
   g_assert_no_error (error);
   while (!called)
     g_main_context_iteration (NULL, FALSE);
+  g_signal_handlers_disconnect_by_func (settings, key_changed_cb, &called);
+
+  str = g_settings_get_string (settings, "greeting");
+  g_assert_cmpstr (str, ==, "howdy");
+  g_free (str);
+
+  g_settings_set (settings, "farewell", "s", "cheerio");
+  
+  called = FALSE;
+  g_signal_connect (settings, "writable-changed::greeting", G_CALLBACK (key_changed_cb), &called);
+
+  g_chmod ("keyfile", 0500);
+  while (!called)
+    g_main_context_iteration (NULL, FALSE);
+  g_signal_handlers_disconnect_by_func (settings, key_changed_cb, &called);
+
+  writable = g_settings_is_writable (settings, "greeting");
+  g_assert (!writable);
 
   g_key_file_free (keyfile);
   g_free (data);
 
   g_object_unref (settings);
+  g_chmod ("keyfile", 0777);
 }
 
 /* Test that getting child schemas works
@@ -1972,6 +2046,7 @@ test_range (void)
   g_assert_cmpint (g_settings_get_int (direct, "val"), ==, 1);
   g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   value = g_variant_new_int32 (1);
   g_assert (!g_settings_range_check (settings, "val", value));
   g_variant_unref (value);
@@ -1981,6 +2056,7 @@ test_range (void)
   value = g_variant_new_int32 (45);
   g_assert (!g_settings_range_check (settings, "val", value));
   g_variant_unref (value);
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static gboolean
@@ -2054,8 +2130,10 @@ test_list_schemas (void)
   const gchar * const *schemas;
   const gchar * const *relocs;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   relocs = g_settings_list_relocatable_schemas ();
   schemas = g_settings_list_schemas ();
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   g_assert (strv_set_equal ((gchar **)relocs,
                             "org.gtk.test.no-path",
@@ -2137,6 +2215,7 @@ test_get_range (void)
   GSettings *settings;
   GVariant *range;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   settings = g_settings_new ("org.gtk.test.range");
   range = g_settings_get_range (settings, "val");
   check_and_free (range, "('range', <(2, 44)>)");
@@ -2157,6 +2236,7 @@ test_get_range (void)
   range = g_settings_get_range (settings, "greeting");
   check_and_free (range, "('type', <@as []>)");
   g_object_unref (settings);
+G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
@@ -2319,7 +2399,7 @@ test_null_backend (void)
   backend = g_null_settings_backend_new ();
   settings = g_settings_new_with_backend_and_path ("org.gtk.test", backend, "/tests/");
 
-  g_object_get (settings, "schema", &str, NULL);
+  g_object_get (settings, "schema-id", &str, NULL);
   g_assert_cmpstr (str, ==, "org.gtk.test");
   g_free (str);
 
@@ -2335,6 +2415,15 @@ test_null_backend (void)
   writable = g_settings_is_writable (settings, "greeting");
   g_assert (!writable);
 
+  g_settings_reset (settings, "greeting");
+
+  g_settings_delay (settings);
+  g_settings_set (settings, "greeting", "s", "goodbye world");
+  g_settings_apply (settings);
+  g_settings_get (settings, "greeting", "s", &str);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
   g_object_unref (settings);
   g_object_unref (backend);
 }
@@ -2400,7 +2489,7 @@ test_default_value (void)
   g_settings_schema_unref (schema);
   g_settings_schema_key_ref (key);
 
-  g_assert_cmpstr (g_settings_schema_key_get_value_type (key), ==, G_VARIANT_TYPE_STRING);
+  g_assert (g_variant_type_equal (g_settings_schema_key_get_value_type (key), G_VARIANT_TYPE_STRING));
 
   v = g_settings_schema_key_get_default_value (key);
   str = g_variant_get_string (v, NULL);
@@ -2515,6 +2604,7 @@ main (int argc, char *argv[])
 
   g_test_add_func ("/gsettings/delay-apply", test_delay_apply);
   g_test_add_func ("/gsettings/delay-revert", test_delay_revert);
+  g_test_add_func ("/gsettings/delay-child", test_delay_child);
   g_test_add_func ("/gsettings/atomic", test_atomic);
 
   g_test_add_func ("/gsettings/simple-binding", test_simple_binding);