Merge lp:~ken-vandine/content-hub/gtest_1_8 into lp:content-hub

[Ken VanDine]

Fix build failure on zesty due to googletest 1.8. Also refactored tests/acceptance-tests/CMakeLists.txt to make adding tests less cumbersome.

Fix build failure on zesty due to googletest 1.8. Also refactored tests/acceptance-tests/CMakeLists.txt to make adding tests less cumbersome.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:308
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/108/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/2067/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2070
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1900/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1900/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/1900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/1900/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1900
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1900/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1900/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/1900/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-content-hub-ci/108/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-23 20:17:57 +0000
+++ CMakeLists.txt	2016-11-28 17:37:05 +0000
@@ -52,6 +52,8 @@
   SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
 
+find_package(Gtest REQUIRED)
+include_directories(${GMOCK_INCLUDE_DIR} ${GTEST_INCLUDE_DIR})
 enable_testing()
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

=== added file 'cmake/FindGtest.cmake'
--- cmake/FindGtest.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGtest.cmake	2016-11-28 17:37:05 +0000
@@ -0,0 +1,67 @@
+include(ExternalProject)
+include(FindPackageHandleStandardArgs)
+
+#gtest
+if (EXISTS /usr/src/googletest)
+    set (USING_GOOGLETEST_1_8 TRUE)
+    set (GTEST_INSTALL_DIR /usr/src/googletest/googletest/include)
+else()
+    set(GTEST_INSTALL_DIR /usr/src/gmock/gtest/include)
+endif()
+find_path(GTEST_INCLUDE_DIR gtest/gtest.h
+            HINTS ${GTEST_INSTALL_DIR})
+
+#gmock
+find_path(GMOCK_INSTALL_DIR CMakeLists.txt
+          HINTS /usr/src/googletest /usr/src/gmock)
+if(${GMOCK_INSTALL_DIR} STREQUAL "GMOCK_INSTALL_DIR-NOTFOUND")
+    message(FATAL_ERROR "google-mock package not found")
+endif()
+
+find_path(GMOCK_INCLUDE_DIR gmock/gmock.h)
+
+if (USING_GOOGLETEST_1_8)
+  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
+  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR}/googlemock)
+  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
+else()
+  set(GMOCK_BASE_BINARY_DIR ${CMAKE_BINARY_DIR}/gmock/libs)
+  set(GMOCK_BINARY_DIR ${GMOCK_BASE_BINARY_DIR})
+  set(GTEST_BINARY_DIR ${GMOCK_BINARY_DIR}/gtest)
+endif()
+
+set(GTEST_CMAKE_ARGS "")
+if (${MIR_IS_CROSS_COMPILING})
+    set(GTEST_CMAKE_ARGS
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_MODULE_PATH}/LinuxCrossCompile.cmake)
+endif()
+
+if (USING_GOOGLETEST_1_8)
+  list(APPEND GTEST_CMAKE_ARGS -DBUILD_GTEST=ON)
+endif()
+
+ExternalProject_Add(
+    GMock
+    #where to build in source tree
+    PREFIX ${GMOCK_PREFIX}
+    #where the source is external to the project
+    SOURCE_DIR ${GMOCK_INSTALL_DIR}
+    #forward the compilers to the subproject so cross-arch builds work
+    CMAKE_ARGS ${GTEST_CMAKE_ARGS}
+    BINARY_DIR ${GMOCK_BASE_BINARY_DIR}
+
+    #we don't need to install, so skip
+    INSTALL_COMMAND ""
+)
+
+set(GMOCK_LIBRARY ${GMOCK_BINARY_DIR}/libgmock.a)
+set(GMOCK_MAIN_LIBRARY ${GMOCK_BINARY_DIR}/libgmock_main.a)
+set(GMOCK_BOTH_LIBRARIES ${GMOCK_LIBRARY} ${GMOCK_MAIN_LIBRARY})
+set(GTEST_LIBRARY ${GTEST_BINARY_DIR}/libgtest.a)
+set(GTEST_MAIN_LIBRARY ${GTEST_BINARY_DIR}/libgtest_main.a)
+set(GTEST_BOTH_LIBRARIES ${GTEST_LIBRARY} ${GTEST_MAIN_LIBRARY})
+set(GTEST_ALL_LIBRARIES ${GTEST_BOTH_LIBRARIES} ${GMOCK_BOTH_LIBRARIES})
+
+find_package_handle_standard_args(GTest  DEFAULT_MSG
+                                    GMOCK_INCLUDE_DIR
+                                    GTEST_INCLUDE_DIR)

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-09-23 14:45:09 +0000
+++ tests/CMakeLists.txt	2016-11-28 17:37:05 +0000
@@ -14,15 +14,8 @@
 #
 # Authored by: Thomas Voss <[e-mail]>
 
