Address comments for PR#451:

  * Move test folder in every module;
  * Remove mock objects;
  * Clarify comment;
  * Add a simple test.

cmake/modules/RootNewMacros.cmake

@@ -1079,16 +1079,19 @@ function(ROOT_ADD_TEST test)
 endfunction()
 
 #----------------------------------------------------------------------------
-# function ROOT_ADD_GTEST(<testsuite> <name> LIBRARIES)
+# function ROOT_ADD_GTEST(<testsuite> source1 source2... LIBRARIES)
 #
-function(ROOT_ADD_GTEST test_suite test_name)
+function(ROOT_ADD_GTEST test_suite)
   CMAKE_PARSE_ARGUMENTS(ARG "" "" "LIBRARIES" ${ARGN})
-
   include_directories(${GTEST_INCLUDE_DIR} ${GMOCK_INCLUDE_DIR})
 
-  # Note we cannot use ROOT_EXECUTABLE because it requires to pass LIBRARIES to link with.
-  # The test suites should chose this in their specific CMakeLists.txt file.
-  ROOT_EXECUTABLE(${test_suite} ${test_name} LIBRARIES ${ARG_LIBRARIES})
+  set(source_files ${ARG_UNPARSED_ARGUMENTS})
+  # Note we cannot use ROOT_EXECUTABLE without user-specified set of LIBRARIES to link with.
+  # The test suites should choose this in their specific CMakeLists.txt file.
+  # FIXME: For better coherence we could restrict the libraries the test suite could link
+  # against. For example, tests in Core should link only against libCore. This could be tricky
+  # to implement because some ROOT components create more than one library.
+  ROOT_EXECUTABLE(${test_suite} ${source_files} LIBRARIES ${ARG_LIBRARIES})
   target_link_libraries(${test_suite} gtest gtest_main gmock gmock_main)
   ROOT_ADD_TEST(gtest-${test_suite} COMMAND ${test_suite})
 endfunction()

core/CMakeLists.txt

@@ -16,10 +16,6 @@ add_subdirectory(thread)
 add_subdirectory(zip)
 add_subdirectory(lzma)
 
-if(testing)
-  ROOT_ADD_TEST_SUBDIRECTORY(test)
-endif()
-
 if(NOT WIN32)
   add_subdirectory(newdelete)
 endif()

core/base/CMakeLists.txt

@@ -2,6 +2,10 @@
 # CMakeLists.txt file for building ROOT core/base package
 ############################################################################
 
+if(testing)
+  ROOT_ADD_TEST_SUBDIRECTORY(test)
+endif()
+
 ROOT_GLOB_HEADERS(Base_dict_headers ${CMAKE_CURRENT_SOURCE_DIR}/inc/T*.h
                                     ${CMAKE_CURRENT_SOURCE_DIR}/inc/GuiTypes.h 
                                     ${CMAKE_CURRENT_SOURCE_DIR}/inc/KeySymbols.h 

core/base/test/CMakeLists.txt

@@ -0,0 +1,10 @@
+# FIXME: The tests in core should require only libCore. OTOH, TQObjectTests uses the interpreter to register the class.
+# This means that if we run make CoreBaseTests the executable wouldn't be runnable because it requires libCling and
+# onepcm targets to be built.
+set (link_libs Core)
+
+ROOT_ADD_GTEST(CoreBaseTests
+  TNamedTests.cxx
+  TQObjectTests.cxx
+  LIBRARIES ${link_libs}
+  )

core/base/test/TNamedTests.cxx

@@ -0,0 +1,11 @@
+#include "gtest/gtest.h"
+#include "gmock/gmock.h"
+
+#include "TNamed.h"
+
+TEST(TNamed, Sanity)
+{
+   TNamed n("Name", "Title");
+   EXPECT_STREQ("Name", n.GetName());
+   EXPECT_STREQ("Title", n.GetTitle());
+}

core/test/base/TQObjectTests.cxx → core/base/test/TQObjectTests.cxx

@@ -7,27 +7,11 @@
 
 #include "RQ_OBJECT.h"
 
-// FIXME: We should think of a common place to put the mock objects.
-class TQConnectionMock : public TQConnection {
-public:
-   virtual ~TQConnectionMock() {} // gmock requires it for cleanup on shutdown.
-   MOCK_METHOD1(SetArg, void(Long_t param));
-   MOCK_METHOD1(SetArg, void(ULong_t param));
-   MOCK_METHOD1(SetArg, void(Float_t param));
-   MOCK_METHOD1(SetArg, void(Double_t param));
-   MOCK_METHOD1(SetArg, void(Long64_t param));
-   MOCK_METHOD1(SetArg, void(ULong64_t param));
-   MOCK_METHOD1(SetArg, void(const char *param));
-   MOCK_METHOD2(SetArg, void(const Long_t *params, Int_t nparam /* = -1*/));
-
-   MOCK_METHOD0(SendSignal, void());
-
-   // MOCK_METHOD1(SendSignal, void());
-};
-
 #define Stringify(s) Stringifyx(s)
 #define Stringifyx(s) #s
 
+// The interpreter needs to know about RQ_OBJECTTester and using this trick avoids moving this non-reusable class into
+// its own header file.
 #define DICT_CLASS                                                           \
    class RQ_OBJECTTester : public TQObject {                                 \
       /* This will expand, adding signal/slot support to this class */       \