summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/test
diff options
context:
space:
mode:
authorchristian linke <christian.linke@bmw.de>2012-10-04 16:25:51 +0200
committerchristian linke <christian.linke@bmw.de>2012-10-04 16:25:51 +0200
commitbeec2584c3bff46ae7aa0bf57389fb6dadf33917 (patch)
tree735070d1d73cd80b2624372d6cf5fc036a16d713 /AudioManagerDaemon/test
parentfee37213648f86ca4fd13ed063182e2ce877aacf (diff)
downloadaudiomanager-beec2584c3bff46ae7aa0bf57389fb6dadf33917.tar.gz
* adding GoogleMock including GoogleTest into the project
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test')
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h2
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt7
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h2
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt8
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h2
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt8
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h2
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt8
-rw-r--r--AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt8
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt8
-rw-r--r--AudioManagerDaemon/test/MockIAmCommandSend.h2
-rw-r--r--AudioManagerDaemon/test/MockIAmControlSend.h2
-rw-r--r--AudioManagerDaemon/test/MockIAmRoutingSend.h2
13 files changed, 30 insertions, 31 deletions
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
index 5f22135..b984f80 100644
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
@@ -22,7 +22,7 @@
#define ROUTINGINTERFACETEST_H_
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
#include "CAmDatabaseHandler.h"
#include "CAmControlReceiver.h"
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
index e9ae672..8d4b2e9 100644
--- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
@@ -21,7 +21,6 @@ PROJECT(AmControlInterfaceTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
-FIND_PACKAGE(GMock REQUIRED)
FIND_PACKAGE(PkgConfig)
pkg_check_modules(SQLITE REQUIRED sqlite3)
@@ -67,10 +66,10 @@ TARGET_LINK_LIBRARIES(AmControlInterfaceTest
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmControlInterfaceTest gtest)
+ADD_DEPENDENCIES(AmControlInterfaceTest gtest gmock)
INSTALL(TARGETS AmControlInterfaceTest
DESTINATION "~/AudioManagerTest/"
@@ -78,7 +77,7 @@ INSTALL(TARGETS AmControlInterfaceTest
COMPONENT tests
)
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
index bef4be5..25d63a3 100644
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
@@ -24,7 +24,7 @@
#define UNIT_TEST 1
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
#include "CAmDatabaseHandler.h"
#include "CAmControlReceiver.h"
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
index 3dc374f..184a50d 100644
--- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
@@ -21,7 +21,7 @@ PROJECT(AmDatabaseHandlerTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
-FIND_PACKAGE(GMock REQUIRED)
+
FIND_PACKAGE(PkgConfig)
pkg_check_modules(SQLITE REQUIRED sqlite3)
@@ -67,10 +67,10 @@ TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest)
+ADD_DEPENDENCIES(AmDatabaseHandlerTest gtest gmock)
INSTALL(TARGETS AmDatabaseHandlerTest
DESTINATION "~/AudioManagerTest/"
@@ -78,6 +78,6 @@ INSTALL(TARGETS AmDatabaseHandlerTest
COMPONENT tests
)
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h
index ca9633b..ea7cd92 100644
--- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h
+++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h
@@ -24,7 +24,7 @@
#define UNIT_TEST 1
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
#include <algorithm>
#include <string>
diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
index 822e5bd..aae97e5 100644
--- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
@@ -21,7 +21,7 @@ PROJECT(AmRouterTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
-FIND_PACKAGE(GMock REQUIRED)
+
FIND_PACKAGE(PkgConfig)
pkg_check_modules(SQLITE REQUIRED sqlite3)
@@ -67,10 +67,10 @@ TARGET_LINK_LIBRARIES( AmRouterTest
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmRouterTest gtest)
+ADD_DEPENDENCIES(AmRouterTest gtest gmock)
INSTALL(TARGETS AmRouterTest
DESTINATION "~/AudioManagerTest/"
@@ -78,6 +78,6 @@ INSTALL(TARGETS AmRouterTest
COMPONENT tests
)
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
index c8c2180..982c9f2 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
@@ -22,7 +22,7 @@
#define ROUTINGINTERFACETEST_H_
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
#include <algorithm>
#include <string>
#include <vector>
diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
index 045aee1..5b903b5 100644
--- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
@@ -22,7 +22,7 @@ PROJECT(AmRoutingInterfaceTest)
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
-FIND_PACKAGE(GMock REQUIRED)
+
FIND_PACKAGE(PkgConfig)
pkg_check_modules(SQLITE REQUIRED sqlite3)
@@ -68,10 +68,10 @@ TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest)
+ADD_DEPENDENCIES(AmRoutingInterfaceTest gtest gmock)
INSTALL(TARGETS AmRoutingInterfaceTest
DESTINATION "~/AudioManagerTest/"
@@ -79,7 +79,7 @@ INSTALL(TARGETS AmRoutingInterfaceTest
COMPONENT tests
)
-SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
index dc1df5d..26d8299 100644
--- a/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
@@ -28,7 +28,7 @@ set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include)
set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
-FIND_PACKAGE(GMock REQUIRED)
+
FIND_PACKAGE(PkgConfig)
IF(WITH_DLT)
@@ -62,10 +62,10 @@ TARGET_LINK_LIBRARIES(AmSocketHandlerTest
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmSocketHandlerTest gtest)
+ADD_DEPENDENCIES(AmSocketHandlerTest gtest gmock)
INSTALL(TARGETS AmSocketHandlerTest
DESTINATION "~/AudioManagerTest/"
@@ -73,7 +73,7 @@ INSTALL(TARGETS AmSocketHandlerTest
COMPONENT tests
)
-SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
index aa5b254..b2c44a9 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
@@ -28,7 +28,7 @@ set(AUDIO_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../include)
set(DBUS_INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
set(INCLUDE_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
-FIND_PACKAGE(GMock REQUIRED)
+
FIND_PACKAGE(PkgConfig)
IF(WITH_DLT)
@@ -75,10 +75,10 @@ TARGET_LINK_LIBRARIES(AmTelnetServerTest
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_THREAD_LIBS_INIT}
gtest
- ${GMOCK_LIBRARY}
+ gmock
)
-ADD_DEPENDENCIES(AmTelnetServerTest gtest)
+ADD_DEPENDENCIES(AmTelnetServerTest gtest gmock)
INSTALL(TARGETS AmTelnetServerTest
DESTINATION "~/AudioManagerTest/"
@@ -86,7 +86,7 @@ INSTALL(TARGETS AmTelnetServerTest
COMPONENT tests
)
-SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "google-mock" "libpthread-stubs0")
+SET(ADD_DEPEND "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libpthread-stubs0")
set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h
index a9fcbaf..11c1992 100644
--- a/AudioManagerDaemon/test/MockIAmCommandSend.h
+++ b/AudioManagerDaemon/test/MockIAmCommandSend.h
@@ -23,7 +23,7 @@
#include "command/IAmCommandSend.h"
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
namespace am {
diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h
index f3121fe..7f51ab0 100644
--- a/AudioManagerDaemon/test/MockIAmControlSend.h
+++ b/AudioManagerDaemon/test/MockIAmControlSend.h
@@ -23,7 +23,7 @@
#include "control/IAmControlSend.h"
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
namespace am {
diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h
index a9e1746..0534e41 100644
--- a/AudioManagerDaemon/test/MockIAmRoutingSend.h
+++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h
@@ -23,7 +23,7 @@
#include "routing/IAmRoutingSend.h"
#include "gtest/gtest.h"
-#include <gmock/gmock.h>
+#include "gmock/gmock.h"
namespace am {