Merge lp:~compiz-team/compiz/compiz.gsettings_conformance_test into lp:compiz/0.9.8

[Sam Spilsbury]

Instantiate the GSettings backend in a test harness and run the conformance tests on it.

This is not actually needing review, I've just got it marked as Needs Review so that the CI bot will run tests on it.

[Sam Spilsbury (smspillaz)]

CI doesn't seem to care ... WIP ...

Unmerged revisions

=== modified file 'compizconfig/compizconfig-python/tests/compiz_config_test.py'
--- compizconfig/compizconfig-python/tests/compiz_config_test.py	2012-07-07 05:53:00 +0000
+++ compizconfig/compizconfig-python/tests/compiz_config_test.py	2012-08-07 01:05:25 +0000
@@ -5,10 +5,13 @@
 arch = subprocess.Popen (["uname", "-p"], stdout=subprocess.PIPE).communicate ()[0][:-1]
 
 os.environ["COMPIZ_METADATA_PATH"] = "generated/"
+os.environ["COMPIZ_CONFIG_PROFILE"] = ""
+os.environ["XDG_CONFIG_HOME"] = "compizconfig/libcompizconfig/config"
 os.environ["LIBCOMPIZCONFIG_BACKEND_PATH"] = "compizconfig/libcompizconfig/backend/"
 os.environ["XDG_DATA_DIRS"] = "generated/"
 
-sys.path.append ("compizconfig/compizconfig-python/build/lib.linux-" + arch + "-" + str (sys.version_info[0]) + "." + str (sys.version_info[1]) + "/")
+# TODO: does this really work ?
+sys.path[0] = "compizconfig/compizconfig-python/build/lib.linux-" + arch + "-" + str (sys.version_info[0]) + "." + str (sys.version_info[1]) + "/"
 
 import unittest
 import compizconfig

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-08-07 01:05:24 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-08-07 01:05:25 +0000
@@ -944,13 +944,21 @@
     const char *item;
 } FindItemInVariantData;
 
+typedef struct _InsertIfNotEqualData
+{
+    gboolean   skipped;
+    const char *item;
+} InsertIfNotEqualData;
+
 static void
 insertIfNotEqual (GVariantBuilder *builder, const char *item, void *userData)
 {
-    const char *cmp = (const char *) userData;
+    InsertIfNotEqualData *data = (InsertIfNotEqualData *) userData;
 
-    if (g_strcmp0 (item, cmp))
+    if (g_strcmp0 (item, data->item))
 	g_variant_builder_add (builder, "s", item);
+    else
+	data->skipped = TRUE;
 }
 
 static void
@@ -1003,18 +1011,25 @@
     return !findItemData.found;
 }
 
-void
-removeItemFromVariant (GVariant	  **variant,
-		       const char *string)
+gboolean removeItemFromVariant (GVariant   **variant,
+				const char *string)
 {
     GVariantBuilder newVariantBuilder;
 
+    InsertIfNotEqualData data =
+    {
+	FALSE,
+	string
+    };
+
     g_variant_builder_init (&newVariantBuilder, G_VARIANT_TYPE ("as"));
 
-    rebuildVariant (&newVariantBuilder, *variant, insertIfNotEqual, (void *) string);
+    rebuildVariant (&newVariantBuilder, *variant, insertIfNotEqual, (void *) &data);
 
     g_variant_unref (*variant);
     *variant = g_variant_builder_end (&newVariantBuilder);
+
+    return data.skipped;
 }
 
 void
@@ -1109,6 +1124,7 @@
     GVariant        *plugins;
     GVariant        *profiles;
     const char      *currentProfile = ccsGSettingsBackendGetCurrentProfile (backend);
+    gboolean        ret = FALSE;
 
     plugins = ccsGSettingsBackendGetPluginsWithSetKeys (backend);
     profiles = ccsGSettingsBackendGetExistingProfiles (backend);
@@ -1116,18 +1132,17 @@
     ccsGSettingsBackendUnsetAllChangedPluginKeysInProfile (backend, context, plugins, currentProfile);
     ccsGSettingsBackendClearPluginsWithSetKeys (backend);
 
