* [ GAM-4 ] Change Database Obsever notification implementation working, test are not ready yet. This implies that the Sockethandler is mandatory so I removed the cmake options.

2 files changed, 31 insertions, 14 deletions

diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
index c479004..61f11a0 100644
--- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
@@ -28,11 +28,26 @@
 #include <vector>
 #include <set>
 #include "DLTWrapper.h"
+#include <dbus/DBusWrapper.h>
+#include "MockInterfaces.h"
+#include "DatabaseHandler.h"
+#include "ControlReceiver.h"
+#include "RoutingReceiver.h"
+#include "DatabaseObserver.h"
+#include "ControlSender.h"
+#include "RoutingSender.h"
+#include "SocketHandler.h"
+#include "Router.h"
+#include "../RoutingInterfaceBackdoor.h"
+#include "../CommandInterfaceBackdoor.h"
+#include "../ControlInterfaceBackdoor.h"
+#include "../CommonFunctions.h"
 
 using namespace am;
 using namespace testing;
 
 controlInterfaceTest::controlInterfaceTest() :
+        pSocketHandler(), //
         pDBusWrapper((DBusWrapper*) 1), //
         plistCommandPluginDirs(), //
         plistRoutingPluginDirs(), //
@@ -46,7 +61,7 @@ controlInterfaceTest::controlInterfaceTest() :
         pControlInterfaceBackdoor(), //
         pControlSender(std::string("")), //
         pRouter(&pDatabaseHandler,&pControlSender), //
-        pDatabaseObserver(&pCommandSender, &pRoutingSender), //
+        pDatabaseObserver(&pCommandSender, &pSocketHandler, &pRoutingSender), //
         pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender,&pRouter), //
         pRoutingReceiver(&pDatabaseHandler, &pRoutingSender, &pControlSender, pDBusWrapper)
 {
diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h
index 7eb182d..864f072 100644
--- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h
+++ b/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h
@@ -27,19 +27,20 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <dbus/DBusWrapper.h>
-#include "MockInterfaces.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "RoutingReceiver.h"
-#include "DatabaseObserver.h"
-#include "ControlSender.h"
-#include "RoutingSender.h"
-#include "Router.h"
-#include "../RoutingInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../ControlInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
+
+class DatbaseHandler;
+class SocketHandler;
+class RoutingSender;
+class CommandSender;
+class RoutingInterfaceBackdoor;
+class CommandInterfaceBackdoor;
+class ControlSender;
+class Router;
+class DatabaseObserver;
+class ControlReceiver;
+class RoutingReceiver;
+class CommonFunctions;
+
 
 namespace am
 {
@@ -49,6 +50,7 @@ class controlInterfaceTest: public ::testing::Test
 public:
     controlInterfaceTest();
     ~controlInterfaceTest();
+    SocketHandler pSocketHandler;
     DBusWrapper* pDBusWrapper;
     std::vector<std::string> plistCommandPluginDirs;
     std::vector<std::string> plistRoutingPluginDirs;