diff options
| author | Christian Linke <christian.linke@bmw.de> | 2014-11-03 08:44:18 +0100 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-11-03 18:37:32 +0100 |
| commit | 6737f225604b116185225c6647a2c59f1b03ae24 (patch) | |
| tree | a7de365e6598fb679ef06669f29bf9da72c0b4bc /AudioManagerDaemon/test/AmControlInterfaceTest | |
| parent | bfd958452e5005a8a7a484afdfa3b1065e1e0c82 (diff) | |
| download | audiomanager-6737f225604b116185225c6647a2c59f1b03ae24.tar.gz | |
* Make Audiomanager compile without sqlite
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test/AmControlInterfaceTest')
3 files changed, 8 insertions, 5 deletions
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index 5448c7d..2dd059f 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -35,7 +35,7 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() : pDBusWrapper((CAmDbusWrapper*) 1), // plistCommandPluginDirs(), // plistRoutingPluginDirs(), // - pDatabaseHandler(std::string(":memory:")), // + pDatabaseHandler(), // pRoutingSender(plistRoutingPluginDirs), //RoutingReceiver pCommandSender(plistCommandPluginDirs), // pMockControlInterface(), // diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index a65d9fd..861b9ac 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -24,7 +24,8 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "CAmDatabaseHandlerSQLite.h" +//#include "CAmDatabaseHandlerSQLite.h" +#include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmRoutingReceiver.h" #include "CAmDatabaseObserver.h" @@ -52,7 +53,7 @@ public: CAmDbusWrapper* pDBusWrapper; std::vector<std::string> plistCommandPluginDirs; std::vector<std::string> plistRoutingPluginDirs; - CAmDatabaseHandlerSQLite pDatabaseHandler; + CAmDatabaseHandlerMap pDatabaseHandler; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; MockIAmControlSend pMockControlInterface; diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index 80bfa90..a2238b1 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -22,7 +22,9 @@ PROJECT(AmControlInterfaceTest) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager") FIND_PACKAGE(PkgConfig) -pkg_check_modules(SQLITE REQUIRED sqlite3) +IF(WITH_DATABASE_STORAGE) + pkg_check_modules(SQLITE REQUIRED sqlite3) +ENDIF(WITH_DATABASE_STORAGE) IF(WITH_DLT) pkg_check_modules(DLT REQUIRED automotive-dlt>=2.2.0) @@ -43,7 +45,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../../src/CAmDatabaseHandlerSQLite.cpp" + "../../src/CAmDatabaseHandlerMap.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmRoutingSender.cpp" "../../src/CAmRoutingReceiver.cpp" |