-    removeItemFromVariant (&profiles, profile);
+    ret = removeItemFromVariant (&profiles, profile);
 
     /* Remove the profile from existing-profiles */
     ccsGSettingsBackendSetExistingProfiles (backend, profiles);
-
     ccsGSettingsBackendUpdateProfile (backend, context);
 
     /* Since we do not call g_settings_set_value on
      * plugins, we must also unref the variant */
     g_variant_unref (plugins);
 
-    return TRUE;
+    return ret;
 }
 
 void

=== modified file 'compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h'
--- compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-08-07 01:05:24 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-08-07 01:05:25 +0000
@@ -203,9 +203,8 @@
 appendStringToVariantIfUnique (GVariant	  **variant,
 			       const char *string);
 
-void
-removeItemFromVariant (GVariant	  **variant,
-		       const char *string);
+gboolean removeItemFromVariant (GVariant	  **variant,
+				const char *string);
 
 CCSSettingValueList
 readBoolListValue (GVariantIter *iter, guint nItems, CCSSetting *setting, CCSObjectAllocationInterface *allocator);

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2012-08-07 01:05:24 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-08-07 01:05:25 +0000
@@ -776,6 +776,9 @@
 
     CCSGSettingsBackendPrivate *priv = (CCSGSettingsBackendPrivate *) ccsObjectGetPrivate (backend);
 
+    /* Update the current profile in case it was changed compizconfig side */
+    ccsGSettingsBackendUpdateProfile (backend, context);
+
     value = ccsGSettingsWrapperGetValue (priv->compizconfigSettings,  "existing-profiles");
     g_variant_iter_init (&iter, value);
     while (g_variant_iter_loop (&iter, "s", &profile))

=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
--- compizconfig/gsettings/tests/CMakeLists.txt	2012-08-07 01:05:24 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2012-08-07 01:05:25 +0000
@@ -10,6 +10,8 @@
 
 pkg_check_modules (COMPIZCONFIG_TEST_GSETTINGS libcompizconfig)
 
+link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+
 add_library (compizconfig_ccs_gsettings_wrapper_mock STATIC
 	     ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.cpp
 	     ${CMAKE_CURRENT_SOURCE_DIR}/ccs_gsettings_wrapper_mock.h)
@@ -24,7 +26,8 @@
 		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings.cpp
 		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings_tests.h)
 
-link_directories (${CMAKE_CURRENT_BINARY_DIR}/../../libcompizconfig/tests)
+add_executable (compizconfig_test_gsettings_conformance
+		${CMAKE_CURRENT_SOURCE_DIR}/test_gsettings_conformance.cpp)
 
 target_link_libraries (compizconfig_test_gsettings
 		       gsettings_backend_shared
@@ -37,6 +40,9 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_MAIN_LIBRARY})
 
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gsettings-mock-schemas-config.h.in
+		${CMAKE_CURRENT_BINARY_DIR}/gsettings-mock-schemas-config.h)
+
 add_custom_command (OUTPUT ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.mock.gschema.xml
 		    COMMAND cp -r ${CMAKE_CURRENT_SOURCE_DIR}/org.compiz.mock.gschema.xml ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/org.compiz.mock.gschema.xml
 		    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.compiz.mock.gschema.xml
@@ -47,7 +53,17 @@
 
 add_gsettings_schema_to_recompilation_list (compiz_gsettings_mock_schema)
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gsettings-mock-schemas-config.h.in
-		${CMAKE_CURRENT_BINARY_DIR}/gsettings-mock-schemas-config.h)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/backend-conformance-config.h.in
+		${CMAKE_CURRENT_BINARY_DIR}/backend-conformance-config.h)
+
+target_link_libraries (compizconfig_test_gsettings_conformance
+		       gsettings_backend_shared
+		       compizconfig_ccs_setting_mock
+		       compizconfig_ccs_plugin_mock
+		       compizconfig_ccs_context_mock
+		       ${COMPIZCONFIG_TEST_GSETTINGS_LIBRARIES}
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_MAIN_LIBRARY})
 
 compiz_discover_tests (compizconfig_test_gsettings COVERAGE gsettings_backend_shared)
