When a new device appears to ADB, prompt the user whether or not to allow the connection.

Approved by: PS Jenkins bot, Charles Kerr, Xavi Garcia

1 files changed, 28 insertions, 28 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 054a676..7be2acd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,35 +1,35 @@
-include(FindGMock)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${GMOCK_INCLUDE_DIRS})
-include_directories(${GTEST_INCLUDE_DIRS})
+set(CMAKE_AUTOMOC ON)
+find_package(GMock REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5DBus COMPONENTS Qt5DBusMacros REQUIRED)
 
-# build libgtest
-#add_library (gtest STATIC 
-#             ${GTEST_SOURCE_DIR}/gtest-all.cc 
-#             ${GTEST_SOURCE_DIR}/gtest_main.cc)
-#set_target_properties (gtest PROPERTIES INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES} ${GTEST_INCLUDE_DIR})
-#set_target_properties (gtest PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS} -w)
+pkg_check_modules(TEST_DEPS
+    libqtdbustest-1 REQUIRED
+    libqtdbusmock-1 REQUIRED
+)
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-  # turn off the warnings that break Google Test
-  set (CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wno-global-constructors -Wno-weak-vtables -Wno-undef -Wno-c++98-compat-pedantic -Wno-missing-noreturn -Wno-used-but-marked-unused -Wno-padded -Wno-deprecated -Wno-sign-compare -Wno-shift-sign-overflow")
-endif()
+include_directories(SYSTEM
+    ${DBUSTEST_INCLUDE_DIRS}
+    ${TEST_DEPS_INCLUDE_DIRS}
+    ${GTEST_INCLUDE_DIRS}
+    ${GMOCK_INCLUDE_DIRS}
+)
 
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -g ${CXX_WARNING_ARGS}")
+list(APPEND CTEST_ENVIRONMENT
+    G_MESSAGES_DEBUG=all
+    G_DBUS_DEBUG=call,signal,return,message
+)
 
-# look for headers in our src dir, and also in the directories where we autogenerate files...
-include_directories (${CMAKE_SOURCE_DIR}/src)
-include_directories (${CMAKE_CURRENT_BINARY_DIR})
-include_directories (${DBUSTEST_INCLUDE_DIRS})
+# turn off the warnings that break Google Test
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    list(APPEND CXX_WARNING_ARGS -Wno-global-constructors -Wno-weak-vtables)
+endif()
 
-function(add_test_by_name name)
-  set (TEST_NAME ${name})
-  add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
-  add_test (${TEST_NAME} ${TEST_NAME})
-  add_dependencies (${TEST_NAME} libindicatordisplayservice)
-  target_link_libraries (${TEST_NAME} indicatordisplayservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
-endfunction()
-add_test_by_name(test-rotation-lock)
+add_compile_options(${CXX_WARNING_ARGS})
 
-add_test (cppcheck cppcheck --enable=all -q --error-exitcode=2 --inline-suppr -I${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr -I${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
 
+add_subdirectory(integration)
+add_subdirectory(unit)
+add_subdirectory(utils)