From 7b4ad13452dac45128209d54ebc2e1e83ecd5beb Mon Sep 17 00:00:00 2001 From: Aleksander Donchev Date: Wed, 10 Jul 2013 14:05:44 +0200 Subject: Created an abstract interface for the database handlers. Renamed CAmDatabaseHandler to CAmDatabaseHandlerSQLite and CAmMapHandler to CAmDatabaseHandlerMap. Changed std::map to std::unordered_map. Added to the cmake configuration a definition, which defines the capacity of the source and sink maps. Signed-off-by: Christian Linke --- .../test/AmControlInterfaceTest/CAmControlInterfaceTest.h | 4 ++-- .../test/AmControlInterfaceTest/CMakeLists.txt | 2 +- .../test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h | 4 ++-- .../test/AmDatabaseHandlerTest/CMakeLists.txt | 2 +- .../test/AmMapHandlerTest/CAmMapHandlerTest.h | 4 ++-- AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt | 3 +-- AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h | 4 ++-- AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt | 2 +- AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h | 4 ++-- AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt | 3 +-- .../test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h | 4 ++-- .../test/AmRoutingInterfaceTest/CMakeLists.txt | 2 +- .../test/AmTelnetServerTest/CAmTelnetServerTest.cpp | 2 +- .../test/AmTelnetServerTest/CAmTelnetServerTest.h | 14 ++++++++------ AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) (limited to 'AudioManagerDaemon/test') diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h index b984f80..a65d9fd 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h @@ -24,7 +24,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "CAmDatabaseHandler.h" +#include "CAmDatabaseHandlerSQLite.h" #include "CAmControlReceiver.h" #include "CAmRoutingReceiver.h" #include "CAmDatabaseObserver.h" @@ -52,7 +52,7 @@ public: CAmDbusWrapper* pDBusWrapper; std::vector plistCommandPluginDirs; std::vector plistRoutingPluginDirs; - CAmDatabaseHandler pDatabaseHandler; + CAmDatabaseHandlerSQLite pDatabaseHandler; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; MockIAmControlSend pMockControlInterface; diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt index a6c7234..86f0da2 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB CONTROL_INTERFACE_SRCS_CXX - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerSQLite.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmRoutingSender.cpp" "../../src/CAmRoutingReceiver.cpp" diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h index 25d63a3..b23aba4 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h @@ -26,7 +26,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "CAmDatabaseHandler.h" +#include "CAmDatabaseHandlerSQLite.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -51,7 +51,7 @@ public: std::vector plistRoutingPluginDirs; std::vector plistCommandPluginDirs; CAmSocketHandler pSocketHandler; - CAmDatabaseHandler pDatabaseHandler; + CAmDatabaseHandlerSQLite pDatabaseHandler; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; MockIAmCommandSend pMockInterface; diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index 83e7197..7899588 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -44,7 +44,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB DATABASE_SRCS_CXX - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerSQLite.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmCommandSender.cpp" "../../src/CAmRoutingSender.cpp" diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h index 9720731..f4cb0cf 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.h @@ -26,7 +26,7 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "CAmMapHandler.h" +#include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -51,7 +51,7 @@ public: std::vector plistRoutingPluginDirs; std::vector plistCommandPluginDirs; CAmSocketHandler pSocketHandler; - CAmMapHandler pDatabaseHandler; + CAmDatabaseHandlerMap pDatabaseHandler; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; MockIAmCommandSend pMockInterface; diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt index aa00640..0e081ae 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CMakeLists.txt @@ -44,8 +44,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB DATABASE_SRCS_CXX - "../../src/CAmMapHandler.cpp" - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerMap.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmCommandSender.cpp" "../../src/CAmRoutingSender.cpp" diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h index 352b02e..ead077c 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h +++ b/AudioManagerDaemon/test/AmRouterMapTest/CAmRouterMapTest.h @@ -30,7 +30,7 @@ #include #include #include -#include "CAmMapHandler.h" +#include "CAmDatabaseHandlerMap.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -56,7 +56,7 @@ public: std::vector plistCommandPluginDirs; CAmSocketHandler pSocketHandler; CAmControlSender pControlSender; - CAmMapHandler pDatabaseHandler; + CAmDatabaseHandlerMap pDatabaseHandler; CAmRouter pRouter; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; diff --git a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt index 3667dd0..d587f0c 100644 --- a/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterMapTest/CMakeLists.txt @@ -43,7 +43,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB ROUTINGMAP_SRCS_CXX - "../../src/CAmMapHandler.cpp" + "../../src/CAmDatabaseHandlerMap.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmCommandSender.cpp" "../../src/CAmRoutingSender.cpp" diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h index 93b80db..9ed8f74 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h @@ -30,7 +30,7 @@ #include #include #include -#include "CAmDatabaseHandler.h" +#include "CAmDatabaseHandlerSQLite.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -56,7 +56,7 @@ public: std::vector plistCommandPluginDirs; CAmSocketHandler pSocketHandler; CAmControlSender pControlSender; - CAmDatabaseHandler pDatabaseHandler; + CAmDatabaseHandlerSQLite pDatabaseHandler; CAmRouter pRouter; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index bff2205..6f556ff 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -44,8 +44,7 @@ INCLUDE_DIRECTORIES( ) file(GLOB ROUTING_SRCS_CXX - "../../src/CAmMapHandler.cpp" - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerSQLite.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmCommandSender.cpp" "../../src/CAmRoutingSender.cpp" diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h index 982c9f2..74130e8 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h @@ -27,7 +27,7 @@ #include #include #include -#include "CAmDatabaseHandler.h" +#include "CAmDatabaseHandlerSQLite.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -49,7 +49,7 @@ public: std::vector plistRoutingPluginDirs; std::vector plistCommandPluginDirs; CAmSocketHandler pSocketHandler; - CAmDatabaseHandler pDatabaseHandler; + CAmDatabaseHandlerSQLite pDatabaseHandler; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; CAmControlSender pControlSender; diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 3799151..a73cec0 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -46,7 +46,7 @@ INCLUDE_DIRECTORIES( file(GLOB ROUTING_INTERFACE_SRCS_CXX "../../src/CAmControlReceiver.cpp" - "../../src/CAmDatabaseHandler.cpp" + "../../src/CAmDatabaseHandlerSQLite.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmCommandSender.cpp" "../../src/CAmRoutingSender.cpp" 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" -- cgit v1.2.1