X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Ftests%2Fgsettings.c;h=4b2079565acf0d8d9c9546b4e05ff616cf811142;hb=2a2b11b1bb6c702d6b2ef1c37524a57688a94a4e;hp=282d4756d703af296caddbe3e98c42fb64f00baf;hpb=187883dc586c4b5545d4e58e8c8af176da690ef6;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c
index 282d475..4b20795 100644
--- a/gio/tests/gsettings.c
+++ b/gio/tests/gsettings.c
@@ -1,15 +1,33 @@
 #include <stdlib.h>
 #include <locale.h>
 #include <libintl.h>
-#include <gio.h>
+#include <gio/gio.h>
 #include <gstdio.h>
 #define G_SETTINGS_ENABLE_BACKEND
 #include <gio/gsettingsbackend.h>
 
+#include "testenum.h"
+
+static gboolean backend_set;
+
 /* These tests rely on the schemas in org.gtk.test.gschema.xml
  * to be compiled and installed in the same directory.
  */
 
+static void
+check_and_free (GVariant    *value,
+                const gchar *expected)
+{
+  gchar *printed;
+
+  printed = g_variant_print (value, TRUE);
+  g_assert_cmpstr (printed, ==, expected);
+  g_free (printed);
+
+  g_variant_unref (value);
+}
+
+
 /* Just to get warmed up: Read and set a string, and
  * verify that can read the changed string back
  */
@@ -17,12 +35,33 @@ static void
 test_basic (void)
 {
   gchar *str = NULL;
+  GObject *b;
+  gchar *path;
+  gboolean has_unapplied;
+  gboolean delay_apply;
   GSettings *settings;
 
   settings = g_settings_new ("org.gtk.test");
 
+  g_object_get (settings,
+                "schema-id", &str,
+                "backend", &b,
+                "path", &path,
+                "has-unapplied", &has_unapplied,
+                "delay-apply", &delay_apply,
+                NULL);
+  g_assert_cmpstr (str, ==, "org.gtk.test");
+  g_assert (b != NULL);
+  g_assert_cmpstr (path, ==, "/tests/");
+  g_assert (!has_unapplied);
+  g_assert (!delay_apply);
+  g_free (str);
+  g_object_unref (b);
+  g_free (path);
+
   g_settings_get (settings, "greeting", "s", &str);
   g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
 
   g_settings_set (settings, "greeting", "s", "goodbye world");
   g_settings_get (settings, "greeting", "s", &str);
@@ -30,20 +69,28 @@ test_basic (void)
   g_free (str);
   str = NULL;
 
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
+  if (!backend_set && g_test_undefined ())
     {
-      settings = g_settings_new ("org.gtk.test");
-      g_settings_set (settings, "greeting", "i", 555);
-      abort ();
+      GSettings *tmp_settings = g_settings_new ("org.gtk.test");
+
+      g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                             "*g_settings_set_value*expects type*");
+      g_settings_set (tmp_settings, "greeting", "i", 555);
+      g_test_assert_expected_messages ();
+
+      g_object_unref (tmp_settings);
     }
-  g_test_trap_assert_failed ();
-  g_test_trap_assert_stderr ("*correct_type*");
 
   g_settings_get (settings, "greeting", "s", &str);
   g_assert_cmpstr (str, ==, "goodbye world");
   g_free (str);
   str = NULL;
 
+  g_settings_reset (settings, "greeting");
+  str = g_settings_get_string (settings, "greeting");
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
   g_settings_set (settings, "greeting", "s", "this is the end");
   g_object_unref (settings);
 }
@@ -54,7 +101,10 @@ test_basic (void)
 static void
 test_unknown_key (void)
 {
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
+  if (!g_test_undefined ())
+    return;
+
+  if (g_test_subprocess ())
     {
       GSettings *settings;
       GVariant *value;
@@ -65,7 +115,9 @@ test_unknown_key (void)
       g_assert (value == NULL);
 
       g_object_unref (settings);
+      return;
     }
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_failed ();
   g_test_trap_assert_stderr ("*does not contain*");
 }
@@ -73,18 +125,22 @@ test_unknown_key (void)
 /* Check that we get an error when the schema
  * has not been installed
  */
-void
+static void
 test_no_schema (void)
 {
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
+  if (!g_test_undefined ())
+    return;
+
+  if (g_test_subprocess ())
     {
       GSettings *settings;
 
       settings = g_settings_new ("no.such.schema");
 
       g_assert (settings == NULL);
+      return;
     }
-
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_failed ();
   g_test_trap_assert_stderr ("*Settings schema 'no.such.schema' is not installed*");
 }
@@ -95,32 +151,69 @@ test_no_schema (void)
 static void
 test_wrong_type (void)
 {
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-    {
-      GSettings *settings;
-      gchar *str = NULL;
+  GSettings *settings;
+  gchar *str = NULL;
 
-      settings = g_settings_new ("org.gtk.test");
+  if (!g_test_undefined ())
+    return;
+
+  settings = g_settings_new ("org.gtk.test");
+
+  g_test_expect_message ("GLib", G_LOG_LEVEL_CRITICAL,
+                         "*given value has a type of*");
+  g_test_expect_message ("GLib", G_LOG_LEVEL_CRITICAL,
+                         "*valid_format_string*");
+  g_settings_get (settings, "greeting", "o", &str);
+  g_test_assert_expected_messages ();
+
+  g_assert (str == NULL);
 
-      g_settings_get (settings, "greeting", "o", &str);
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                         "*expects type 's'*");
+  g_settings_set (settings, "greeting", "o", "/a/path");
+  g_test_assert_expected_messages ();
 
-      g_assert (str == NULL);
+  g_object_unref (settings);
+}
+
+/* Check errors with explicit paths */
+static void
+test_wrong_path (void)
+{
+  if (!g_test_undefined ())
+    return;
+
+  if (g_test_subprocess ())
+    {
+      GSettings *settings G_GNUC_UNUSED;
+
+      settings = g_settings_new_with_path ("org.gtk.test", "/wrong-path/");
+      return;
     }
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_failed ();
-  g_test_trap_assert_stderr ("*CRITICAL*");
+  g_test_trap_assert_stderr ("*but path * specified by schema*");
+}
 
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
-    {
-      GSettings *settings;
+static void
+test_no_path (void)
+{
+  if (!g_test_undefined ())
+    return;
 
-      settings = g_settings_new ("org.gtk.test");
+  if (g_test_subprocess ())
+    {
+      GSettings *settings G_GNUC_UNUSED;
 
-      g_settings_set (settings, "greetings", "o", "/a/path");
+      settings = g_settings_new ("org.gtk.test.no-path");
+      return;
     }
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_failed ();
-  g_test_trap_assert_stderr ("*CRITICAL*");
+  g_test_trap_assert_stderr ("*attempting to create schema * without a path**");
 }
 
+
 /* Check that we can successfully read and set the full
  * range of all basic types
  */
@@ -294,7 +387,7 @@ changed_cb (GSettings   *settings,
 
 /* Test that basic change notification with the changed signal works.
  */
-void
+static void
 test_changes (void)
 {
   GSettings *settings;
@@ -340,12 +433,15 @@ changed_cb2 (GSettings   *settings,
  * Also test that the has-unapplied property is properly
  * maintained.
  */
-void
+static void
 test_delay_apply (void)
 {
   GSettings *settings;
   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");
@@ -367,11 +463,19 @@ test_delay_apply (void)
   g_assert (changed_cb_called);
   g_assert (!changed_cb_called2);
 
+  writable = g_settings_is_writable (settings, "greeting");
+  g_assert (writable);
+
   g_settings_get (settings, "greeting", "s", &str);
   g_assert_cmpstr (str, ==, "greetings from test_delay_apply");
   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);
@@ -401,6 +505,13 @@ test_delay_apply (void)
   g_assert (!g_settings_get_has_unapplied (settings));
   g_assert (!g_settings_get_has_unapplied (settings2));
 
+  g_settings_reset (settings, "greeting");
+  g_settings_apply (settings);
+
+  g_settings_get (settings, "greeting", "s", &str);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
   g_object_unref (settings2);
   g_object_unref (settings);
 }
@@ -420,6 +531,10 @@ test_delay_revert (void)
 
   g_settings_set (settings2, "greeting", "s", "top o' the morning");
 
+  g_settings_get (settings, "greeting", "s", &str);
+  g_assert_cmpstr (str, ==, "top o' the morning");
+  g_free (str);
+
   g_settings_delay (settings);
 
   g_settings_set (settings, "greeting", "s", "greetings from test_delay_revert");
@@ -455,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)
@@ -532,6 +684,25 @@ test_atomic (void)
   g_object_unref (settings);
 }
 
+/* On Windows the interaction between the C library locale and libintl
+ * (from GNU gettext) is not like on POSIX, so just skip these tests
+ * for now.
+ *
+ * There are several issues:
+ *
+ * 1) The C library doesn't use LC_MESSAGES, that is implemented only
+ * in libintl (defined in its <libintl.h>).
+ *
+ * 2) The locale names that setlocale() accepts and returns aren't in
+ * the "de_DE" style, but like "German_Germany".
+ *
+ * 3) libintl looks at the Win32 thread locale and not the C library
+ * locale. (And even if libintl would use the C library's locale, as
+ * there are several alternative C library DLLs, libintl might be
+ * linked to a different one than the application code, so they
+ * wouldn't have the same C library locale anyway.)
+ */
+
 /* Test that translations work for schema defaults.
  *
  * This test relies on the de.po file in the same directory
@@ -560,14 +731,20 @@ test_l10n (void)
   str = NULL;
 
   setlocale (LC_MESSAGES, "de_DE");
-  str = g_settings_get_string (settings, "error-message");
-  setlocale (LC_MESSAGES, locale);
+  /* Only do the test if translation is actually working... */
+  if (g_str_equal (dgettext ("test", "\"Unnamed\""), "\"Unbenannt\""))
+    {
+      str = g_settings_get_string (settings, "error-message");
 
-  g_assert_cmpstr (str, ==, "Unbenannt");
-  g_object_unref (settings);
-  g_free (str);
-  str = NULL;
+      g_assert_cmpstr (str, ==, "Unbenannt");
+      g_object_unref (settings);
+      g_free (str);
+      str = NULL;
+    }
+  else
+    g_printerr ("warning: translation is not working... skipping test. ");
 
+  setlocale (LC_MESSAGES, locale);
   g_free (locale);
 }
 
