2 files changed, 3 insertions, 6 deletions
diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index 9c09deb..27ed2b6 100644
--- a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
+++ b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -51,7 +51,7 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() :
         plistRoutingPluginDirs(), //
         pDatabaseHandler(), //
         pRoutingSender(plistRoutingPluginDirs,dynamic_cast<IAmDatabaseHandler*>( &pDatabaseHandler )), //RoutingReceiver
-        pCommandSender(plistCommandPluginDirs), //
+        pCommandSender(plistCommandPluginDirs, &pSocketHandler), //
         pMockControlInterface(), //
         pMockRoutingInterface(), //
         pRoutingInterfaceBackdoor(), //
@@ -59,11 +59,11 @@ CAmControlInterfaceTest::CAmControlInterfaceTest() :
         pControlInterfaceBackdoor(), //
         pControlSender(), //
         pRouter(&pDatabaseHandler,&pControlSender), //
-        pDatabaseObserver(&pCommandSender, &pRoutingSender, &pSocketHandler), //
         pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender, &pSocketHandler, &pRouter), //
         pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, &pSocketHandler)
 {
-    pDatabaseHandler.registerObserver(&pDatabaseObserver);
+    pDatabaseHandler.registerObserver(&pRoutingSender);
+    pDatabaseHandler.registerObserver(&pCommandSender);
     pControlInterfaceBackdoor.replaceController(&pControlSender, &pMockControlInterface);
     pRoutingInterfaceBackdoor.injectInterface(&pRoutingSender, &pMockRoutingInterface, "mock");
 
diff --git a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.h b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
index 3e645fb..9ebcec7 100644
--- a/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
+++ b/AudioManagerCore/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
@@ -26,11 +26,9 @@
 #include "gtest/gtest.h"
 #include "gmock/gmock.h"
 
-//#include "CAmDatabaseHandlerSQLite.h"
 #include "CAmDatabaseHandlerMap.h"
 #include "CAmControlReceiver.h"
 #include "CAmRoutingReceiver.h"
-#include "CAmDatabaseObserver.h"
 #include "CAmControlSender.h"
 #include "CAmRoutingSender.h"
 #include "CAmRouter.h"
@@ -65,7 +63,6 @@ public:
     IAmControlBackdoor pControlInterfaceBackdoor;
     CAmControlSender pControlSender;
     CAmRouter pRouter;
-    CAmDatabaseObserver pDatabaseObserver;
     CAmControlReceiver pControlReceiver;
     CAmRoutingReceiver pRoutingReceiver;
     CAmCommonFunctions pCF;