+compiz_discover_tests (compizconfig_test_gsettings_conformance COVERAGE gsettings_backend_shared gsettings)

=== added file 'compizconfig/gsettings/tests/backend-conformance-config.h.in'
--- compizconfig/gsettings/tests/backend-conformance-config.h.in	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/backend-conformance-config.h.in	2012-08-07 01:05:25 +0000
@@ -0,0 +1,1 @@
+#define BACKEND_BINARY_PATH "@CMAKE_BINARY_DIR@/compizconfig/gsettings"

=== added file 'compizconfig/gsettings/tests/org.compiz.mock.gschema.xml'
--- compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	2012-08-07 01:05:25 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<schemalist>
+  <schema id="org.compiz.mock" gettext-domain="compiz">
+    <key type="i" name="integer-setting">
+      <default>0</default>
+    </key>
+    <key type="b" name="boolean-setting">
+      <default>false</default>
+    </key>
+    <key type="d" name="float-setting">
+      <default>0.0</default>
+    </key>
+    <key type="s" name="string-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="match-setting">
+      <default>""</default>
+    </key>
+    <key type="b" name="bell-setting">
+      <default>false</default>
+    </key>
+    <key type="s" name="color-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="key-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="button-setting">
+      <default>""</default>
+    </key>
+    <key type="s" name="edge-setting">
+      <default>""</default>
+    </key>
+    <key type="ai" name="int-list-setting">
+      <default>[0]</default>
+    </key>
+    <key type="ad" name="float-list-setting">
+      <default>[0.0]</default>
+    </key>
+    <key type="ab" name="bool-list-setting">
+      <default>[true]</default>
+    </key>
+    <key type="as" name="string-list-setting">
+      <default>[""]</default>
+    </key>
+    <key type="as" name="match-list-setting">
+      <default>[""]</default>
+    </key>
+    <key type="as" name="color-list-setting">
+      <default>[""]</default>
+    </key>
+  </schema>
+</schemalist>

=== removed file 'compizconfig/gsettings/tests/org.compiz.mock.gschema.xml'
--- compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	2012-08-07 01:05:24 +0000
+++ compizconfig/gsettings/tests/org.compiz.mock.gschema.xml	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<schemalist>
-  <schema id="org.compiz.mock" gettext-domain="compiz">
-    <key type="i" name="integer-setting">
-      <default>0</default>
-    </key>
-    <key type="b" name="boolean-setting">
-      <default>false</default>
-    </key>
-    <key type="d" name="float-setting">
-      <default>0.0</default>
-    </key>
-    <key type="s" name="string-setting">
-      <default>""</default>
-    </key>
-    <key type="s" name="match-setting">
-      <default>""</default>
-    </key>
-    <key type="b" name="bell-setting">
-      <default>false</default>
-    </key>
-    <key type="s" name="color-setting">
-      <default>""</default>
-    </key>
-    <key type="s" name="key-setting">
-      <default>""</default>
-    </key>
-    <key type="s" name="button-setting">
-      <default>""</default>
-    </key>
-    <key type="s" name="edge-setting">
-      <default>""</default>
-    </key>
-    <key type="ai" name="int-list-setting">
-      <default>[0]</default>
-    </key>
-    <key type="ad" name="float-list-setting">
-      <default>[0.0]</default>
-    </key>
-    <key type="ab" name="bool-list-setting">
-      <default>[true]</default>
-    </key>
-    <key type="as" name="string-list-setting">
-      <default>[""]</default>
-    </key>
-    <key type="as" name="match-list-setting">
-      <default>[""]</default>
-    </key>
-    <key type="as" name="color-list-setting">
-      <default>[""]</default>
-    </key>
-  </schema>
-</schemalist>

