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;