diff options
| author | Aleksander Donchev <aleksander.donchev@partner.bmw.de> | 2013-07-08 11:27:30 +0200 |
|---|---|---|
| committer | Aleksander Donchev <aleksander.donchev@partner.bmw.de> | 2013-07-10 14:59:18 +0200 |
| commit | de452ebdcfe9ca3cd3b2467c3e25960e7a58e49e (patch) | |
| tree | f210a063672aa5a8abc2a54fe3c78ddaf9dd625a /AudioManagerDaemon/test/AmRouterTest | |
| parent | e18331e64352b881268ca6f8db1d127113dd1519 (diff) | |
| download | audiomanager-de452ebdcfe9ca3cd3b2467c3e25960e7a58e49e.tar.gz | |
Added 'Dump' method to the database handler and to the telnet server (Info -> Dump). Unit tests for the database handler splited into separate file. Base log class added in order to support logging into a file.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test/AmRouterTest')
| -rw-r--r-- | AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp | 9 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h | 10 |
2 files changed, 1 insertions, 18 deletions
diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp index dd06384..46f9577 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp @@ -30,11 +30,7 @@ CAmRouterTest::CAmRouterTest() : plistCommandPluginDirs(), // pSocketHandler(), // pControlSender(), // -#ifdef WITH_DATABASE_STORAGE pDatabaseHandler(std::string(":memory:")), -#else - pDatabaseHandler(), -#endif pRouter(&pDatabaseHandler, &pControlSender), // pRoutingSender(plistRoutingPluginDirs), // pCommandSender(plistCommandPluginDirs), // @@ -59,11 +55,6 @@ CAmRouterTest::~CAmRouterTest() void CAmRouterTest::SetUp() { logInfo("Routing Test started "); -#ifdef WITH_DATABASE_STORAGE - printf("\n WITH_DATABASE_STORAGE = 1 \n"); -#else - printf("\n WITH_DATABASE_STORAGE = 0 \n"); -#endif } void CAmRouterTest::TearDown() diff --git a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h index 951eed5..93b80db 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h +++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h @@ -30,11 +30,7 @@ #include <string> #include <vector> #include <set> -#ifdef WITH_DATABASE_STORAGE - #include "CAmDatabaseHandler.h" -#else - #include "CAmMapHandler.h" -#endif +#include "CAmDatabaseHandler.h" #include "CAmControlReceiver.h" #include "CAmControlSender.h" #include "CAmDatabaseObserver.h" @@ -60,11 +56,7 @@ public: std::vector<std::string> plistCommandPluginDirs; CAmSocketHandler pSocketHandler; CAmControlSender pControlSender; -#ifdef WITH_DATABASE_STORAGE CAmDatabaseHandler pDatabaseHandler; -#else - CAmMapHandler pDatabaseHandler; -#endif CAmRouter pRouter; CAmRoutingSender pRoutingSender; CAmCommandSender pCommandSender; |