Merge lp:~compiz-team/compiz/compiz.new-gmock.fixes into lp:~compiz-team/compiz/new-gmock

[Sam Spilsbury]

Fix broken tests and detect gmock/gtest correctly:

1. Don't store any mocks in static storage, because gmock makes the assumption that the mocks will be destroyed before ::testing::internal::MockObjectRegistry and that assumption is wrong (undefined construction and destruction order in different translation units)
2. Only add the gmock subdirectory if we could actually find it
3. Fix a small typo
4. Remove duplication in CMakeLists.txt files

Fix broken tests and detect gmock/gtest correctly:

1. Don't store any mocks in static storage, because gmock makes the assumption that the mocks will be destroyed before ::testing::internal::MockObjectRegistry and that assumption is wrong (undefined construction and destruction order in different translation units)
2. Only add the gmock subdirectory if we could actually find it
3. Fix a small typo
4. Remove duplication in CMakeLists.txt files

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -156,7 +156,7 @@
 
 if (COMPIZ_BUILD_TESTING)
 
-    include (FindGoogleTest)
+    include (GoogleTest)
 
     if (GOOGLE_TEST_AND_MOCK_FOUND)
 

=== renamed file 'cmake/FindGoogleTest.cmake' => 'cmake/GoogleTest.cmake'
--- cmake/FindGoogleTest.cmake	2013-07-15 09:48:24 +0000
+++ cmake/GoogleTest.cmake	2013-07-17 07:55:39 +0000
@@ -1,18 +1,37 @@
 find_package (Threads REQUIRED)
 
-set (GMOCK_INCLUDE_DIR "/usr/include/gmock/include" CACHE PATH "gmock source include directory")
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_BINARY_DIR}/__gmock")
-
-include_directories (${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
-
-set (GTEST_BOTH_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} gtest gtest_main)
+# Find the the Google Mock include directory
+# by searching the system-wide include directory
+# paths
+find_path (GMOCK_INCLUDE_DIR
+           gmock/gmock.h)
+
+if (GMOCK_INCLUDE_DIR)
+    set (GMOCK_INCLUDE_BASE "include/")
+    string (LENGTH ${GMOCK_INCLUDE_BASE} GMOCK_INCLUDE_BASE_LENGTH)
+    string (LENGTH ${GMOCK_INCLUDE_DIR} GMOCK_INCLUDE_DIR_LENGTH)
+
+    math (EXPR
+          GMOCK_INCLUDE_PREFIX_LENGTH
+          "${GMOCK_INCLUDE_DIR_LENGTH} - ${GMOCK_INCLUDE_BASE_LENGTH}")
+    string (SUBSTRING
+            ${GMOCK_INCLUDE_DIR}
+            0
+            ${GMOCK_INCLUDE_PREFIX_LENGTH}
+            GMOCK_INCLUDE_PREFIX)
+
+    set (GMOCK_SRC_DIR ${GMOCK_INCLUDE_PREFIX}/src/gmock CACHE PATH "Path to Google Mock Sources")
+    set (GMOCK_INCLUDE_DIR ${GMOCK_INCLUDE_DIR} CACHE PATH "Path to Google Mock Headers")
+    set (GTEST_INCLUDE_DIR ${GMOCK_SRC_DIR}/gtest/include CACHE PATH "Path to Google Test Headers")
+
+    set (GMOCK_LIBRARY "gmock" CACHE STRING "Name of the Google Mock library")
+    set (GMOCK_MAIN_LIBRARY "gmock_main" CACHE STIRNG "Name of the Google Mock main () library")
+    set (GTEST_BOTH_LIBRARIES ${CMAKE_THREAD_LIBS_INIT} gtest gtest_main)
+
+endif (GMOCK_INCLUDE_DIR)
 
 if (NOT GTEST_BOTH_LIBRARIES)
 
-    message ("Google Test not found - cannot build tests!")
     set (GTEST_FOUND FALSE)
 
 else (NOT GTEST_BOTH_LIBRARIES)
@@ -21,10 +40,6 @@
 
 endif (NOT GTEST_BOTH_LIBRARIES)
 
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
-
 if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
 
     message ("Google Mock and Google Test not found - cannot build tests!")
@@ -34,4 +49,10 @@
 
     set (GOOGLE_TEST_AND_MOCK_FOUND TRUE)
 
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
\ No newline at end of file
+    add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
+    add_subdirectory (${GMOCK_SRC_DIR} ${CMAKE_BINARY_DIR}/__gmock)
+    include_directories (${GMOCK_INCLUDE_DIR}
+                         ${GTEST_INCLUDE_DIR})
+
+
+endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)

