From beec2584c3bff46ae7aa0bf57389fb6dadf33917 Mon Sep 17 00:00:00 2001 From: christian linke Date: Thu, 4 Oct 2012 16:25:51 +0200 Subject: * adding GoogleMock including GoogleTest into the project Signed-off-by: christian linke --- PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h | 2 +- PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h | 2 +- PluginCommandInterfaceDbus/test/CMakeLists.txt | 8 ++++---- PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'PluginCommandInterfaceDbus') diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h index 71b3b35..b92b894 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h @@ -20,7 +20,7 @@ #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" #define UNIT_TEST 1 diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h index fad6b60..1351da4 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h @@ -20,7 +20,7 @@ #define DBUSCOMMANDPLUGININTERFACETEST_H_ #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" #define UNIT_TEST 1 diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt index 41a6aad..148a4ba 100644 --- a/PluginCommandInterfaceDbus/test/CMakeLists.txt +++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt @@ -28,7 +28,7 @@ FIND_PACKAGE(Threads) FIND_PACKAGE(DBUS REQUIRED) FIND_PACKAGE(PkgConfig) FIND_PACKAGE(PythonLibs REQUIRED) -FIND_PACKAGE(GMock REQUIRED) + IF(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) @@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusTest ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} gtest - ${GMOCK_LIBRARY} + gmock ) @@ -92,7 +92,7 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusSignalTest ${CMAKE_THREAD_LIBS_INIT} ${PYTHON_LIBRARY} gtest - ${GMOCK_LIBRARY} + gmock ) INSTALL(TARGETS AmCommandSenderDbusTest @@ -107,6 +107,6 @@ INSTALL(TARGETS AmCommandSenderDbusSignalTest COMPONENT tests ) -SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "gtest" "google-mock" "libpthread-stubs0") +SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "gtest" "libpthread-stubs0") set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}") diff --git a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h index e997f30..0949bf0 100644 --- a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h +++ b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h @@ -20,7 +20,7 @@ #include "command/IAmCommandReceive.h" #include "gtest/gtest.h" -#include +#include "gmock/gmock.h" namespace am { -- cgit v1.2.1