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.

[lp:~compiz-team/compiz/compiz.gsettings_conformance_test]

3397. By Sam Spilsbury on 2012-07-22

Always assume that lists are copied - fix list leak (and use smart
pointers more effectively)

3398. By Sam Spilsbury on 2012-07-22

Fix leaked path in CCSGSettingsBackendEnv::SetUp

3399. By Sam Spilsbury on 2012-07-22

Fix memory leak in readListValue in gsettings.c - we must always
provide a valid CCSSetting object otherwise ccsFreeSettingValue will not
actually free the setting value

3400. By Sam Spilsbury on 2012-07-22

Fix various memory leaks due to not unreffing some variants

[Sam Spilsbury (smspillaz)]

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

[lp:~compiz-team/compiz/compiz.gsettings_conformance_test]

3401. By Sam Spilsbury on 2012-07-22

Added debugging message

3402. By Sam Spilsbury on 2012-07-22

Put the expectation in the right place

3403. By Sam Spilsbury on 2012-07-22

Indirect the gconf client registration

3404. By Sam Spilsbury on 2012-07-22

Neuter gconf client connection

3405. By Sam Spilsbury on 2012-07-22

Lazy-register the gconf client

3406. By Sam Spilsbury on 2012-07-23

file (INSTALL ...) will respect DESTDIR by default, so no need to include
it again.

3407. By Sam Spilsbury on 2012-07-23

Fix some crashes in debian chroots

3408. By Sam Spilsbury on 2012-07-23

Make the profile general for tests

3409. By Sam Spilsbury on 2012-07-23

Added testing config backend

3410. By Sam Spilsbury on 2012-07-23

Merge lp:compiz

3411. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3412. By Sam Spilsbury on 2012-07-24

Merge

3413. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3414. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3415. By Sam Spilsbury on 2012-07-24

Merge

3416. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3417. By Sam Spilsbury on 2012-07-24

Merge

3418. By Sam Spilsbury on 2012-07-24

Added a quick TODO about the usage of sys.path

3419. By Sam Spilsbury on 2012-07-24

Just override sys.path[0] for now, need to prepend

3420. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3421. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3422. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3423. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3424. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3425. By Sam Spilsbury on 2012-07-24

Merge

3426. By Sam Spilsbury on 2012-07-24

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3427. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3428. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3429. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3430. By Sam Spilsbury on 2012-07-25

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3431. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3432. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3433. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3434. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3435. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3436. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3437. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3438. By Sam Spilsbury on 2012-07-26

Merge from previous. All the GSettings backend tests fail but that's fine

3439. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3440. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3441. By Sam Spilsbury on 2012-07-26

Fix crashing GSettings tests

3442. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3443. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3444. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3445. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3446. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3447. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3448. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3449. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3450. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3451. By Sam Spilsbury on 2012-07-26

Merge

3452. By Sam Spilsbury on 2012-07-26

Nuke unused function in header file

3453. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3454. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3455. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3456. By Sam Spilsbury on 2012-07-26

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3457. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3458. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3459. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3460. By Sam Spilsbury on 2012-07-27

Merge

3461. By Sam Spilsbury on 2012-07-27

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3462. By Sam Spilsbury on 2012-07-28

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3463. By Sam Spilsbury on 2012-07-29

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3464. By Sam Spilsbury on 2012-07-29

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3465. By Sam Spilsbury on 2012-07-30

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3466. By Sam Spilsbury on 2012-07-30

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3467. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3468. By Sam Spilsbury on 2012-07-31

Moved CharacterWrapper definition into tests/shared/gtest_shared_characterwrapper.h

3469. By Sam Spilsbury on 2012-07-31

Merge

3470. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3471. By Sam Spilsbury on 2012-07-31

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3472. By Sam Spilsbury on 2012-08-01

Merge

3473. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3474. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3475. By Sam Spilsbury on 2012-08-01

Fix merge marker

3476. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3477. By Sam Spilsbury on 2012-08-01

Add match-list-setting to the mock schema

