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 <christian.linke@bmw.de>

1 files changed, 8 insertions, 6 deletions

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;