=== modified file 'cmake/src/compiz/compiz_discover_gtest_tests.cpp'
--- cmake/src/compiz/compiz_discover_gtest_tests.cpp	2013-07-15 09:48:24 +0000
+++ cmake/src/compiz/compiz_discover_gtest_tests.cpp	2013-07-17 07:55:39 +0000
@@ -75,7 +75,7 @@
 		    gTestFilter << " \"--gtest_filter=";
 		    endParen << "\")";
 
-        std::string testName = jt->substr(0, jt->find("#"));
+		    std::string testName = jt->substr(0, jt->find("#"));
 
 		    testfilecmake <<
 			addTest.str () <<

=== modified file 'compizconfig/gsettings/tests/CMakeLists.txt'
--- compizconfig/gsettings/tests/CMakeLists.txt	2013-07-16 19:59:06 +0000
+++ compizconfig/gsettings/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -84,6 +84,6 @@
 			   ${GMOCK_MAIN_LIBRARY})
 
     compiz_discover_tests (compizconfig_test_gsettings COVERAGE compizconfig_gsettings_backend)
-    #compiz_discover_tests (compizconfig_test_gsettings_conformance COVERAGE compizconfig_gsettings_backend gsettings)
+    compiz_discover_tests (compizconfig_test_gsettings_conformance COVERAGE compizconfig_gsettings_backend gsettings)
 
 endif (COMPIZCONFIG_TEST_GSETTINGS_FOUND)

=== modified file 'compizconfig/libcompizconfig/tests/CMakeLists.txt'
--- compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-07-16 19:59:06 +0000
+++ compizconfig/libcompizconfig/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -144,11 +144,11 @@
                        compizconfig
 )
 
-#compiz_discover_tests (compizconfig_test_ccs_object COVERAGE compizconfig)
+compiz_discover_tests (compizconfig_test_ccs_object COVERAGE compizconfig)
 compiz_discover_tests (compizconfig_test_ccs_context COVERAGE compizconfig_ccs_context_mock)
 compiz_discover_tests (compizconfig_test_ccs_plugin COVERAGE compizconfig_ccs_plugin_mock)
 compiz_discover_tests (compizconfig_test_ccs_setting COVERAGE compizconfig_ccs_setting_mock)
-#compiz_discover_tests (compizconfig_test_ccs_mock_backend_conformance COVERAGE compizconfig_ccs_backend_mock)
+compiz_discover_tests (compizconfig_test_ccs_mock_backend_conformance COVERAGE compizconfig_ccs_backend_mock)
 compiz_discover_tests (compizconfig_test_ccs_text_file COVERAGE ccs_text_file_interface compizconfig_ccs_text_file_mock)
 compiz_discover_tests (compizconfig_test_ccs_upgrade_internal COVERAGE ccs_settings_upgrade_internal)
 compiz_discover_tests (compizconfig_test_ccs_util COVERAGE compizconfig)

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2012-11-24 10:01:33 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp	2013-07-17 07:55:39 +0000
@@ -701,11 +701,10 @@
 		case TypeList:
 		    ccsSetList (setting,
 				cci::SettingValueListWrapper (ReadListAtKey (plugin, key, setting),
-								 cci::Deep,
-								 ccsSettingGetInfo (setting)->forList.listType,
-								 boost::shared_ptr <CCSSettingInfo> (),
-								 boost::shared_ptr <CCSSetting> (setting,
-												 boost::bind (doNothingWithCCSSetting, _1))),
+							      cci::Deep,
+							      ccsSettingGetInfo (setting)->forList.listType,
+							      boost::shared_ptr <CCSSetting> (setting,
+											      boost::bind (doNothingWithCCSSetting, _1))),
 				FALSE);
 		    break;
 
@@ -799,11 +798,13 @@
 		    ccsGetList (setting, &vList);
 		    listCopy = ccsCopyList (vList, setting);
 