@@ -601,14 +778,20 @@ test_l10n_context (void)
   str = NULL;
 
   setlocale (LC_MESSAGES, "de_DE");
-  g_settings_get (settings, "backspace", "s", &str);
-  setlocale (LC_MESSAGES, locale);
+  /* Only do the test if translation is actually working... */
+  if (g_str_equal (dgettext ("test", "\"Unnamed\""), "\"Unbenannt\""))
+    {
+      g_settings_get (settings, "backspace", "s", &str);
 
-  g_assert_cmpstr (str, ==, "Löschen");
-  g_object_unref (settings);
-  g_free (str);
-  str = NULL;
+      g_assert_cmpstr (str, ==, "Löschen");
+      g_object_unref (settings);
+      g_free (str);
+      str = NULL;
+    }
+  else
+    g_printerr ("warning: translation is not working... skipping test.  ");
 
+  setlocale (LC_MESSAGES, locale);
   g_free (locale);
 }
 
@@ -616,9 +799,21 @@ enum
 {
   PROP_0,
   PROP_BOOL,
+  PROP_ANTI_BOOL,
+  PROP_BYTE,
+  PROP_INT16,
+  PROP_UINT16,
   PROP_INT,
+  PROP_UINT,
+  PROP_INT64,
+  PROP_UINT64,
   PROP_DOUBLE,
-  PROP_STRING
+  PROP_STRING,
+  PROP_NO_READ,
+  PROP_NO_WRITE,
+  PROP_STRV,
+  PROP_ENUM,
+  PROP_FLAGS
 };
 
 typedef struct
@@ -626,9 +821,21 @@ typedef struct
   GObject parent_instance;
 
   gboolean bool_prop;
+  gboolean anti_bool_prop;
+  gint8 byte_prop;
+  gint int16_prop;
+  guint16 uint16_prop;
   gint int_prop;
+  guint uint_prop;
+  gint64 int64_prop;
+  guint64 uint64_prop;
   gdouble double_prop;
   gchar *string_prop;
+  gchar *no_read_prop;
+  gchar *no_write_prop;
+  gchar **strv_prop;
+  guint enum_prop;
+  guint flags_prop;
 } TestObject;
 
 typedef struct
@@ -636,6 +843,7 @@ typedef struct
   GObjectClass parent_class;
 } TestObjectClass;
 
+static GType test_object_get_type (void);
 G_DEFINE_TYPE (TestObject, test_object, G_TYPE_OBJECT)
 
 static void
@@ -647,6 +855,7 @@ static void
 test_object_finalize (GObject *object)
 {
   TestObject *testo = (TestObject*)object;
+  g_strfreev (testo->strv_prop);
   g_free (testo->string_prop);
   G_OBJECT_CLASS (test_object_parent_class)->finalize (object);
 }