=== added file 'compizconfig/gsettings/tests/test_gsettings_conformance.cpp'
--- compizconfig/gsettings/tests/test_gsettings_conformance.cpp	1970-01-01 00:00:00 +0000
+++ compizconfig/gsettings/tests/test_gsettings_conformance.cpp	2012-08-07 01:05:25 +0000
@@ -0,0 +1,548 @@
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <gsettings_util.h>
+
+#include <gio/gio.h>
+
+#include "backend-conformance-config.h"
+#include "gsettings-mock-schemas-config.h"
+
+#include <ccs.h>
+#include <compizconfig_backend_concept_test.h>
+
+#include <iostream>
+
+using ::testing::AtLeast;
+using ::testing::Pointee;
+using ::testing::ReturnNull;
+
+namespace
+{
+    template <typename T>
+    class AutoDestroyHelper
+    {
+	public:
+
+	    typedef void (*SimpleDestructor) (T *);
+	    typedef boost::shared_ptr <T> TPtr;
+
+	    AutoDestroyHelper (T *t,
+			       SimpleDestructor d) :
+		mShared (t, boost::bind (d, _1))
+	    {
+	    }
+
+	    operator const TPtr & ()
+	    {
+		return mShared;
+	    }
+
+	private:
+
+	    TPtr mShared;
+    };
+}
+
+class CCSGSettingsBackendEnv :
+    public CCSBackendConceptTestEnvironmentInterface
+{
+    public:
+
+	typedef boost::shared_ptr <GVariant> GVariantShared;
+
+	CCSGSettingsBackendEnv () :
+	    pluginToMatch ("mock")
+	{
+	    g_type_init ();
+	}
+
+	/* A wrapper to prevent signals from being added */
+	static void connectToSignalWrapper (CCSBackend *backend, CCSGSettingsWrapper *wrapper)
+	{
+	};
+
+	static void registerGConfClientWrapper (CCSBackend *backend)
+	{
+	}
+
+	static void unregisterGConfClientWrapper (CCSBackend *backend)
+	{
+	}
+
+	const CCSBackendInfo * GetInfo ()
+	{
+	    return &gsettingsBackendInfo;
+	}
+
+	CCSBackend * SetUp (CCSContext *context, CCSContextGMock *gmockContext)
+	{
+	    CCSGSettingsBackendInterface *overloadedInterface = NULL;
+
+	    g_setenv ("GSETTINGS_SCHEMA_DIR", MOCK_PATH.c_str (), true);
+	    g_setenv ("GSETTINGS_BACKEND", "memory", true);
+	    g_setenv ("LIBCOMPIZCONFIG_BACKEND_PATH", BACKEND_BINARY_PATH, true);
+
+	    mContext = context;
+
+	    std::string path ("gsettings");
+
+	    mBackend = reinterpret_cast <CCSDynamicBackend *> (ccsOpenBackend (&ccsDefaultInterfaceTable, mContext, path.c_str ()));
+
+	    EXPECT_TRUE (mBackend);
+
+	    mGSettingsBackend = ccsDynamicBackendGetRawBackend (mBackend);
+
+	    CCSBackendInitFunc backendInit = (GET_INTERFACE (CCSBackendInterface, mBackend))->backendInit;
+
+	    if (backendInit)
+		(*backendInit) ((CCSBackend *) mBackend, mContext);
+
+	    overloadedInterface = GET_INTERFACE (CCSGSettingsBackendInterface, mGSettingsBackend);
+	    overloadedInterface->gsettingsBackendConnectToChangedSignal = CCSGSettingsBackendEnv::connectToSignalWrapper;
+	    overloadedInterface->gsettingsBackendRegisterGConfClient = CCSGSettingsBackendEnv::registerGConfClientWrapper;
+	    overloadedInterface->gsettingsBackendUnregisterGConfClient = CCSGSettingsBackendEnv::unregisterGConfClientWrapper;
+
+	    mSettings = ccsGSettingsGetSettingsObjectForPluginWithPath (mGSettingsBackend, "mock",
+									CharacterWrapper (makeCompizPluginPath (profileName.c_str (), "mock")),
+									mContext);
+
+	    ON_CALL (*gmockContext, getProfile ()).WillByDefault (Return (profileName.c_str ()));
+
+	    return (CCSBackend *) mBackend;
+	}
+
+	void TearDown (CCSBackend *)
+	{
+	    g_unsetenv ("GSETTINGS_SCHEMA_DIR");
+	    g_unsetenv ("GSETTINGS_BACKEND");
+	    g_unsetenv ("LIBCOMPIZCONFIG_BACKEND_PATH");
+
+	    GVariantBuilder noProfilesBuilder;
+	    g_variant_builder_init (&noProfilesBuilder, G_VARIANT_TYPE ("as"));
+	    g_variant_builder_add (&noProfilesBuilder, "s", "Default");
+	    GVariant *noProfiles = g_variant_builder_end (&noProfilesBuilder);
+
+	    GVariantBuilder pluginKeysBuilder;
+	    g_variant_builder_init (&pluginKeysBuilder, G_VARIANT_TYPE ("as"));
+	    g_variant_builder_add (&pluginKeysBuilder, "s", "mock");
+	    GVariant *pluginKeys = g_variant_builder_end (&pluginKeysBuilder);
+
+	    ccsGSettingsBackendUnsetAllChangedPluginKeysInProfile (mGSettingsBackend,
+								   mContext,
+								   pluginKeys,
+								   ccsGSettingsBackendGetCurrentProfile (
+								       mGSettingsBackend));
+	    ccsGSettingsBackendClearPluginsWithSetKeys (mGSettingsBackend);
+	    ccsGSettingsBackendSetExistingProfiles (mGSettingsBackend, noProfiles);
+	    ccsGSettingsBackendSetCurrentProfile (mGSettingsBackend, "Default");
+
+	    ccsFreeDynamicBackend (mBackend);
+
+	    g_variant_unref (pluginKeys);
+	}
+
+	void AddProfile (const std::string &profile)
+	{
+	    ccsGSettingsBackendAddProfile (mGSettingsBackend, profile.c_str ());
+	}
+
+	void SetGetExistingProfilesExpectation (CCSContext *context,
+						CCSContextGMock *gmockContext)
+	{
+	    EXPECT_CALL (*gmockContext, getProfile ()).Times (AtLeast (1));
+	}
+
+	void SetDeleteProfileExpectation (const std::string &profileToDelete,
+					  CCSContext *context,
+					  CCSContextGMock *gmockContext)
+	{
+	    EXPECT_CALL (*gmockContext, getProfile ()).Times (AtLeast (1));
+	}
+
+	void SetReadInitExpectation (CCSContext *context,
+				     CCSContextGMock *gmockContext)
+	{
+	    EXPECT_CALL (*gmockContext, getProfile ()).WillOnce (Return (profileName.c_str ()));
+	}
+
+	void SetReadDoneExpectation (CCSContext *context,
+				     CCSContextGMock *gmockContext)
+	{
+	}
+
+	void SetWriteInitExpectation (CCSContext *context,
+				      CCSContextGMock *gmockContext)
+	{
+	    EXPECT_CALL (*gmockContext, getProfile ()).WillOnce (Return (profileName.c_str ()));
+	}
+
+	void SetWriteDoneExpectation (CCSContext *context,
+				      CCSContextGMock *gmockContext)
+	{
+	}
+
+	void PreWrite (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillRepeatedly (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getIsDefault ()).WillRepeatedly (Return (FALSE));
+
+	    if (type == TypeList)
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+	}
+
+	void PostWrite (CCSContextGMock *gmockContext,
+			CCSPluginGMock  *gmockPlugin,
+			CCSSettingGMock *gmockSetting,
+			CCSSettingType  type) {}
+
+	void WriteBoolAtKey (const std::string &plugin,
+			     const std::string &key,
+			     const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeBoolToVariant (boolToBool (boost::get <bool> (value)), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteIntegerAtKey (const std::string &plugin,
+				const std::string &key,
+				const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeIntToVariant (boost::get <int> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteFloatAtKey (const std::string &plugin,
+				      const std::string &key,
+				      const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeFloatToVariant (boost::get <float> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteStringAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeStringToVariant (boost::get <const char *> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteColorAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeColorToVariant (boost::get <CCSSettingColorValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteKeyAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeKeyToVariant (boost::get <CCSSettingKeyValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteButtonAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeButtonToVariant (boost::get <CCSSettingButtonValue> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteEdgeAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeEdgeToVariant (boost::get <unsigned int> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteMatchAtKey (const std::string &plugin,
+				      const std::string &key,
+				      const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeStringToVariant (boost::get <const char *> (value), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteBellAtKey (const std::string &plugin,
+				       const std::string &key,
+				       const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+	    if (writeBoolToVariant (boolToBool (boost::get <bool> (value)), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void WriteListAtKey (const std::string &plugin,
+				     const std::string &key,
+				     const VariantTypes &value)
+	{
+	    GVariant *variant = NULL;
+
+	    const CCSListWrapper::Ptr &lw (boost::get <CCSListWrapper::Ptr> (value));
+
+	    if (writeListValue (*lw, lw->type (), &variant))
+		writeVariantToKey (mSettings, CharacterWrapper (translateKeyForGSettings (key.c_str ())), variant);
+	    else
+		throw std::exception ();
+	}
+
+	void PreRead (CCSContextGMock *gmockContext,
+		      CCSPluginGMock  *gmockPlugin,
+		      CCSSettingGMock *gmockSetting,
+		      CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillOnce (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, isReadOnly ()).WillRepeatedly (Return (FALSE));
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+	    }
+	}
+
+	void PostRead (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type) {}
+
+	Bool ReadBoolAtKey (const std::string &plugin,
+			    const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeBool));
+	    return readBoolFromVariant (variant.get ());
+	}
+
+	int ReadIntegerAtKey (const std::string &plugin,
+					const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeInt));
+	    return readIntFromVariant (variant.get ());
+	}
+
+	float ReadFloatAtKey (const std::string &plugin,
+				      const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeFloat));
+	    return readFloatFromVariant (variant.get ());
+	}
+
+	const char * ReadStringAtKey (const std::string &plugin,
+				      const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeString));
+	    return readStringFromVariant (variant.get ());
+	}
+
+	CCSSettingColorValue ReadColorAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeColor));
+	    CCSSettingColorValue value = readColorFromVariant (variant.get (), &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	CCSSettingKeyValue ReadKeyAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeKey));
+	    CCSSettingKeyValue value = readKeyFromVariant (variant.get (), &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	CCSSettingButtonValue ReadButtonAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    Bool success = FALSE;
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeButton));
+	    CCSSettingButtonValue value = readButtonFromVariant (variant.get (), &success);
+	    EXPECT_TRUE (success);
+	    return value;
+	}
+
+	unsigned int ReadEdgeAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeEdge));
+	    return readEdgeFromVariant (variant.get ());
+	}
+
+	const char * ReadMatchAtKey (const std::string &plugin,
+				     const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeMatch));
+	    return readStringFromVariant (variant.get ());
+	}
+
+	Bool ReadBellAtKey (const std::string &plugin,
+				       const std::string &key)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeBell));
+	    return readBoolFromVariant (variant.get ());
+	}
+
+	CCSSettingValueList ReadListAtKey (const std::string &plugin,
+					   const std::string &key,
+					   CCSSetting        *setting)
+	{
+	    GVariantShared variant (ReadVariantAtKeyToShared (plugin,
+							      key,
+							      TypeList));
+	    return readListValue (variant.get (), setting, &ccsDefaultObjectAllocator);
+	}
+
+	void PreUpdate (CCSContextGMock *gmockContext,
+		      CCSPluginGMock  *gmockPlugin,
+		      CCSSettingGMock *gmockSetting,
+		      CCSSettingType  type)
+	{
+	    EXPECT_CALL (*gmockContext, getIntegrationEnabled ()).WillOnce (Return (FALSE));
+	    EXPECT_CALL (*gmockPlugin, getContext ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockPlugin, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getType ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getName ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, getParent ()).Times (AtLeast (1));
+	    EXPECT_CALL (*gmockSetting, isReadOnly ()).WillRepeatedly (Return (FALSE));
+
+	    if (type == TypeList)
+	    {
+		EXPECT_CALL (*gmockSetting, getInfo ()).Times (AtLeast (1));
+		EXPECT_CALL (*gmockSetting, getDefaultValue ()).WillRepeatedly (ReturnNull ());
+	    }
+
+	    EXPECT_CALL (*gmockContext, getProfile ());
+	}
+
+	void PostUpdate (CCSContextGMock *gmockContext,
+		       CCSPluginGMock  *gmockPlugin,
+		       CCSSettingGMock *gmockSetting,
+		       CCSSettingType  type) {}
+
+	bool UpdateSettingAtKey (const std::string &plugin,
+				 const std::string &setting)
+	{
+	    CharacterWrapper keyName (translateKeyForGSettings (setting.c_str ()));
+
+	    if (updateSettingWithGSettingsKeyName (reinterpret_cast <CCSBackend *> (mGSettingsBackend), mSettings, keyName, ccsBackendUpdateSetting))
+		return true;
+
+	    return false;
+	}
+
+    private:
+
+	GVariantShared
+	ReadVariantAtKeyToShared (const std::string   &plugin,
+				  const std::string   &key,
+				  CCSSettingType	  type)
+	{
+	    CharacterWrapper translatedKey (translateKeyForGSettings (key.c_str ()));
+	    CharacterWrapper pluginPath (makeCompizPluginPath (profileName.c_str (),
+							       plugin.c_str ()));
+
+	    GVariant *rawVariant = getVariantAtKey (mSettings,
+						    translatedKey,
+						    pluginPath,
+						    type);
+
+	    GVariantShared shared (AutoDestroyHelper <GVariant> (rawVariant,
+								 g_variant_unref));
+
+
+
+	    return shared;
+	}
+
+	CCSGSettingsWrapper  *mSettings;
+	CCSContext *mContext;
+	CCSDynamicBackend *mBackend;
+	CCSBackend		   *mGSettingsBackend;
+	std::string pluginToMatch;
+
+	static const std::string profileName;
+};
+
+const std::string CCSGSettingsBackendEnv::profileName = "mock";
+
+INSTANTIATE_TEST_CASE_P (CCSGSettingsBackendConcept, CCSBackendConformanceTestReadWrite,
+			 compizconfig::test::GenerateTestingParametersForBackendInterface <CCSGSettingsBackendEnv> ());
+
+INSTANTIATE_TEST_CASE_P (CCSGSettingsBackendConcept, CCSBackendConformanceTestInfo,
+			 compizconfig::test::GenerateTestingEnvFactoryBackendInterface <CCSGSettingsBackendEnv> ());
+
+INSTANTIATE_TEST_CASE_P (CCSGSettingsBackendConcept, CCSBackendConformanceTestInitFiniFuncs,
+			 compizconfig::test::GenerateTestingEnvFactoryBackendInterface <CCSGSettingsBackendEnv> ());
+
+INSTANTIATE_TEST_CASE_P (CCSGSettingsBackendConcept, CCSBackendConformanceTestProfileHandling,
+			 compizconfig::test::GenerateTestingEnvFactoryBackendInterface <CCSGSettingsBackendEnv> ());

=== modified file 'compizconfig/libcompizconfig/config/CMakeLists.txt'
--- compizconfig/libcompizconfig/config/CMakeLists.txt	2012-05-24 06:48:55 +0000
+++ compizconfig/libcompizconfig/config/CMakeLists.txt	2012-08-07 01:05:25 +0000
@@ -1,6 +1,9 @@
 set (_config_file
      config)
 
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config_test
+		${CMAKE_CURRENT_BINARY_DIR}/compiz-1/compizconfig/config)
+
 compiz_opt_install_file (${CMAKE_CURRENT_SOURCE_DIR}/${_config_file} ${COMPIZ_SYSCONFDIR}/compizconfig/${_config_file})
 
 add_custom_target (

=== added file 'compizconfig/libcompizconfig/config/config_test'
--- compizconfig/libcompizconfig/config/config_test	1970-01-01 00:00:00 +0000
+++ compizconfig/libcompizconfig/config/config_test	2012-08-07 01:05:25 +0000
@@ -0,0 +1,3 @@
+[general]
+backend = ini
+plugin_list_autosort = true