-		    WriteListAtKey (plugin, key, VariantTypes (boost::make_shared <cci::SettingValueListWrapper> (listCopy,
-														     cci::Deep,
-														     ccsSettingGetInfo (setting)->forList.listType,
-														     boost::shared_ptr <CCSSettingInfo> (),
-														     boost::shared_ptr <CCSSetting> (setting, boost::bind (doNothingWithCCSSetting, _1)))));
+		    WriteListAtKey (plugin,
+				    key,
+				    VariantTypes (boost::make_shared <cci::SettingValueListWrapper> (listCopy,
+												     cci::Deep,
+												     ccsSettingGetInfo (setting)->forList.listType,
+												     boost::shared_ptr <CCSSetting> (setting,
+																     boost::bind (doNothingWithCCSSetting, _1)))));
 		    break;
 		}
 		default:

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp	2012-11-05 06:57:05 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_object.cpp	2013-07-17 07:55:39 +0000
@@ -13,6 +13,8 @@
 using ::testing::StrictMock;
 using ::testing::Invoke;
 
+class GoogleMockDummy;
+
 class CCSObjectTest :
     public ::testing::Test
 {
@@ -23,7 +25,7 @@
     CCSObject object;
 };
 
-typedef void (*dummyFunc) (void);
+typedef void (*dummyFunc) (GoogleMockDummy *);
 
 struct DummyInterface
 {
@@ -54,11 +56,14 @@
 	MOCK_METHOD1 (freeTestingObjectWrapper, void (TestingObjectWrapper *));
     public:
 
-	static void thunkDummyFunc () { return _mockDummy.dummyFunc (); }
-	static GoogleMockDummy _mockDummy;
+	static void thunkDummyFunc (GoogleMockDummy *mock);
 };
 
-GoogleMockDummy GoogleMockDummy::_mockDummy;
+void
+GoogleMockDummy::thunkDummyFunc (GoogleMockDummy *mock)
+{
+    mock->dummyFunc ();
+}
 
 const struct DummyInterface SomeDummyInterface =
 {
@@ -163,10 +168,11 @@
     EXPECT_EQ (*((CCSObject *) to)->interface_types, 1);
 
     const DummyInterface *myDummyInterface = (const DummyInterface *) ccsObjectGetInterface (to, 1);
-
-    EXPECT_CALL (GoogleMockDummy::_mockDummy, dummyFunc ());
-
-    (*myDummyInterface->dummy) ();
+    GoogleMockDummy mockDummy;
+
+    EXPECT_CALL (mockDummy, dummyFunc ());
+
+    (*myDummyInterface->dummy) (&mockDummy);
 
     ccsObjectRemoveInterface (to, 1);
 
@@ -196,7 +202,9 @@
 
 void ccsFreeTestingObjectWrapper (TestingObjectWrapper *wrapper)
 {
-    GoogleMockDummy::_mockDummy.freeTestingObjectWrapper (wrapper);
+    GoogleMockDummy *dummy =
+        reinterpret_cast <GoogleMockDummy *> (reinterpret_cast <CCSObject *> (ccsObjectGetPrivate (wrapper)));
+    dummy->freeTestingObjectWrapper (wrapper);
 }
 
 #define CCSREF_OBJ(type,dtype) \
@@ -217,10 +225,13 @@
 {
     TestingObjectWrapper *to = (TestingObjectWrapper *) calloc (1, sizeof (TestingObjectWrapper));
 
+    GoogleMockDummy dummy;
+
     ccsObjectInit (to, &ccsDefaultObjectAllocator);
+    ccsObjectSetPrivate (to, reinterpret_cast <CCSPrivate *> (&dummy));
     ccsTestingObjectWrapperRef (to);
 
-    EXPECT_CALL (GoogleMockDummy::_mockDummy, freeTestingObjectWrapper (to));
+    EXPECT_CALL (dummy, freeTestingObjectWrapper (to));
 
     ccsTestingObjectWrapperUnref (to);
 

=== modified file 'compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp'
--- compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2013-02-13 01:40:35 +0000
+++ compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp	2013-07-17 07:55:39 +0000
@@ -766,7 +766,6 @@
 		mWrapper.reset (new cci::SettingValueListWrapper (NULL,
 								  cci::Deep,
 								  type,
-								  info,
 								  setting));
 		mWrapper->append (value);
 	    }
@@ -799,7 +798,6 @@
 		mWrapper.reset (new cci::SettingValueListWrapper (ccsCopyList (mRawValueList, setting.get ()),
 								  cci::Deep,
 								  type,
-								  info,
 								  setting));
 	    }
 