3478. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3479. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3480. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3481. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3482. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3483. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3484. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3485. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3486. By Sam Spilsbury on 2012-08-01

Enable info tests for gsettigs

3487. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3488. By Sam Spilsbury on 2012-08-01

Use the much more sensible, law of demeter friendly version

3489. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3490. By Sam Spilsbury on 2012-08-01

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3491. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3492. By Sam Spilsbury on 2012-08-02

Added expectation stubs and fix crash

3493. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3494. By Sam Spilsbury on 2012-08-02

Instantiate the tests and set the right expectations

3495. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3496. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3497. By Sam Spilsbury on 2012-08-02

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3498. By Sam Spilsbury on 2012-08-03

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3499. By Sam Spilsbury on 2012-08-03

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3500. By Sam Spilsbury on 2012-08-03

Pass the object allocator too

3501. By Sam Spilsbury on 2012-08-04

First steps to getting the wrapper under test

3502. By Sam Spilsbury on 2012-08-04

Merge

3503. By Sam Spilsbury on 2012-08-04

Merge

3504. By Sam Spilsbury on 2012-08-04

Backend conformance config really belongs in gsettings

3505. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3506. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3507. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3508. By Sam Spilsbury on 2012-08-04

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3509. By Sam Spilsbury on 2012-08-04

Update for API changes

3510. By Sam Spilsbury on 2012-08-05

Merge and remove redundant code

3511. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3512. By Sam Spilsbury on 2012-08-05

Test fixture for CCSGSettingsTestFindSettingAndPluginToUpdateFromPath

3513. By Sam Spilsbury on 2012-08-05

Comprehensive test coverage for FindSettingAndPluginToUpdateFromPath
and some cleanup, fix leaks etc

3514. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3515. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3516. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3517. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3518. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3519. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3520. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3521. By Sam Spilsbury on 2012-08-05

Added stubs for tests, fixed double unrefs due to GSettings' really
annoying stealing behaviour

3522. By Sam Spilsbury on 2012-08-05

Instantiate the CCSBackendConformanceTestProfileHandling suite for
the GSettings backend conformance test

3523. By Sam Spilsbury on 2012-08-05

Fix more double unref

3524. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3525. By Sam Spilsbury on 2012-08-05

Added AddProfile stub

3526. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3527. By Sam Spilsbury on 2012-08-05

Add default and current profiles correctly

3528. By Sam Spilsbury on 2012-08-05

Handle default and current profile cases in the tests a little better

3529. By Sam Spilsbury on 2012-08-05

Merge

3530. By Sam Spilsbury on 2012-08-05

Merge

3531. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3532. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3533. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3534. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3535. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3536. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3537. By Sam Spilsbury on 2012-08-05

Correct expectations

3538. By Sam Spilsbury on 2012-08-05

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3539. By Sam Spilsbury on 2012-08-06

Merge

3540. By Sam Spilsbury on 2012-08-06

Fixed a set of memory leaks in the GSettings conformance tests - we must
be careful to unref the variants once they are read

3541. By Sam Spilsbury on 2012-08-06

Merge

3542. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3543. By Sam Spilsbury on 2012-08-06

Remove dupe file

3544. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3545. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3546. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

3547. By Sam Spilsbury on 2012-08-06

Merged compiz.split_gsettings_rw_funcs into compiz.gsettings_conformance_test.

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-06 14:57:34 +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-06 14:57:33 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c	2012-08-06 14:57:34 +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-06 14:57:33 +0000
+++ compizconfig/gsettings/gsettings_backend_shared/gsettings_util.h	2012-08-06 14:57:34 +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-06 14:57:33 +0000
+++ compizconfig/gsettings/src/gsettings.c	2012-08-06 14:57:34 +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-06 14:57:33 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2012-08-06 14:57:34 +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-06 14:57:34 +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-06 14:57:34 +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-06 14:57:33 +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-06 14:57:34 +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-06 14:57:34 +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-06 14:57:34 +0000
@@ -0,0 +1,3 @@
+[general]
+backend = ini
+plugin_list_autosort = true