@@ -664,15 +873,48 @@ test_object_get_property (GObject    *object,
     case PROP_BOOL:
       g_value_set_boolean (value, test_object->bool_prop);
       break;
+    case PROP_ANTI_BOOL:
+      g_value_set_boolean (value, test_object->anti_bool_prop);
+      break;
+    case PROP_BYTE:
+      g_value_set_schar (value, test_object->byte_prop);
+      break;
+    case PROP_UINT16:
+      g_value_set_uint (value, test_object->uint16_prop);
+      break;
+    case PROP_INT16:
+      g_value_set_int (value, test_object->int16_prop);
+      break;
     case PROP_INT:
       g_value_set_int (value, test_object->int_prop);
       break;
+    case PROP_UINT:
+      g_value_set_uint (value, test_object->uint_prop);
+      break;
+    case PROP_INT64:
+      g_value_set_int64 (value, test_object->int64_prop);
+      break;
+    case PROP_UINT64:
+      g_value_set_uint64 (value, test_object->uint64_prop);
+      break;
     case PROP_DOUBLE:
       g_value_set_double (value, test_object->double_prop);
       break;
     case PROP_STRING:
       g_value_set_string (value, test_object->string_prop);
       break;
+    case PROP_NO_WRITE:
+      g_value_set_string (value, test_object->no_write_prop);
+      break;
+    case PROP_STRV:
+      g_value_set_boxed (value, test_object->strv_prop);
+      break;
+    case PROP_ENUM:
+      g_value_set_enum (value, test_object->enum_prop);
+      break;
+    case PROP_FLAGS:
+      g_value_set_flags (value, test_object->flags_prop);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -692,9 +934,30 @@ test_object_set_property (GObject      *object,
     case PROP_BOOL:
       test_object->bool_prop = g_value_get_boolean (value);
       break;
+    case PROP_ANTI_BOOL:
+      test_object->anti_bool_prop = g_value_get_boolean (value);
+      break;
+    case PROP_BYTE:
+      test_object->byte_prop = g_value_get_schar (value);
+      break;
+    case PROP_INT16:
+      test_object->int16_prop = g_value_get_int (value);
+      break;
+    case PROP_UINT16:
+      test_object->uint16_prop = g_value_get_uint (value);
+      break;
     case PROP_INT:
       test_object->int_prop = g_value_get_int (value);
       break;
+    case PROP_UINT:
+      test_object->uint_prop = g_value_get_uint (value);
+      break;
+    case PROP_INT64:
+      test_object->int64_prop = g_value_get_int64 (value);
+      break;
+    case PROP_UINT64:
+      test_object->uint64_prop = g_value_get_uint64 (value);
+      break;
     case PROP_DOUBLE:
       test_object->double_prop = g_value_get_double (value);
       break;
@@ -702,12 +965,70 @@ test_object_set_property (GObject      *object,
       g_free (test_object->string_prop);
       test_object->string_prop = g_value_dup_string (value);
       break;
+    case PROP_NO_READ:
+      g_free (test_object->no_read_prop);
+      test_object->no_read_prop = g_value_dup_string (value);
+      break;
+    case PROP_STRV:
+      g_strfreev (test_object->strv_prop);
+      test_object->strv_prop = g_value_dup_boxed (value);
+      break;
+    case PROP_ENUM:
+      test_object->enum_prop = g_value_get_enum (value);
+      break;
+    case PROP_FLAGS:
+      test_object->flags_prop = g_value_get_flags (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
+static GType
+test_enum_get_type (void)
+{
+  static volatile gsize define_type_id = 0;
+
+  if (g_once_init_enter (&define_type_id))
+    {
+      static const GEnumValue values[] = {
+        { TEST_ENUM_FOO, "TEST_ENUM_FOO", "foo" },
+        { TEST_ENUM_BAR, "TEST_ENUM_BAR", "bar" },
+        { TEST_ENUM_BAZ, "TEST_ENUM_BAZ", "baz" },
+        { TEST_ENUM_QUUX, "TEST_ENUM_QUUX", "quux" },
+        { 0, NULL, NULL }
+      };
+
+      GType type_id = g_enum_register_static ("TestEnum", values);
+      g_once_init_leave (&define_type_id, type_id);
+    }
+
+  return define_type_id;
+}
+
+static GType
+test_flags_get_type (void)
+{
+  static volatile gsize define_type_id = 0;
+
+  if (g_once_init_enter (&define_type_id))
+    {
+      static const GFlagsValue values[] = {
+        { TEST_FLAGS_NONE, "TEST_FLAGS_NONE", "none" },
+        { TEST_FLAGS_MOURNING, "TEST_FLAGS_MOURNING", "mourning" },
+        { TEST_FLAGS_LAUGHING, "TEST_FLAGS_LAUGHING", "laughing" },
+        { TEST_FLAGS_WALKING, "TEST_FLAGS_WALKING", "walking" },
+        { 0, NULL, NULL }
+      };
+
+      GType type_id = g_flags_register_static ("TestFlags", values);
+      g_once_init_leave (&define_type_id, type_id);
+    }
+
+  return define_type_id;
+}
+
 static void
 test_object_class_init (TestObjectClass *class)
 {
@@ -719,12 +1040,36 @@ test_object_class_init (TestObjectClass *class)
 
   g_object_class_install_property (gobject_class, PROP_BOOL,
     g_param_spec_boolean ("bool", "", "", FALSE, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_ANTI_BOOL,
+    g_param_spec_boolean ("anti-bool", "", "", FALSE, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_BYTE,
+    g_param_spec_char ("byte", "", "", G_MININT8, G_MAXINT8, 0, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_INT16,
+    g_param_spec_int ("int16", "", "", -G_MAXINT16, G_MAXINT16, 0, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_UINT16,
+    g_param_spec_uint ("uint16", "", "", 0, G_MAXUINT16, 0, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, PROP_INT,
-    g_param_spec_int ("int", "", "", -G_MAXINT, G_MAXINT, 0, G_PARAM_READWRITE));
+    g_param_spec_int ("int", "", "", G_MININT, G_MAXINT, 0, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_UINT,
+    g_param_spec_uint ("uint", "", "", 0, G_MAXUINT, 0, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_INT64,
+    g_param_spec_int64 ("int64", "", "", G_MININT64, G_MAXINT64, 0, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_UINT64,
+    g_param_spec_uint64 ("uint64", "", "", 0, G_MAXUINT64, 0, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, PROP_DOUBLE,
     g_param_spec_double ("double", "", "", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, PROP_STRING,
     g_param_spec_string ("string", "", "", NULL, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_NO_WRITE,
+    g_param_spec_string ("no-write", "", "", NULL, G_PARAM_READABLE));
+  g_object_class_install_property (gobject_class, PROP_NO_READ,
+    g_param_spec_string ("no-read", "", "", NULL, G_PARAM_WRITABLE));
+  g_object_class_install_property (gobject_class, PROP_STRV,
+    g_param_spec_boxed ("strv", "", "", G_TYPE_STRV, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_ENUM,
+    g_param_spec_enum ("enum", "", "", test_enum_get_type (), TEST_ENUM_FOO, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, PROP_FLAGS,
+    g_param_spec_flags ("flags", "", "", test_flags_get_type (), TEST_FLAGS_NONE, G_PARAM_READWRITE));
 }
 
 static TestObject *
@@ -743,31 +1088,122 @@ test_simple_binding (void)
   TestObject *obj;
   GSettings *settings;
   gboolean b;
+  gchar y;
   gint i;
+  guint u;
+  gint16 n;
+  guint16 q;
+  gint n2;
+  guint q2;
+  gint64 i64;
+  guint64 u64;
   gdouble d;
   gchar *s;
+  GVariant *value;
+  gchar **strv;
 
   settings = g_settings_new ("org.gtk.test.binding");
   obj = test_object_new ();
 
   g_settings_bind (settings, "bool", obj, "bool", G_SETTINGS_BIND_DEFAULT);
-
   g_object_set (obj, "bool", TRUE, NULL);
   g_assert_cmpint (g_settings_get_boolean (settings, "bool"), ==, TRUE);
 
   g_settings_set_boolean (settings, "bool", FALSE);
+  b = TRUE;
   g_object_get (obj, "bool", &b, NULL);
   g_assert_cmpint (b, ==, FALSE);
 
+  g_settings_bind (settings, "anti-bool", obj, "anti-bool",
+                   G_SETTINGS_BIND_INVERT_BOOLEAN);
+  g_object_set (obj, "anti-bool", FALSE, NULL);
+  g_assert_cmpint (g_settings_get_boolean (settings, "anti-bool"), ==, TRUE);
+
+  g_settings_set_boolean (settings, "anti-bool", FALSE);
+  b = FALSE;
+  g_object_get (obj, "anti-bool", &b, NULL);
+  g_assert_cmpint (b, ==, TRUE);
+
+  g_settings_bind (settings, "byte", obj, "byte", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "byte", 123, NULL);
+  y = 'c';
+  g_settings_get (settings, "byte", "y", &y);
+  g_assert_cmpint (y, ==, 123);
+
+  g_settings_set (settings, "byte", "y", 54);
+  y = 'c';
+  g_object_get (obj, "byte", &y, NULL);
+  g_assert_cmpint (y, ==, 54);
+
+  g_settings_bind (settings, "int16", obj, "int16", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "int16", 1234, NULL);
+  n = 4321;
+  g_settings_get (settings, "int16", "n", &n);
+  g_assert_cmpint (n, ==, 1234);
+
+  g_settings_set (settings, "int16", "n", 4321);
+  n2 = 1111;
+  g_object_get (obj, "int16", &n2, NULL);
+  g_assert_cmpint (n2, ==, 4321);
+
+  g_settings_bind (settings, "uint16", obj, "uint16", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "uint16", (guint16) G_MAXUINT16, NULL);
+  q = 1111;
+  g_settings_get (settings, "uint16", "q", &q);
+  g_assert_cmpuint (q, ==, G_MAXUINT16);
+
+  g_settings_set (settings, "uint16", "q", (guint16) G_MAXINT16);
+  q2 = 1111;
+  g_object_get (obj, "uint16", &q2, NULL);
+  g_assert_cmpuint (q2, ==, (guint16) G_MAXINT16);
+
   g_settings_bind (settings, "int", obj, "int", G_SETTINGS_BIND_DEFAULT);
 
   g_object_set (obj, "int", 12345, NULL);
   g_assert_cmpint (g_settings_get_int (settings, "int"), ==, 12345);
 
   g_settings_set_int (settings, "int", 54321);
+  i = 1111;
   g_object_get (obj, "int", &i, NULL);
   g_assert_cmpint (i, ==, 54321);
 
+  g_settings_bind (settings, "uint", obj, "uint", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "uint", 12345, NULL);
+  g_assert_cmpuint (g_settings_get_uint (settings, "uint"), ==, 12345);
+
+  g_settings_set_uint (settings, "uint", 54321);
+  u = 1111;
+  g_object_get (obj, "uint", &u, NULL);
+  g_assert_cmpuint (u, ==, 54321);
+
+  g_settings_bind (settings, "int64", obj, "int64", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "int64", (gint64) G_MAXINT64, NULL);
+  i64 = 1111;
+  g_settings_get (settings, "int64", "x", &i64);
+  g_assert_cmpint (i64, ==, G_MAXINT64);
+
+  g_settings_set (settings, "int64", "x", (gint64) G_MININT64);
+  i64 = 1111;
+  g_object_get (obj, "int64", &i64, NULL);
+  g_assert_cmpint (i64, ==, G_MININT64);
+
+  g_settings_bind (settings, "uint64", obj, "uint64", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "uint64", (guint64) G_MAXUINT64, NULL);
+  u64 = 1111;
+  g_settings_get (settings, "uint64", "t", &u64);
+  g_assert_cmpuint (u64, ==, G_MAXUINT64);
+
+  g_settings_set (settings, "uint64", "t", (guint64) G_MAXINT64);
+  u64 = 1111;
+  g_object_get (obj, "uint64", &u64, NULL);
+  g_assert_cmpuint (u64, ==, (guint64) G_MAXINT64);
+
   g_settings_bind (settings, "string", obj, "string", G_SETTINGS_BIND_DEFAULT);
 
   g_object_set (obj, "string", "bu ba", NULL);
@@ -780,14 +1216,135 @@ test_simple_binding (void)
   g_assert_cmpstr (s, ==, "bla bla");
   g_free (s);
 
+  g_settings_bind (settings, "chararray", obj, "string", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "string", "non-unicode:\315", NULL);
+  value = g_settings_get_value (settings, "chararray");
+  g_assert_cmpstr (g_variant_get_bytestring (value), ==, "non-unicode:\315");
+  g_variant_unref (value);
+
   g_settings_bind (settings, "double", obj, "double", G_SETTINGS_BIND_DEFAULT);
 
-  g_object_set (obj, "double", 203e7, NULL);
-  g_assert_cmpfloat (g_settings_get_double (settings, "double"), ==, 203e7);
+  g_object_set (obj, "double", G_MAXFLOAT, NULL);
+  g_assert_cmpfloat (g_settings_get_double (settings, "double"), ==, G_MAXFLOAT);
+
+  g_settings_set_double (settings, "double", G_MINFLOAT);
+  d = 1.0;
+  g_object_get (obj, "double", &d, NULL);
+  g_assert_cmpfloat (d, ==, G_MINFLOAT);
+
+  g_object_set (obj, "double", G_MAXDOUBLE, NULL);
+  g_assert_cmpfloat (g_settings_get_double (settings, "double"), ==, G_MAXDOUBLE);
 
-  g_settings_set_double (settings, "double", 207e3);
+  g_settings_set_double (settings, "double", -G_MINDOUBLE);
+  d = 1.0;
   g_object_get (obj, "double", &d, NULL);
-  g_assert_cmpfloat (d, ==, 207e3);
+  g_assert_cmpfloat (d, ==, -G_MINDOUBLE);
+
+  strv = g_strsplit ("plastic bag,middle class,polyethylene", ",", 0);
+  g_settings_bind (settings, "strv", obj, "strv", G_SETTINGS_BIND_DEFAULT);
+  g_object_set (obj, "strv", strv, NULL);
+  g_strfreev (strv);
+  strv = g_settings_get_strv (settings, "strv");
+  s = g_strjoinv (",", strv);
+  g_assert_cmpstr (s, ==, "plastic bag,middle class,polyethylene");
+  g_strfreev (strv);
+  g_free (s);
+  strv = g_strsplit ("decaffeinate,unleaded,keep all surfaces clean", ",", 0);
+  g_settings_set_strv (settings, "strv", (const gchar **) strv);
+  g_strfreev (strv);
+  g_object_get (obj, "strv", &strv, NULL);
+  s = g_strjoinv (",", strv);
+  g_assert_cmpstr (s, ==, "decaffeinate,unleaded,keep all surfaces clean");
+  g_strfreev (strv);
+  g_free (s);
+  g_settings_set_strv (settings, "strv", NULL);
+  g_object_get (obj, "strv", &strv, NULL);
+  g_assert (strv != NULL);
+  g_assert_cmpint (g_strv_length (strv), ==, 0);
+  g_strfreev (strv);
+
+  g_settings_bind (settings, "enum", obj, "enum", G_SETTINGS_BIND_DEFAULT);
+  g_object_set (obj, "enum", TEST_ENUM_BAZ, NULL);
+  s = g_settings_get_string (settings, "enum");
+  g_assert_cmpstr (s, ==, "baz");
+  g_free (s);
+  g_assert_cmpint (g_settings_get_enum (settings, "enum"), ==, TEST_ENUM_BAZ);
+
+  g_settings_set_enum (settings, "enum", TEST_ENUM_QUUX);
+  i = 230;
+  g_object_get (obj, "enum", &i, NULL);
+  g_assert_cmpint (i, ==, TEST_ENUM_QUUX);
+
+  g_settings_set_string (settings, "enum", "baz");
+  i = 230;
+  g_object_get (obj, "enum", &i, NULL);
+  g_assert_cmpint (i, ==, TEST_ENUM_BAZ);
+
+  g_settings_bind (settings, "flags", obj, "flags", G_SETTINGS_BIND_DEFAULT);
+  g_object_set (obj, "flags", TEST_FLAGS_MOURNING, NULL);
+  strv = g_settings_get_strv (settings, "flags");
+  g_assert_cmpint (g_strv_length (strv), ==, 1);
+  g_assert_cmpstr (strv[0], ==, "mourning");
+  g_strfreev (strv);
+
+  g_assert_cmpint (g_settings_get_flags (settings, "flags"), ==, TEST_FLAGS_MOURNING);
+
+  g_settings_set_flags (settings, "flags", TEST_FLAGS_MOURNING | TEST_FLAGS_WALKING);
+  i = 230;
+  g_object_get (obj, "flags", &i, NULL);
+  g_assert_cmpint (i, ==, TEST_FLAGS_MOURNING | TEST_FLAGS_WALKING);
+
+  g_object_unref (obj);
+  g_object_unref (settings);
+}
+
+static void
+test_unbind (void)
+{
+  TestObject *obj;
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
+
+  g_settings_bind (settings, "int", obj, "int", G_SETTINGS_BIND_DEFAULT);
+
+  g_object_set (obj, "int", 12345, NULL);
+  g_assert_cmpint (g_settings_get_int (settings, "int"), ==, 12345);
+
+  g_settings_unbind (obj, "int");
+
+  g_object_set (obj, "int", 54321, NULL);
+  g_assert_cmpint (g_settings_get_int (settings, "int"), ==, 12345);
+
+  g_object_unref (obj);
+  g_object_unref (settings);
+}
+
+static void
+test_bind_writable (void)
+{
+  TestObject *obj;
+  GSettings *settings;
+  gboolean b;
+
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
+
+  g_object_set (obj, "bool", FALSE, NULL);
+
+  g_settings_bind_writable (settings, "int", obj, "bool", FALSE);
+
+  g_object_get (obj, "bool", &b, NULL);
+  g_assert (b);
+
+  g_settings_unbind (obj, "bool");
+
+  g_settings_bind_writable (settings, "int", obj, "bool", TRUE);
+
+  g_object_get (obj, "bool", &b, NULL);
+  g_assert (!b);
 
   g_object_unref (obj);
   g_object_unref (settings);
@@ -836,12 +1393,14 @@ test_directional_binding (void)
   g_object_unref (settings);
 }
 
-/* Test that type mismatch is caught when creating a binding
- */
+/* Test that type mismatch is caught when creating a binding */
 static void
 test_typesafe_binding (void)
 {
-  if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDERR))
+  if (!g_test_undefined ())
+    return;
+
+  if (g_test_subprocess ())
     {
       TestObject *obj;
       GSettings *settings;
@@ -853,7 +1412,9 @@ test_typesafe_binding (void)
 
       g_object_unref (obj);
       g_object_unref (settings);
+      return;
     }
+  g_test_trap_subprocess (NULL, 0, 0);
   g_test_trap_assert_failed ();
   g_test_trap_assert_stderr ("*not compatible*");
 }
@@ -916,6 +1477,7 @@ test_custom_binding (void)
   g_object_set (obj, "bool", TRUE, NULL);
   s = g_settings_get_string (settings, "string");
   g_assert_cmpstr (s, ==, "true");
+  g_free (s);
 
   g_object_unref (obj);
   g_object_unref (settings);
@@ -957,64 +1519,1143 @@ test_no_change_binding (void)
   g_object_unref (settings);
 }
 
-/*
- * Test that using a keyfile works
+/* Test that binding a non-readable property only
+ * works in 'GET' mode.
  */
 static void
-test_keyfile (void)
+test_no_read_binding_fail (void)
 {
+  TestObject *obj;
   GSettings *settings;
-  GKeyFile *keyfile;
-  gchar *str;
-
-  g_remove ("gsettings.store");
 
-  g_settings_backend_setup_keyfile ("blah", "gsettings.store");
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
 
-  settings = g_settings_new_with_context ("org.gtk.test", "blah");
+  g_settings_bind (settings, "string", obj, "no-read", 0);
+}
 
-  g_settings_set (settings, "greeting", "s", "see if this works");
+static void
+test_no_read_binding_pass (void)
+{
+  TestObject *obj;
+  GSettings *settings;
 
-  keyfile = g_key_file_new ();
-  g_assert (g_key_file_load_from_file (keyfile, "gsettings.store", 0, NULL));
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
 
-  str = g_key_file_get_string (keyfile, "/tests/", "greeting", NULL);
-  g_assert_cmpstr (str, ==, "'see if this works'");
+  g_settings_bind (settings, "string", obj, "no-read", G_SETTINGS_BIND_GET);
 
-  g_free (str);
-  g_key_file_free (keyfile);
-  g_object_unref (settings);
+  exit (0);
 }
 
-int
-main (int argc, char *argv[])
+static void
+test_no_read_binding (void)
 {
-  g_setenv ("GSETTINGS_SCHEMA_DIR", ".", TRUE);
-  g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
-
-  g_remove ("./store");
+  if (g_test_undefined ())
+    {
+      g_test_trap_subprocess ("/gsettings/no-read-binding/subprocess/fail", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*property*is not readable*");
+    }
 
-  g_type_init ();
-  g_test_init (&argc, &argv, NULL);
+  g_test_trap_subprocess ("/gsettings/no-read-binding/subprocess/pass", 0, 0);
+  g_test_trap_assert_passed ();
+}
+
+/* Test that binding a non-writable property only
+ * works in 'SET' mode.
+ */
+static void
+test_no_write_binding_fail (void)
+{
+  TestObject *obj;
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
+
+  g_settings_bind (settings, "string", obj, "no-write", 0);
+}
+
+static void
+test_no_write_binding_pass (void)
+{
+  TestObject *obj;
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.binding");
+  obj = test_object_new ();
+
+  g_settings_bind (settings, "string", obj, "no-write", G_SETTINGS_BIND_SET);
+
+  exit (0);
+}
+
+static void
+test_no_write_binding (void)
+{
+  if (g_test_undefined ())
+    {
+      g_test_trap_subprocess ("/gsettings/no-write-binding/subprocess/fail", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*property*is not writable*");
+    }
+
+  g_test_trap_subprocess ("/gsettings/no-write-binding/subprocess/pass", 0, 0);
+  g_test_trap_assert_passed ();
+}
+
+static void
+key_changed_cb (GSettings *settings, const gchar *key, gpointer data)
+{
+  gboolean *b = data;
+  (*b) = TRUE;
+}
+
+/*
+ * Test that using a keyfile works
+ */
+static void
+test_keyfile (void)
+{
+  GSettingsBackend *kf_backend;
+  GSettings *settings;
+  GKeyFile *keyfile;
+  gchar *str;
+  gboolean writable;
+  GError *error = NULL;
+  gchar *data;
+  gsize len;
+  gboolean called = FALSE;
+
+  g_remove ("keyfile/gsettings.store");
+  g_rmdir ("keyfile");
+
+  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);
+
+  g_settings_reset (settings, "greeting");
+  str = g_settings_get_string (settings, "greeting");
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
+  writable = g_settings_is_writable (settings, "greeting");
+  g_assert (writable);
+  g_settings_set (settings, "greeting", "s", "see if this works");
+
+  str = g_settings_get_string (settings, "greeting");
+  g_assert_cmpstr (str, ==, "see if this works");
+  g_free (str);
+
+  g_settings_delay (settings);
+  g_settings_set (settings, "farewell", "s", "cheerio");
+  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_cmpstr (str, ==, "'see if this works'");
+  g_free (str);
+
+  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'");
+  data = g_key_file_to_data (keyfile, &len, NULL);
+  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
+ */
+static void
+test_child_schema (void)
+{
+  GSettings *settings;
+  GSettings *child;
+  guint8 byte;
+
+  /* first establish some known conditions */
+  settings = g_settings_new ("org.gtk.test.basic-types");
+  g_settings_set (settings, "test-byte", "y", 36);
+
+  g_settings_get (settings, "test-byte", "y", &byte);
+  g_assert_cmpint (byte, ==, 36);
+
+  g_object_unref (settings);
+
+  settings = g_settings_new ("org.gtk.test");
+  child = g_settings_get_child (settings, "basic-types");
+  g_assert (child != NULL);
+
+  g_settings_get (child, "test-byte", "y", &byte);
+  g_assert_cmpint (byte, ==, 36);
+
+  g_object_unref (child);
+  g_object_unref (settings);
+}
+
+#include "../strinfo.c"
+
+static void
+test_strinfo (void)
+{
+  /*  "foo" has a value of 1
+   *  "bar" has a value of 2
+   *  "baz" is an alias for "bar"
+   */
+  gchar array[] =
+    "\1\0\0\0"      "\xff""foo"     "\0\0\0\xff"    "\2\0\0\0"
+    "\xff" "bar"    "\0\0\0\xff"    "\3\0\0\0"      "\xfe""baz"
+    "\0\0\0\xff";
+  const guint32 *strinfo = (guint32 *) array;
+  guint length = sizeof array / 4;
+  guint result;
+
+  {
+    /* build it and compare */
+    GString *builder;
+
+    builder = g_string_new (NULL);
+    strinfo_builder_append_item (builder, "foo", 1);
+    strinfo_builder_append_item (builder, "bar", 2);
+    g_assert (strinfo_builder_append_alias (builder, "baz", "bar"));
+    g_assert_cmpint (builder->len % 4, ==, 0);
+    g_assert_cmpint (builder->len / 4, ==, length);
+    g_assert (memcmp (builder->str, strinfo, length * 4) == 0);
+    g_string_free (builder, TRUE);
+  }
+
+  g_assert_cmpstr (strinfo_string_from_alias (strinfo, length, "foo"),
+                   ==, NULL);
+  g_assert_cmpstr (strinfo_string_from_alias (strinfo, length, "bar"),
+                   ==, NULL);
+  g_assert_cmpstr (strinfo_string_from_alias (strinfo, length, "baz"),
+                   ==, "bar");
+  g_assert_cmpstr (strinfo_string_from_alias (strinfo, length, "quux"),
+                   ==, NULL);
+
+  g_assert (strinfo_enum_from_string (strinfo, length, "foo", &result));
+  g_assert_cmpint (result, ==, 1);
+  g_assert (strinfo_enum_from_string (strinfo, length, "bar", &result));
+  g_assert_cmpint (result, ==, 2);
+  g_assert (!strinfo_enum_from_string (strinfo, length, "baz", &result));
+  g_assert (!strinfo_enum_from_string (strinfo, length, "quux", &result));
+
+  g_assert_cmpstr (strinfo_string_from_enum (strinfo, length, 0), ==, NULL);
+  g_assert_cmpstr (strinfo_string_from_enum (strinfo, length, 1), ==, "foo");
+  g_assert_cmpstr (strinfo_string_from_enum (strinfo, length, 2), ==, "bar");
+  g_assert_cmpstr (strinfo_string_from_enum (strinfo, length, 3), ==, NULL);
+
+  g_assert (strinfo_is_string_valid (strinfo, length, "foo"));
+  g_assert (strinfo_is_string_valid (strinfo, length, "bar"));
+  g_assert (!strinfo_is_string_valid (strinfo, length, "baz"));
+  g_assert (!strinfo_is_string_valid (strinfo, length, "quux"));
+}
+
+static void
+test_enums_non_enum_key (void)
+{
+  GSettings *direct;
+
+  direct = g_settings_new ("org.gtk.test.enums.direct");
+  g_settings_get_enum (direct, "test");
+  g_assert_not_reached ();
+}
+
+static void
+test_enums_non_enum_value (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_set_enum (settings, "test", 42);
+  g_assert_not_reached ();
+}
+
+static void
+test_enums_range (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_set_string (settings, "test", "qux");
+  g_assert_not_reached ();
+}
+
+static void
+test_enums_non_flags (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_get_flags (settings, "test");
+  g_assert_not_reached ();
+}
+
+static void
+test_enums (void)
+{
+  GSettings *settings, *direct;
+  gchar *str;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  direct = g_settings_new ("org.gtk.test.enums.direct");
+
+  if (g_test_undefined () && !backend_set)
+    {
+      g_test_trap_subprocess ("/gsettings/enums/subprocess/non-enum-key", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*not associated with an enum*");
+
+      g_test_trap_subprocess ("/gsettings/enums/subprocess/non-enum-value", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*invalid enum value 42*");
+
+      g_test_trap_subprocess ("/gsettings/enums/subprocess/range", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
+
+      g_test_trap_subprocess ("/gsettings/enums/subprocess/non-flags", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*not associated with a flags*");
+    }
+
+  str = g_settings_get_string (settings, "test");
+  g_assert_cmpstr (str, ==, "bar");
+  g_free (str);
+
+  g_settings_set_enum (settings, "test", TEST_ENUM_FOO);
+
+  str = g_settings_get_string (settings, "test");
+  g_assert_cmpstr (str, ==, "foo");
+  g_free (str);
+
+  g_assert_cmpint (g_settings_get_enum (settings, "test"), ==, TEST_ENUM_FOO);
+
+  g_settings_set_string (direct, "test", "qux");
+
+  str = g_settings_get_string (direct, "test");
+  g_assert_cmpstr (str, ==, "qux");
+  g_free (str);
+
+  str = g_settings_get_string (settings, "test");
+  g_assert_cmpstr (str, ==, "quux");
+  g_free (str);
+
+  g_assert_cmpint (g_settings_get_enum (settings, "test"), ==, TEST_ENUM_QUUX);
+}
+
+static void
+test_flags_non_flags_key (void)
+{
+  GSettings *direct;
+
+  direct = g_settings_new ("org.gtk.test.enums.direct");
+  g_settings_get_flags (direct, "test");
+  g_assert_not_reached ();
+}
+
+static void
+test_flags_non_flags_value (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_set_flags (settings, "f-test", 0x42);
+  g_assert_not_reached ();
+}
+
+static void
+test_flags_range (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_set_strv (settings, "f-test",
+                       (const gchar **) g_strsplit ("rock", ",", 0));
+  g_assert_not_reached ();
+}
+
+static void
+test_flags_non_enum (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  g_settings_get_enum (settings, "f-test");
+  g_assert_not_reached ();
+}
+
+static void
+test_flags (void)
+{
+  GSettings *settings, *direct;
+  gchar **strv;
+  gchar *str;
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  direct = g_settings_new ("org.gtk.test.enums.direct");
+
+  if (g_test_undefined () && !backend_set)
+    {
+      g_test_trap_subprocess ("/gsettings/flags/subprocess/non-flags-key", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*not associated with a flags*");
+
+      g_test_trap_subprocess ("/gsettings/flags/subprocess/non-flags-value", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*invalid flags value 0x00000042*");
+
+      g_test_trap_subprocess ("/gsettings/flags/subprocess/range", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
+
+      g_test_trap_subprocess ("/gsettings/flags/subprocess/non-enum", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*not associated with an enum*");
+    }
+
+  strv = g_settings_get_strv (settings, "f-test");
+  str = g_strjoinv (",", strv);
+  g_assert_cmpstr (str, ==, "");
+  g_strfreev (strv);
+  g_free (str);
+
+  g_settings_set_flags (settings, "f-test",
+                        TEST_FLAGS_WALKING | TEST_FLAGS_TALKING);
+
+  strv = g_settings_get_strv (settings, "f-test");
+  str = g_strjoinv (",", strv);
+  g_assert_cmpstr (str, ==, "talking,walking");
+  g_strfreev (strv);
+  g_free (str);
+
+  g_assert_cmpint (g_settings_get_flags (settings, "f-test"), ==,
+                   TEST_FLAGS_WALKING | TEST_FLAGS_TALKING);
+
+  strv = g_strsplit ("speaking,laughing", ",", 0);
+  g_settings_set_strv (direct, "f-test", (const gchar **) strv);
+  g_strfreev (strv);
+
+  strv = g_settings_get_strv (direct, "f-test");
+  str = g_strjoinv (",", strv);
+  g_assert_cmpstr (str, ==, "speaking,laughing");
+  g_strfreev (strv);
+  g_free (str);
+
+  strv = g_settings_get_strv (settings, "f-test");
+  str = g_strjoinv (",", strv);
+  g_assert_cmpstr (str, ==, "talking,laughing");
+  g_strfreev (strv);
+  g_free (str);
+
+  g_assert_cmpint (g_settings_get_flags (settings, "f-test"), ==,
+                   TEST_FLAGS_TALKING | TEST_FLAGS_LAUGHING);
+}
+
+static void
+test_range_high (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.range");
+  g_settings_set_int (settings, "val", 45);
+  g_assert_not_reached ();
+}
+
+static void
+test_range_low (void)
+{
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test.range");
+  g_settings_set_int (settings, "val", 1);
+  g_assert_not_reached ();
+}
+
+static void
+test_range (void)
+{
+  GSettings *settings, *direct;
+  GVariant *value;
+
+  settings = g_settings_new ("org.gtk.test.range");
+  direct = g_settings_new ("org.gtk.test.range.direct");
+
+  if (g_test_undefined () && !backend_set)
+    {
+      g_test_trap_subprocess ("/gsettings/range/subprocess/high", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
+
+      g_test_trap_subprocess ("/gsettings/range/subprocess/low", 0, 0);
+      g_test_trap_assert_failed ();
+      g_test_trap_assert_stderr ("*g_settings_set_value*valid range*");
+    }
+
+  g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33);
+  g_settings_set_int (direct, "val", 22);
+  g_assert_cmpint (g_settings_get_int (direct, "val"), ==, 22);
+  g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 22);
+  g_settings_set_int (direct, "val", 45);
+  g_assert_cmpint (g_settings_get_int (direct, "val"), ==, 45);
+  g_assert_cmpint (g_settings_get_int (settings, "val"), ==, 33);
+  g_settings_set_int (direct, "val", 1);
+  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);
+  value = g_variant_new_int32 (33);
+  g_assert (g_settings_range_check (settings, "val", value));
+  g_variant_unref (value);
+  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
+strv_has_string (gchar       **haystack,
+                 const gchar  *needle)
+{
+  guint n;
+
+  for (n = 0; haystack != NULL && haystack[n] != NULL; n++)
+    {
+      if (g_strcmp0 (haystack[n], needle) == 0)
+        return TRUE;
+    }
+  return FALSE;
+}
+
+static gboolean
+strv_set_equal (gchar **strv, ...)
+{
+  gint count;
+  va_list list;
+  const gchar *str;
+  gboolean res;
+
+  res = TRUE;
+  count = 0;
+  va_start (list, strv);
+  while (1)
+    {
+      str = va_arg (list, const gchar *);
+      if (str == NULL)
+        break;
+      if (!strv_has_string (strv, str))
+        {
+          res = FALSE;
+          break;
+        }
+      count++;
+    }
+  va_end (list);
+
+  if (res)
+    res = g_strv_length ((gchar**)strv) == count;
+
+  return res;
+}
+
+static void
+test_list_items (void)
+{
+  GSettings *settings;
+  gchar **children;
+  gchar **keys;
+
+  settings = g_settings_new ("org.gtk.test");
+  children = g_settings_list_children (settings);
+  keys = g_settings_list_keys (settings);
+
+  g_assert (strv_set_equal (children, "basic-types", "complex-types", "localized", NULL));
+  g_assert (strv_set_equal (keys, "greeting", "farewell", NULL));
+
+  g_strfreev (children);
+  g_strfreev (keys);
+
+  g_object_unref (settings);
+}
+
+static void
+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",
+                            "org.gtk.test.extends.base",
+                            "org.gtk.test.extends.extended",
+                            NULL));
+
+  g_assert (strv_set_equal ((gchar **)schemas,
+                            "org.gtk.test",
+                            "org.gtk.test.basic-types",
+                            "org.gtk.test.complex-types",
+                            "org.gtk.test.localized",
+                            "org.gtk.test.binding",
+                            "org.gtk.test.enums",
+                            "org.gtk.test.enums.direct",
+                            "org.gtk.test.range",
+                            "org.gtk.test.range.direct",
+                            "org.gtk.test.mapped",
+                            "org.gtk.test.descriptions",
+                            NULL));
+}
+
+static gboolean
+map_func (GVariant *value,
+          gpointer *result,
+          gpointer  user_data)
+{
+  gint *state = user_data;
+  gint v;
+
+  if (value)
+    v = g_variant_get_int32 (value);
+  else
+    v = -1;
+
+  if (*state == 0)
+    {
+      g_assert_cmpint (v, ==, 1);
+      (*state)++;
+      return FALSE;
+    }
+  else if (*state == 1)
+    {
+      g_assert_cmpint (v, ==, 0);
+      (*state)++;
+      return FALSE;
+    }
+  else
+    {
+      g_assert (value == NULL);
+      *result = g_variant_new_int32 (5);
+      return TRUE;
+    }
+}
+
+static void
+test_get_mapped (void)
+{
+  GSettings *settings;
+  gint state;
+  gpointer p;
+  gint val;
+
+  settings = g_settings_new ("org.gtk.test.mapped");
+  g_settings_set_int (settings, "val", 1);
+
+  state = 0;
+  p = g_settings_get_mapped (settings, "val", map_func, &state);
+  val = g_variant_get_int32 ((GVariant*)p);
+  g_assert_cmpint (val, ==, 5);
+
+  g_variant_unref (p);
+  g_object_unref (settings);
+}
+
+static void
+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)>)");
+  g_object_unref (settings);
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  range = g_settings_get_range (settings, "test");
+  check_and_free (range, "('enum', <['foo', 'bar', 'baz', 'quux']>)");
+  g_object_unref (settings);
+
+  settings = g_settings_new ("org.gtk.test.enums");
+  range = g_settings_get_range (settings, "f-test");
+  check_and_free (range, "('flags', "
+                  "<['mourning', 'laughing', 'talking', 'walking']>)");
+  g_object_unref (settings);
+
+  settings = g_settings_new ("org.gtk.test");
+  range = g_settings_get_range (settings, "greeting");
+  check_and_free (range, "('type', <@as []>)");
+  g_object_unref (settings);
+G_GNUC_END_IGNORE_DEPRECATIONS
+}
+
+static void
+test_schema_source (void)
+{
+  GSettingsSchemaSource *parent;
+  GSettingsSchemaSource *source;
+  GSettingsBackend *backend;
+  GSettingsSchema *schema;
+  GError *error = NULL;
+  GSettings *settings;
+  gboolean enabled;
+
+  backend = g_settings_backend_get_default ();
+
+  /* make sure it fails properly */
+  parent = g_settings_schema_source_get_default ();
+  source = g_settings_schema_source_new_from_directory ("/path/that/does/not/exist", parent,  TRUE, &error);
+  g_assert (source == NULL);
+  g_assert_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT);
+  g_clear_error (&error);
+
+  /* create a source with the parent */
+  source = g_settings_schema_source_new_from_directory ("schema-source", parent, TRUE, &error);
+  g_assert_no_error (error);
+  g_assert (source != NULL);
+
+  /* check recursive lookups are working */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.test", TRUE);
+  g_assert (schema != NULL);
+  g_settings_schema_unref (schema);
+
+  /* check recursive lookups for non-existent schemas */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.doesnotexist", TRUE);
+  g_assert (schema == NULL);
+
+  /* check non-recursive for schema that only exists in lower layers */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.test", FALSE);
+  g_assert (schema == NULL);
+
+  /* check non-recursive lookup for non-existent */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.doesnotexist", FALSE);
+  g_assert (schema == NULL);
+
+  /* check non-recursive for schema that exists in toplevel */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.schemasourcecheck", FALSE);
+  g_assert (schema != NULL);
+  g_settings_schema_unref (schema);
+
+  /* check recursive for schema that exists in toplevel */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.schemasourcecheck", TRUE);
+  g_assert (schema != NULL);
+
+  /* try to use it for something */
+  settings = g_settings_new_full (schema, backend, g_settings_schema_get_path (schema));
+  g_settings_schema_unref (schema);
+  enabled = FALSE;
+  g_settings_get (settings, "enabled", "b", &enabled);
+  g_assert (enabled);
+  g_object_unref (settings);
+
+  g_settings_schema_source_unref (source);
+
+  /* try again, but with no parent */
+  source = g_settings_schema_source_new_from_directory ("schema-source", NULL, FALSE, NULL);
+  g_assert (source != NULL);
+
+  /* should not find it this time, even if recursive... */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.test", FALSE);
+  g_assert (schema == NULL);
+  schema = g_settings_schema_source_lookup (source, "org.gtk.test", TRUE);
+  g_assert (schema == NULL);
+
+  /* should still find our own... */
+  schema = g_settings_schema_source_lookup (source, "org.gtk.schemasourcecheck", TRUE);
+  g_assert (schema != NULL);
+  g_settings_schema_unref (schema);
+  schema = g_settings_schema_source_lookup (source, "org.gtk.schemasourcecheck", FALSE);
+  g_assert (schema != NULL);
+  g_settings_schema_unref (schema);
+
+  g_settings_schema_source_unref (source);
+}
+
+static void
+test_actions (void)
+{
+  GAction *string, *toggle;
+  gboolean c1, c2, c3;
+  GSettings *settings;
+  gchar *name;
+  GVariantType *param_type;
+  gboolean enabled;
+  GVariantType *state_type;
+  GVariant *state;
+
+  settings = g_settings_new ("org.gtk.test.basic-types");
+  string = g_settings_create_action (settings, "test-string");
+  toggle = g_settings_create_action (settings, "test-boolean");
+  g_object_unref (settings); /* should be held by the actions */
+
+  g_signal_connect (settings, "changed", G_CALLBACK (changed_cb2), &c1);
+  g_signal_connect (string, "notify::state", G_CALLBACK (changed_cb2), &c2);
+  g_signal_connect (toggle, "notify::state", G_CALLBACK (changed_cb2), &c3);
+
+  c1 = c2 = c3 = FALSE;
+  g_settings_set_string (settings, "test-string", "hello world");
+  check_and_free (g_action_get_state (string), "'hello world'");
+  g_assert (c1 && c2 && !c3);
+  c1 = c2 = c3 = FALSE;
+
+  g_action_activate (string, g_variant_new_string ("hihi"));
+  check_and_free (g_settings_get_value (settings, "test-string"), "'hihi'");
+  g_assert (c1 && c2 && !c3);
+  c1 = c2 = c3 = FALSE;
+
+  g_action_change_state (string, g_variant_new_string ("kthxbye"));
+  check_and_free (g_settings_get_value (settings, "test-string"), "'kthxbye'");
+  g_assert (c1 && c2 && !c3);
+  c1 = c2 = c3 = FALSE;
+
+  g_action_change_state (toggle, g_variant_new_boolean (TRUE));
+  g_assert (g_settings_get_boolean (settings, "test-boolean"));
+  g_assert (c1 && !c2 && c3);
+  c1 = c2 = c3 = FALSE;
+
+  g_action_activate (toggle, NULL);
+  g_assert (!g_settings_get_boolean (settings, "test-boolean"));
+  g_assert (c1 && !c2 && c3);
+
+  g_object_get (string,
+                "name", &name,
+                "parameter-type", &param_type,
+                "enabled", &enabled,
+                "state-type", &state_type,
+                "state", &state,
+                NULL);
+
+  g_assert_cmpstr (name, ==, "test-string");
+  g_assert (g_variant_type_equal (param_type, G_VARIANT_TYPE_STRING));
+  g_assert (enabled);
+  g_assert (g_variant_type_equal (state_type, G_VARIANT_TYPE_STRING));
+  g_assert_cmpstr (g_variant_get_string (state, NULL), ==, "kthxbye");
+
+  g_free (name);
+  g_variant_unref (state);
+
+  g_object_unref (string);
+  g_object_unref (toggle);
+}
+
+static void
+test_null_backend (void)
+{
+  GSettingsBackend *backend;
+  GSettings *settings;
+  gchar *str;
+  gboolean writable;
+
+  backend = g_null_settings_backend_new ();
+  settings = g_settings_new_with_backend_and_path ("org.gtk.test", backend, "/tests/");
+
+  g_object_get (settings, "schema-id", &str, NULL);
+  g_assert_cmpstr (str, ==, "org.gtk.test");
+  g_free (str);
+
+  g_settings_get (settings, "greeting", "s", &str);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
+  g_settings_set (settings, "greeting", "s", "goodbye world");
+  g_settings_get (settings, "greeting", "s", &str);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_free (str);
+
+  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);
+}
+
+static void
+test_memory_backend (void)
+{
+  GSettingsBackend *backend;
+
+  backend = g_memory_settings_backend_new ();
+  g_assert (G_IS_SETTINGS_BACKEND (backend));
+  g_object_unref (backend);
+}
+
+static void
+test_read_descriptions (void)
+{
+  GSettingsSchema *schema;
+  GSettingsSchemaKey *key;
+  GSettings *settings;
+
+  settings = g_settings_new ("org.gtk.test");
+  g_object_get (settings, "settings-schema", &schema, NULL);
+  key = g_settings_schema_get_key (schema, "greeting");
+
+  g_assert_cmpstr (g_settings_schema_key_get_summary (key), ==, "A greeting");
+  g_assert_cmpstr (g_settings_schema_key_get_description (key), ==, "Greeting of the invading martians");
+
+  g_settings_schema_key_unref (key);
+  g_settings_schema_unref (schema);
+
+  g_object_unref (settings);
+
+  settings = g_settings_new ("org.gtk.test.descriptions");
+  g_object_get (settings, "settings-schema", &schema, NULL);
+  key = g_settings_schema_get_key (schema, "a");
+
+  g_assert_cmpstr (g_settings_schema_key_get_summary (key), ==,
+                   "a paragraph.\n\n"
+                   "with some whitespace.\n\n"
+                   "because not everyone has a great editor.\n\n"
+                   "lots of space is as one.");
+
+  g_settings_schema_key_unref (key);
+  g_settings_schema_unref (schema);
+
+  g_object_unref (settings);
+}
+
+static void
+test_default_value (void)
+{
+  GSettings *settings;
+  GSettingsSchema *schema;
+  GSettingsSchemaKey *key;
+  GVariant *v;
+  const gchar *str;
+  gchar *s;
+
+  settings = g_settings_new ("org.gtk.test");
+  g_object_get (settings, "settings-schema", &schema, NULL);
+  key = g_settings_schema_get_key (schema, "greeting");
+  g_settings_schema_unref (schema);
+  g_settings_schema_key_ref (key);
+
+  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);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_variant_unref (v);
+
+  g_settings_schema_key_unref (key);
+  g_settings_schema_key_unref (key);
+
+  g_settings_set (settings, "greeting", "s", "goodbye world");
+
+  v = g_settings_get_user_value (settings, "greeting");
+  str = g_variant_get_string (v, NULL);
+  g_assert_cmpstr (str, ==, "goodbye world");
+  g_variant_unref (v);
+
+  v = g_settings_get_default_value (settings, "greeting");
+  str = g_variant_get_string (v, NULL);
+  g_assert_cmpstr (str, ==, "Hello, earthlings");
+  g_variant_unref (v);
+
+  g_settings_reset (settings, "greeting");
+
+  v = g_settings_get_user_value (settings, "greeting");
+  g_assert_null (v);
+
+  s = g_settings_get_string (settings, "greeting");
+  g_assert_cmpstr (s, ==, "Hello, earthlings");
+  g_free (s);
+
+  g_object_unref (settings);
+}
+
+static void
+test_extended_schema (void)
+{
+  GSettings *settings;
+  gchar **keys;
+
+  settings = g_settings_new_with_path ("org.gtk.test.extends.extended", "/test/extendes/");
+  keys = g_settings_list_keys (settings);
+  g_assert (strv_set_equal (keys, "int32", "string", "another-int32", NULL));
+  g_strfreev (keys);
+  g_object_unref (settings);
+}
+
+int
+main (int argc, char *argv[])
+{
+  gchar *schema_text;
+  gchar *enums;
+  gint result;
+
+  setlocale (LC_ALL, "");
+
+  g_test_init (&argc, &argv, NULL);
+
+  if (!g_test_subprocess ())
+    {
+      backend_set = g_getenv ("GSETTINGS_BACKEND") != NULL;
+
+      g_setenv ("XDG_DATA_DIRS", ".", TRUE);
+      g_setenv ("GSETTINGS_SCHEMA_DIR", ".", TRUE);
+
+      if (!backend_set)
+        g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
+
+      g_remove ("org.gtk.test.enums.xml");
+      g_assert (g_spawn_command_line_sync ("../../gobject/glib-mkenums "
+                                           "--template " SRCDIR "/enums.xml.template "
+                                           SRCDIR "/testenum.h",
+                                           &enums, NULL, &result, NULL));
+      g_assert (result == 0);
+      g_assert (g_file_set_contents ("org.gtk.test.enums.xml", enums, -1, NULL));
+      g_free (enums);
+
+      g_assert (g_file_get_contents (SRCDIR "/org.gtk.test.gschema.xml.orig", &schema_text, NULL, NULL));
+      g_assert (g_file_set_contents ("org.gtk.test.gschema.xml", schema_text, -1, NULL));
+
+      g_remove ("gschemas.compiled");
+      g_assert (g_spawn_command_line_sync ("../glib-compile-schemas --targetdir=. "
+                                           "--schema-file=org.gtk.test.enums.xml "
+                                           "--schema-file=org.gtk.test.gschema.xml",
+                                           NULL, NULL, &result, NULL));
+      g_assert (result == 0);
+
+      g_remove ("schema-source/gschemas.compiled");
+      g_mkdir ("schema-source", 0777);
+      g_assert (g_spawn_command_line_sync ("../glib-compile-schemas --targetdir=schema-source "
+                                           "--schema-file=" SRCDIR "/org.gtk.schemasourcecheck.gschema.xml",
+                                           NULL, NULL, &result, NULL));
+      g_assert (result == 0);
+   }
+
+  g_test_add_func ("/gsettings/basic", test_basic);
+
+  if (!backend_set)
+    {
+      g_test_add_func ("/gsettings/no-schema", test_no_schema);
+      g_test_add_func ("/gsettings/unknown-key", test_unknown_key);
+      g_test_add_func ("/gsettings/wrong-type", test_wrong_type);
+      g_test_add_func ("/gsettings/wrong-path", test_wrong_path);
+      g_test_add_func ("/gsettings/no-path", test_no_path);
+    }
 
-  g_test_add_func ("/gsettings/basic", test_basic);
-  g_test_add_func ("/gsettings/no-schema", test_no_schema);
-  g_test_add_func ("/gsettings/unknown-key", test_unknown_key);
-  g_test_add_func ("/gsettings/wrong-type", test_wrong_type);
   g_test_add_func ("/gsettings/basic-types", test_basic_types);
   g_test_add_func ("/gsettings/complex-types", test_complex_types);
   g_test_add_func ("/gsettings/changes", test_changes);
+
   g_test_add_func ("/gsettings/l10n", test_l10n);
   g_test_add_func ("/gsettings/l10n-context", test_l10n_context);
+
   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);
   g_test_add_func ("/gsettings/directional-binding", test_directional_binding);
-  g_test_add_func ("/gsettings/typesafe-binding", test_typesafe_binding);
   g_test_add_func ("/gsettings/custom-binding", test_custom_binding);
   g_test_add_func ("/gsettings/no-change-binding", test_no_change_binding);
-  g_test_add_func ("/gsettings/keyfile", test_keyfile);
+  g_test_add_func ("/gsettings/unbinding", test_unbind);
+  g_test_add_func ("/gsettings/writable-binding", test_bind_writable);
+
+  if (!backend_set)
+    {
+      g_test_add_func ("/gsettings/typesafe-binding", test_typesafe_binding);
+      g_test_add_func ("/gsettings/no-read-binding", test_no_read_binding);
+      g_test_add_func ("/gsettings/no-read-binding/subprocess/fail", test_no_read_binding_fail);
+      g_test_add_func ("/gsettings/no-read-binding/subprocess/pass", test_no_read_binding_pass);
+      g_test_add_func ("/gsettings/no-write-binding", test_no_write_binding);
+      g_test_add_func ("/gsettings/no-write-binding/subprocess/fail", test_no_write_binding_fail);
+      g_test_add_func ("/gsettings/no-write-binding/subprocess/pass", test_no_write_binding_pass);
+    }
 
-  return g_test_run ();
+  g_test_add_func ("/gsettings/keyfile", test_keyfile);
+  g_test_add_func ("/gsettings/child-schema", test_child_schema);
+  g_test_add_func ("/gsettings/strinfo", test_strinfo);
+  g_test_add_func ("/gsettings/enums", test_enums);
+  g_test_add_func ("/gsettings/enums/subprocess/non-enum-key", test_enums_non_enum_key);
+  g_test_add_func ("/gsettings/enums/subprocess/non-enum-value", test_enums_non_enum_value);
+  g_test_add_func ("/gsettings/enums/subprocess/range", test_enums_range);
+  g_test_add_func ("/gsettings/enums/subprocess/non-flags", test_enums_non_flags);
+  g_test_add_func ("/gsettings/flags", test_flags);
+  g_test_add_func ("/gsettings/flags/subprocess/non-flags-key", test_flags_non_flags_key);
+  g_test_add_func ("/gsettings/flags/subprocess/non-flags-value", test_flags_non_flags_value);
+  g_test_add_func ("/gsettings/flags/subprocess/range", test_flags_range);
+  g_test_add_func ("/gsettings/flags/subprocess/non-enum", test_flags_non_enum);
+  g_test_add_func ("/gsettings/range", test_range);
+  g_test_add_func ("/gsettings/range/subprocess/high", test_range_high);
+  g_test_add_func ("/gsettings/range/subprocess/low", test_range_low);
+  g_test_add_func ("/gsettings/list-items", test_list_items);
+  g_test_add_func ("/gsettings/list-schemas", test_list_schemas);
+  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/actions", test_actions);
+  g_test_add_func ("/gsettings/null-backend", test_null_backend);
+  g_test_add_func ("/gsettings/memory-backend", test_memory_backend);
+  g_test_add_func ("/gsettings/read-descriptions", test_read_descriptions);
+  g_test_add_func ("/gsettings/test-extended-schema", test_extended_schema);
+  g_test_add_func ("/gsettings/default-value", test_default_value);
+
+  result = g_test_run ();
+
+  g_settings_sync ();
+
+  return result;
 }