diff options
Diffstat (limited to 'AudioManagerDaemon/test/AmTelnetServerTest')
3 files changed, 11 insertions, 9 deletions
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index 429ceda..bc09eac 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -55,7 +55,7 @@ CAmEnvironment::CAmEnvironment() , mlistCommandPluginDirs() , mSocketHandler() #ifdef WITH_DATABASE_STORAGE -, mDatabasehandler(std::string(":memory:")) +, mpDatabasehandler(std::string(":memory:")) #else , mDatabasehandler() #endif diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index 5a03ba7..db2200f 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -24,19 +24,21 @@ #include "gtest/gtest.h" #include "CAmTelnetServer.h" -#include "CAmDatabaseHandler.h" -#include "CAmMapHandler.h" #include "CAmRoutingSender.h" #include "CAmCommandSender.h" #include "CAmControlSender.h" #include "CAmRouter.h" +#include "IAmDatabaseHandler.h" +#ifdef WITH_DATABASE_STORAGE + #include "CAmDatabaseHandlerSQLite.h" +#else + #include "CAmDatabaseHandlerMap.h" +#endif namespace am { class CAmSocketHandler; -class CAmDatabaseHandler; -class CAmMapHandler; class CAmRoutingSender; class CAmCommandSender; class CAmControlSender; @@ -67,9 +69,9 @@ class CAmEnvironment : public ::testing::Environment CAmSocketHandler mSocketHandler; #ifdef WITH_DATABASE_STORAGE - CAmDatabaseHandler mDatabasehandler; + CAmDatabaseHandlerSQLite mDatabasehandler; #else - CAmMapHandler mDatabasehandler; + CAmDatabaseHandlerMap mDatabasehandler; #endif CAmRoutingSender mRoutingSender; CAmCommandSender mCommandSender; diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index b2981eb..6c20e4e 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -54,8 +54,8 @@ file(GLOB TELNET_SRCS_CXX "../../src/CAmCommandSender.cpp" "../../src/CAmControlReceiver.cpp" "../../src/CAmControlSender.cpp" - "../../src/CAmMapHandler.cpp" - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerMap.cpp" + "../../src/CAmDatabaseHandlerSQLite.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmRoutingReceiver.cpp" "../../src/CAmRoutingSender.cpp" |