=== modified file 'compizconfig/mocks/libcompizconfig/CMakeLists.txt'
--- compizconfig/mocks/libcompizconfig/CMakeLists.txt	2013-05-13 13:50:31 +0000
+++ compizconfig/mocks/libcompizconfig/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -19,6 +19,9 @@
 add_library (compizconfig_ccs_setting_mock
 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_setting_mock.cpp)
 
+add_library (compizconfig_ccs_setting_stub
+	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_setting_stub.cpp)
+
 add_library (compizconfig_ccs_backend_mock
 	     ${CMAKE_CURRENT_SOURCE_DIR}/compizconfig_ccs_backend_mock.cpp)
 
@@ -64,6 +67,13 @@
 		       ${LIBCOMPIZCONFIG_LIBRARIES}
 		       compizconfig)
 
+target_link_libraries (compizconfig_ccs_setting_stub
+		       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${LIBCOMPIZCONFIG_LIBRARIES}
+		       compizconfig)
+
 target_link_libraries (compizconfig_ccs_backend_mock
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${GMOCK_LIBRARY}

=== added file 'compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.cpp'
--- compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.cpp	1970-01-01 00:00:00 +0000
+++ compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.cpp	2013-07-17 07:55:39 +0000
@@ -0,0 +1,425 @@
+/*
+ * Compiz configuration system library
+ *
+ * Copyright (C) 2013 Sam Spilsbury <[e-mail]>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authored By:
+ * Sam Spilsbury <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include <ccs.h>
+
+#include "compizconfig_ccs_setting_stub.h"
+
+typedef struct _Private
+{
+    Bool            integrated;
+    Bool            readOnly;
+    const char      *name;
+    const char      *shortDesc;
+    const char      *longDesc;
+    const char      *hints;
+    const char      *group;
+    const char      *subGroup;
+    CCSSettingType  type;
+    CCSPlugin       *parent;
+    CCSSettingValue *value;
+    CCSSettingValue *defaultValue;
+    CCSSettingInfo  info;
+} Private;
+
+static Bool ccsStubSettingGetInt (CCSSetting *setting,
+				  int        *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asInt;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetFloat (CCSSetting *setting,
+				    float      *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asFloat;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetBool (CCSSetting *setting,
+				   Bool       *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asBool;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetString (CCSSetting *setting,
+				     const char **data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asString;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetColor (CCSSetting           *setting,
+				    CCSSettingColorValue *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asColor;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetMatch (CCSSetting *setting,
+				    const char **data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asMatch;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetKey (CCSSetting         *setting,
+				  CCSSettingKeyValue *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asKey;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetButton (CCSSetting            *setting,
+				     CCSSettingButtonValue *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asButton;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetEdge (CCSSetting  *setting,
+				   unsigned int *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asEdge;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetBell (CCSSetting *setting,
+				   Bool       *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asBell;
+    return TRUE;
+}
+
+static Bool ccsStubSettingGetList (CCSSetting          *setting,
+				   CCSSettingValueList *data)
+{
+    *data = ((Private *) ccsObjectGetPrivate (setting))->value->value.asList;
+    return TRUE;
+}
+
+static CCSSetStatus ccsStubSettingSetInt (CCSSetting *setting,
+					  int        data,
+					  Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asInt = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetFloat (CCSSetting *setting,
+					    float      data,
+					    Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asFloat = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetBool (CCSSetting *setting,
+					   Bool       data,
+					   Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asBool = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetString (CCSSetting *setting,
+					     const char *data,
+					     Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asString = (char *) data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetColor (CCSSetting           *setting,
+					    CCSSettingColorValue data,
+					    Bool                 processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asColor = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetMatch (CCSSetting *setting,
+					    const char *data,
+					    Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asMatch = (char *) data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetKey (CCSSetting         *setting,
+					  CCSSettingKeyValue data,
+					  Bool               processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asKey = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetButton (CCSSetting            *setting,
+					     CCSSettingButtonValue data,
+					     Bool                  processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asButton = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetEdge (CCSSetting   *setting,
+					   unsigned int data,
+					   Bool         processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asEdge = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetBell (CCSSetting *setting,
+					   Bool       data,
+					   Bool       processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asBell = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetList (CCSSetting          *setting,
+					   CCSSettingValueList data,
+					   Bool                processChanged)
+{
+    ((Private *) ccsObjectGetPrivate (setting))->value->value.asList = data;
+    return SetToNewValue;
+}
+
+static CCSSetStatus ccsStubSettingSetValue (CCSSetting      *setting,
+					    CCSSettingValue *data,
+					    Bool            processChanged)
+{
+    Private *priv = (Private *) ccsObjectGetPrivate (setting);
+
+    ccsCopyValueInto (data,
+		      priv->value,
+		      priv->type,
+		      &priv->info);
+    return SetToNewValue;
+}
+
+static void ccsStubSettingResetToDefault (CCSSetting * setting, Bool processChanged)
+{
+}
+
+static Bool ccsStubSettingIsIntegrated (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->integrated;
+}
+
+static Bool ccsStubSettingReadOnly (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->readOnly;
+}
+
+static const char * ccsStubSettingGetName (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->name;
+}
+
+static const char * ccsStubSettingGetShortDesc (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->shortDesc;
+}
+
+static const char * ccsStubSettingGetLongDesc (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->longDesc;
+}
+
+static CCSSettingType ccsStubSettingGetType (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->type;
+}
+
+static CCSSettingInfo * ccsStubSettingGetInfo (CCSSetting *setting)
+{
+    return &((Private *) ccsObjectGetPrivate (setting))->info;
+}
+
+static const char * ccsStubSettingGetGroup (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->group;
+}
+
+static const char * ccsStubSettingGetSubGroup (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->subGroup;
+}
+
+static const char * ccsStubSettingGetHints (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->hints;
+}
+
+static CCSSettingValue * ccsStubSettingGetDefaultValue (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->defaultValue;
+}
+
+static CCSSettingValue * ccsStubSettingGetValue (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->value;
+}
+
+static Bool ccsStubSettingIsDefault (CCSSetting *setting)
+{
+    Private *priv = (Private *) ccsObjectGetPrivate (setting);
+
+    return ccsCheckValueEq (priv->value,
+			    priv->type,
+			    &priv->info,
+			    priv->defaultValue,
+			    priv->type,
+			    &priv->info);
+}
+
+static CCSPlugin * ccsStubSettingGetParent (CCSSetting *setting)
+{
+    return ((Private *) ccsObjectGetPrivate (setting))->parent;
+}
+
+static void * ccsStubSettingGetPrivatePtr (CCSSetting *setting)
+{
+    return NULL;
+}
+
+static void ccsStubSettingSetPrivatePtr (CCSSetting *setting, void *ptr)
+{
+}
+
+static Bool ccsStubSettingIsReadableByBackend (CCSSetting *setting)
+{
+    return TRUE;
+}
+
+static void ccsFreeSettingTypeStub (CCSSetting *setting)
+{
+    Private *priv = (Private *) ccsObjectGetPrivate (setting);
+
+    ccsFreeSettingValueWithType (priv->value, priv->type);
+    ccsFreeSettingValueWithType (priv->defaultValue, priv->type);
+    ccsCleanupSettingInfo (&priv->info, priv->type);
+
+    ccsObjectFinalize (setting);
+
+    free (setting);
+}
+
+static const CCSSettingInterface ccsStubSettingInterface =
+{
+    ccsStubSettingGetName,
+    ccsStubSettingGetShortDesc,
+    ccsStubSettingGetLongDesc,
+    ccsStubSettingGetType,
+    ccsStubSettingGetInfo,
+    ccsStubSettingGetGroup,
+    ccsStubSettingGetSubGroup,
+    ccsStubSettingGetHints,
+    ccsStubSettingGetDefaultValue,
+    ccsStubSettingGetValue,
+    ccsStubSettingIsDefault,
+    ccsStubSettingGetParent,
+    ccsStubSettingGetPrivatePtr,
+    ccsStubSettingSetPrivatePtr,
+    ccsStubSettingSetInt,
+    ccsStubSettingSetFloat,
+    ccsStubSettingSetBool,
+    ccsStubSettingSetString,
+    ccsStubSettingSetColor,
+    ccsStubSettingSetMatch,
+    ccsStubSettingSetKey,
+    ccsStubSettingSetButton,
+    ccsStubSettingSetEdge,
+    ccsStubSettingSetBell,
+    ccsStubSettingSetList,
+    ccsStubSettingSetValue,
+    ccsStubSettingGetInt,
+    ccsStubSettingGetFloat,
+    ccsStubSettingGetBool,
+    ccsStubSettingGetString,
+    ccsStubSettingGetColor,
+    ccsStubSettingGetMatch,
+    ccsStubSettingGetKey,
+    ccsStubSettingGetButton,
+    ccsStubSettingGetEdge,
+    ccsStubSettingGetBell,
+    ccsStubSettingGetList,
+    ccsStubSettingResetToDefault,
+    ccsStubSettingIsIntegrated,
+    ccsStubSettingReadOnly,
+    ccsStubSettingIsReadableByBackend,
+    ccsFreeSettingTypeStub
+};
+
+CCSSetting *
+ccsSettingTypeStubNew (CCSSettingType  type,
+                       Bool            integrated,
+                       Bool            readOnly,
+                       const char      *name,
+                       const char      *shortDesc,
+                       const char      *longDesc,
+                       const char      *hints,
+                       const char      *group,
+                       const char      *subGroup,
+                       CCSSettingValue *value,
+                       CCSSettingValue *defaultValue,
+                       CCSSettingInfo  *info,
+                       CCSObjectAllocationInterface *ai)
+{
+    Private *priv = (Private *) calloc (1, sizeof (Private));
+    priv->integrated = integrated;
+    priv->readOnly  = readOnly;
+    priv->name = name;
+    priv->shortDesc = shortDesc;
+    priv->longDesc = longDesc;
+    priv->hints = hints;
+    priv->group = group;
+    priv->subGroup = subGroup;
+    priv->type = type;
+
+    priv->value = (CCSSettingValue *) calloc (1, sizeof (CCSSettingValue));
+    priv->defaultValue = (CCSSettingValue *) calloc (1, sizeof (CCSSettingValue));
+
+    if (value)
+	ccsCopyValueInto (value, priv->value, priv->type, info);
+    if (defaultValue)
+	ccsCopyValueInto (defaultValue, priv->defaultValue, priv->type, info);
+    if (info)
+	ccsCopyInfo (info, &priv->info, priv->type);
+
+    CCSSetting *setting = (CCSSetting *) calloc (1, sizeof (CCSSetting));
+    ccsObjectInit (setting, ai);
+    ccsObjectSetPrivate (setting, (CCSPrivate *) priv);
+    ccsObjectAddInterface (setting,
+			   (CCSInterface *) &ccsStubSettingInterface,
+			   GET_INTERFACE_TYPE (CCSSettingInterface));
+    ccsSettingRef (setting);
+
+    return setting;
+}

=== added file 'compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.h'
--- compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.h	1970-01-01 00:00:00 +0000
+++ compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_stub.h	2013-07-17 07:55:39 +0000
@@ -0,0 +1,44 @@
+/*
+ * Compiz configuration system library
+ *
+ * Copyright (C) 2013 Sam Spilsbury <[e-mail]>.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authored By:
+ * Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef _COMPIZCONFIG_CCS_SETTING_STUB
+#define _COMPIZCONFIG_CCS_SETTING_STUB
+
+#include <ccs.h>
+
+CCSSetting *
+ccsSettingTypeStubNew (CCSSettingType  type,
+                       Bool            integrated,
+                       Bool            readOnly,
+                       const char      *name,
+                       const char      *shortDesc,
+                       const char      *longDesc,
+                       const char      *hints,
+                       const char      *group,
+                       const char      *subGroup,
+                       CCSSettingValue *value,
+                       CCSSettingValue *defaultValue,
+                       CCSSettingInfo  *info,
+		       CCSObjectAllocationInterface *ai);
+
+#endif

=== modified file 'compizconfig/tests/CMakeLists.txt'
--- compizconfig/tests/CMakeLists.txt	2012-09-29 04:40:41 +0000
+++ compizconfig/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -69,4 +69,5 @@
                        compizconfig_ccs_test_value_combinations
                        compizconfig_ccs_setting_value_operators
                        compizconfig_ccs_list_equality
-                       compizconfig_ccs_item_in_list_matcher)
+                       compizconfig_ccs_item_in_list_matcher
+                       compizconfig_ccs_setting_stub)

=== modified file 'compizconfig/tests/compizconfig_backend_concept_test.cpp'
--- compizconfig/tests/compizconfig_backend_concept_test.cpp	2012-09-17 15:39:11 +0000
+++ compizconfig/tests/compizconfig_backend_concept_test.cpp	2013-07-17 07:55:39 +0000
@@ -26,6 +26,7 @@
 #include <gtest_unspecified_bool_type_matcher.h>
 
 #include <compizconfig_ccs_setting_mock.h>
+#include <compizconfig_ccs_setting_stub.h>
 
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
@@ -56,19 +57,34 @@
 					    CCSSettingType             type,
 					    cci::ListStorageType       storageType)
 {
+    CCSSettingInfo listInfo;
+
+    listInfo.forList.listType = type;
+    listInfo.forList.listInfo =
+	(CCSSettingInfo *) calloc (1, sizeof (CCSSettingInfo));
+
     boost::function <void (CCSSetting *)> f (boost::bind (ccsSettingUnref, _1));
-    boost::shared_ptr <CCSSetting> mockSetting (ccsNiceMockSettingNew (), f);
-    NiceMock <CCSSettingGMock>     *gmockSetting = reinterpret_cast <NiceMock <CCSSettingGMock> *> (ccsObjectGetPrivate (mockSetting.get ()));
-
-    ON_CALL (*gmockSetting, getType ()).WillByDefault (Return (TypeList));
-
-    boost::shared_ptr <CCSSettingInfo> listInfo (new CCSSettingInfo);
-
-    listInfo->forList.listType = type;
-
-    ON_CALL (*gmockSetting, getInfo ()).WillByDefault (Return (listInfo.get ()));
-    ON_CALL (*gmockSetting, getDefaultValue ()).WillByDefault (ReturnNull ());
-    return boost::make_shared <cci::SettingValueListWrapper> (c (mockSetting.get ()), storageType, type, listInfo, mockSetting);
+    boost::shared_ptr <CCSSetting> stubSetting (ccsSettingTypeStubNew (TypeList,
+								       TRUE,
+								       TRUE,
+								       NULL,
+								       NULL,
+								       NULL,
+								       NULL,
+								       NULL,
+								       NULL,
+								       NULL,
+								       NULL,
+								       &listInfo,
+								       &ccsDefaultObjectAllocator),
+						f);
+
+    ccsCleanupSettingInfo (&listInfo, TypeList);
+
+    return boost::make_shared <cci::SettingValueListWrapper> (c (stubSetting.get ()),
+							      storageType,
+							      type,
+							      stubSetting);
 }
 
 CCSSettingGMock *
@@ -287,10 +303,9 @@
     write ();
 
     EXPECT_THAT (cci::SettingValueListWrapper (env->ReadListAtKey (plugin, key, setting.get ()),
-						  cci::Deep,
-						  info->forList.listType,
-						  boost::shared_ptr <CCSSettingInfo> (),
-						  setting),
+					       cci::Deep,
+					       info->forList.listType,
+					       setting),
 		 ListEqual (&info->forList, list));
 }
 

=== modified file 'compizconfig/tests/compizconfig_ccs_list_wrapper.cpp'
--- compizconfig/tests/compizconfig_ccs_list_wrapper.cpp	2012-09-17 15:39:11 +0000
+++ compizconfig/tests/compizconfig_ccs_list_wrapper.cpp	2013-07-17 07:55:39 +0000
@@ -37,12 +37,10 @@
 		public:
 
 		    PrivateSettingValueListWrapper (CCSSettingValueList                      list,
-						       cci::ListStorageType                     storageType,
-						       CCSSettingType                           type,
-						       const boost::shared_ptr <CCSSettingInfo> &listInfo,
-						       const boost::shared_ptr <CCSSetting>     &settingReference) :
+						    cci::ListStorageType                     storageType,
+						    CCSSettingType                           type,
+						    const boost::shared_ptr <CCSSetting>     &settingReference) :
 			mType (type),
-			mListInfo (listInfo),
 			mSettingReference (settingReference),
 			mListWrapper (list,
 				      ccsSettingValueListFree,
@@ -52,25 +50,22 @@
 		    {
 		    }
 
-		    CCSSettingType                                  mType;
-		    boost::shared_ptr <CCSSettingInfo>              mListInfo;
-		    boost::shared_ptr <CCSSetting>                  mSettingReference;
+		    CCSSettingType                               mType;
+		    boost::shared_ptr <CCSSetting>               mSettingReference;
 		    SettingValueListWrapper::InternalWrapperImpl mListWrapper;
 	    };
 	}
     }
 }
 
-cci::SettingValueListWrapper::SettingValueListWrapper (CCSSettingValueList                      list,
-							     cci::ListStorageType                     storageType,
-							     CCSSettingType                           type,
-							     const boost::shared_ptr <CCSSettingInfo> &listInfo,
-							     const boost::shared_ptr <CCSSetting>     &settingReference) :
+cci::SettingValueListWrapper::SettingValueListWrapper (CCSSettingValueList                  list,
+						       cci::ListStorageType                 storageType,
+						       CCSSettingType                       type,
+						       const boost::shared_ptr <CCSSetting> &settingReference) :
     priv (new cci::PrivateSettingValueListWrapper (list,
-						      storageType,
-						      type,
-						      listInfo,
-						      settingReference))
+						   storageType,
+						   type,
+						   settingReference))
 {
 }
 

=== modified file 'compizconfig/tests/compizconfig_ccs_list_wrapper.h'
--- compizconfig/tests/compizconfig_ccs_list_wrapper.h	2012-09-22 03:59:35 +0000
+++ compizconfig/tests/compizconfig_ccs_list_wrapper.h	2013-07-17 07:55:39 +0000
@@ -136,11 +136,10 @@
 		    typedef compiz::config::ListWrapper <CCSSettingValueList, CCSSettingValue *> InternalWrapper;
 		    typedef compiz::config::impl::ListWrapper <CCSSettingValueList, CCSSettingValue *> InternalWrapperImpl;
 
-		    SettingValueListWrapper (CCSSettingValueList                      list,
-					     ListStorageType                          storageType,
-					     CCSSettingType                           type,
-					     const boost::shared_ptr <CCSSettingInfo> &listInfo,
-					     const boost::shared_ptr <CCSSetting>     &settingReference);
+		    SettingValueListWrapper (CCSSettingValueList                  list,
+					     ListStorageType                      storageType,
+					     CCSSettingType                       type,
+					     const boost::shared_ptr <CCSSetting> &settingReference);
 
 		    CCSSettingType type ();
 

=== modified file 'plugins/composite/src/pixmapbinding/tests/CMakeLists.txt'
--- plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/composite/src/pixmapbinding/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_composite_pixmapbinding
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-composite-pixmapbinding.cpp)
 

=== modified file 'plugins/grid/src/grabhandler/tests/CMakeLists.txt'
--- plugins/grid/src/grabhandler/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/grid/src/grabhandler/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_grid_grabhandler
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-grid-grab-handler.cpp)
 

=== modified file 'plugins/opengl/src/doublebuffer/tests/CMakeLists.txt'
--- plugins/opengl/src/doublebuffer/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/opengl/src/doublebuffer/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_opengl_double_buffer
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-opengl-double-buffer.cpp)
 

=== modified file 'plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt'
--- plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_opengl_glx_tfp_bind
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-opengl-glx-tfp-bind.cpp)
 

=== modified file 'plugins/resize/src/logic/tests/CMakeLists.txt'
--- plugins/resize/src/logic/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/resize/src/logic/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_resize_logic
                 test-logic.cpp
 		resize-options-mock.cpp

=== modified file 'plugins/wall/src/offset_movement/tests/CMakeLists.txt'
--- plugins/wall/src/offset_movement/tests/CMakeLists.txt	2013-07-15 09:48:24 +0000
+++ plugins/wall/src/offset_movement/tests/CMakeLists.txt	2013-07-17 07:55:39 +0000
@@ -1,15 +1,3 @@
-set (GMOCK_LIBRARY gmock)
-set (GMOCK_MAIN_LIBRARY gmock_main)
-
-if (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-  message ("Google Mock and Google Test not found - cannot build tests!")
-  set (COMPIZ_BUILD_TESTING OFF)
-endif (NOT GMOCK_LIBRARY OR NOT GMOCK_MAIN_LIBRARY OR NOT GTEST_FOUND)
-
-include_directories (${GTEST_INCLUDE_DIRS})
-
-link_directories (${COMPIZ_LIBRARY_DIRS})
-
 add_executable (compiz_test_wall_offset_movement
                 ${CMAKE_CURRENT_SOURCE_DIR}/test-wall-offset-movement.cpp)