-# 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_definitions(-DQT_NO_KEYWORDS)
 
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
-
 include_directories (
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_SOURCE_DIR}/src/com/ubuntu/content

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2016-11-23 14:27:28 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2016-11-28 17:37:05 +0000
@@ -14,54 +14,52 @@
 #
 # Authored by: Thomas Voss <[e-mail]>
 
+project(test CXX C)
 qt5_wrap_cpp(MOCS test_harness.h)
 
-add_executable(
+set(TESTS
   app_hub_communication_default_source
-  app_hub_communication_default_source.cpp
-  ${MOCS}
-)
-
-add_executable(
   app_hub_communication_known_sources
-  app_hub_communication_known_sources.cpp
-  ${MOCS}
-)
-
-add_executable(
   app_hub_communication_stores
-  app_hub_communication_stores.cpp
-  ${MOCS}
-)
-
-add_executable(
   app_hub_communication_transfer
-  app_hub_communication_transfer.cpp
-  ${MOCS}
-)
-
-add_executable(
   app_hub_communication_paste
-  app_hub_communication_paste.cpp
-  ${MOCS}
-)
-
-add_executable(
   app_hub_communication_handler
-  app_hub_communication_handler.cpp
-  ${MOCS}
-  transfer_files
-)
-
-add_executable(
   test_utils
-  test_utils.cpp
-)
-
-add_executable(
   test_types
-  test_types.cpp
-)
+  mimedata_test
+)
+
+set(TEST_LIBS
+  ${GMOCK_LIBRARY}
+  ${GTEST_BOTH_LIBRARIES}
+  content-hub
+)
+
+foreach(test ${TESTS})
+  # set the sources per test
+  set(${test}_SOURCES
+    ${test}.cpp
+    ${MOCS}
+    transfer_files
+  )
+endforeach(test)
+
+foreach(test ${TESTS})
+  # set targets, linked libs and test
+  add_executable(${test}
+    ${${test}_SOURCES}
+  )
+  qt5_use_modules(${test} Core Gui DBus Test)
+
+  target_link_libraries(${test}
+    ${TEST_LIBS}
+  )
+
+  add_test(NAME ${test} COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/${test})
+
+  SET_TESTS_PROPERTIES(${test}
+    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
+endforeach(test)
 
 add_executable(
   test_hook
@@ -74,65 +72,12 @@
   source_all.json
 )
 
-add_executable(
-  mimedata_test
-  mimedata_test.cpp
-  ${MOCS}
-)
-
-qt5_use_modules(app_hub_communication_default_source Core Gui DBus Test)
-qt5_use_modules(app_hub_communication_known_sources Core Gui DBus Test)
-qt5_use_modules(app_hub_communication_stores Core Gui DBus Test)
-qt5_use_modules(app_hub_communication_transfer Core Gui DBus Test)
-qt5_use_modules(app_hub_communication_paste Core Gui DBus Test)
-qt5_use_modules(app_hub_communication_handler Core Gui DBus Test)
-qt5_use_modules(test_utils Core Test)
 qt5_use_modules(test_hook Core Gui DBus Test)
-qt5_use_modules(mimedata_test Core Test)
-
-target_link_libraries(app_hub_communication_stores content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_default_source content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_known_sources content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_stores content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_transfer content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_paste content-hub gmock gtest gtest_main)
-target_link_libraries(app_hub_communication_handler content-hub gmock gtest gtest_main)
-target_link_libraries(test_utils content-hub gmock gtest gtest_main)
-target_link_libraries(test_types content-hub gmock gtest gtest_main)
-target_link_libraries(test_hook content-hub gmock gtest gtest_main ${GSETTINGS_LDFLAGS})
-target_link_libraries(mimedata_test content-hub gmock gtest gtest_main)
-
-add_test(NAME app_hub_communication_default_source COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_default_source)
-add_test(NAME app_hub_communication_known_sources COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_known_sources)
-add_test(NAME app_hub_communication_stores COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_stores)
-add_test(NAME app_hub_communication_transfer COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_transfer)
-add_test(NAME app_hub_communication_paste COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_paste)
-add_test(NAME app_hub_communication_handler COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/app_hub_communication_handler)
-add_test(NAME test_utils COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/test_utils)
-add_test(NAME test_types COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/test_types)
+target_link_libraries(test_hook content-hub ${GTEST_ALL_LIBRARIES} ${GSETTINGS_LDFLAGS})
 add_test(NAME test_hook COMMAND dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/test_hook)
-add_test(NAME mimedata_test COMMAND mimedata_test)
 
-SET_TESTS_PROPERTIES(app_hub_communication_stores
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(app_hub_communication_default_source
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(app_hub_communication_known_sources
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(app_hub_communication_transfer
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(app_hub_communication_paste
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(app_hub_communication_handler
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(test_utils
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(test_types
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
 SET_TESTS_PROPERTIES(test_hook
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
-SET_TESTS_PROPERTIES(mimedata_test
-    PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
+  PROPERTIES ENVIRONMENT "CONTENT_HUB_TESTING=1")
 
 set_target_properties(
   test_hook