Merge lp:~dobey/unity-scope-click/move-configuration into lp:unity-scope-click/devel

[dobey]

Move the Configuration and test to libclickscope.
Move gmock embedding to top level of the tree.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:259
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/70/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good. +1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-14 21:50:52 +0000
+++ CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -35,6 +35,14 @@
 SET (SCOPE_LIB_UNVERSIONED clickscope)
 SET (SCOPE_LIB_NAME ${SCOPE_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
 
+# Build with system gmock and embedded gtest
+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_CURRENT_BINARY_DIR}/gmock")
+
+# Add our own subdirectories.
 add_subdirectory(autopilot)
 add_subdirectory(libclickscope)
 add_subdirectory(scope)

=== modified file 'libclickscope/CMakeLists.txt'
--- libclickscope/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ libclickscope/CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -1,1 +1,2 @@
 add_subdirectory(click)
+add_subdirectory(tests)

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ libclickscope/click/CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -9,6 +9,7 @@
 )
 
 add_library(${SCOPE_LIB_NAME} STATIC
+  configuration.cpp
   key_file_locator.cpp
 )
 
@@ -16,8 +17,6 @@
   ${JSON_CPP_INCLUDE_DIRS}
 )
 
-qt5_use_modules (${SCOPE_LIB_NAME} Network)
-
 target_link_libraries (${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}

=== renamed file 'scope/click/configuration.cpp' => 'libclickscope/click/configuration.cpp'
=== renamed file 'scope/click/configuration.h' => 'libclickscope/click/configuration.h'
=== added file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -0,0 +1,51 @@
+set (LIBCLICKSCOPE_TESTS_TARGET libclick-scope-tests)
+find_package(Threads)
+
+# Qt5 bits
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+
+find_package(Qt5Core REQUIRED)
+
+include_directories (
+  ${CMAKE_SOURCE_DIR}/libclickscope
+  ${JSON_CPP_INCLUDE_DIRS}
+  ${GTEST_INCLUDE_DIR}
+  ${GMOCK_INCLUDE_DIR}
+)
+
+add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
+  test_configuration.cpp
+)
+
+qt5_use_modules(${LIBCLICKSCOPE_TESTS_TARGET} Core)
+
+target_link_libraries(${LIBCLICKSCOPE_TESTS_TARGET}
+  ${SCOPE_LIB_NAME}
+
+  ${UNITY_SCOPES_LDFLAGS}
+  ${UBUNTUONE_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
+  ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
+  ${JSON_CPP_LDFLAGS}
+
+  gmock
+  gmock_main
+
+  ${CMAKE_THREAD_LIBS_INIT}
+)
+
+add_custom_target (test-libclickscope
+  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)
+
+add_custom_target (test-libclickscope-valgrind
+  COMMAND valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)
+
+add_custom_target (test-libclickscope-leaks
+  COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
+  DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
+)

=== renamed file 'scope/tests/test_configuration.cpp' => 'libclickscope/tests/test_configuration.cpp'
=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-05-13 19:32:29 +0000
+++ scope/click/CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -9,7 +9,6 @@
 )
 
 add_library(${SCOPE_LIB_UNVERSIONED} SHARED
-  configuration.cpp
   download-manager.cpp
   index.cpp
   interface.cpp
@@ -35,7 +34,6 @@
 qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network)
 
 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
-  -L${CMAKE_BINARY_DIR}/libclickscope
   ${SCOPE_LIB_NAME}
   ${JSON_CPP_LDFLAGS}
   ${UNITY_SCOPES_LDFLAGS}

=== modified file 'scope/click/index.h'
--- scope/click/index.h	2014-05-19 14:42:36 +0000
+++ scope/click/index.h	2014-05-19 14:42:36 +0000
@@ -34,7 +34,8 @@
 #include <string>
 #include <functional>
 
-#include "configuration.h"
+#include <click/configuration.h>
+
 #include "package.h"
 #include "webclient.h"
 

=== modified file 'scope/click/webclient.cpp'
--- scope/click/webclient.cpp	2014-05-13 15:34:17 +0000
+++ scope/click/webclient.cpp	2014-05-19 14:42:36 +0000
@@ -30,7 +30,8 @@
 #include <QBuffer>
 #include <QDebug>
 
-#include "configuration.h"
+#include <click/configuration.h>
+
 #include "webclient.h"
 #include "smartconnect.h"
 

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-05-14 21:50:52 +0000
+++ scope/tests/CMakeLists.txt	2014-05-19 14:42:36 +0000
@@ -1,13 +1,6 @@
 set (CLICKSCOPE_TESTS_TARGET click-scope-tests)
 find_package(Threads)
 
-# Build with system gmock and embedded gtest
-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_CURRENT_BINARY_DIR}/gmock")
-
 # Qt5 bits
 SET (CMAKE_INCLUDE_CURRENT_DIR ON)
 SET (CMAKE_AUTOMOC ON)
@@ -27,7 +20,6 @@
 add_executable (${CLICKSCOPE_TESTS_TARGET}
   mock_network_access_manager.h
   mock_webclient.h
-  test_configuration.cpp
   test_download_manager.cpp
   test_index.cpp
   test_interface.cpp
@@ -43,6 +35,7 @@
 
 target_link_libraries(${CLICKSCOPE_TESTS_TARGET}
   ${SCOPE_LIB_UNVERSIONED}
+  ${SCOPE_LIB_NAME}
 
   ${UNITY_SCOPES_LDFLAGS}
   ${UBUNTUONE_LDFLAGS}