Audiomanagerhandling of signals in excalibur release incorrect, TelnetServer fix unit test

Signed-off-by: Goehring <Thomas.Goehring@continental-corporation.com>

4 files changed, 18 insertions, 10 deletions

diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
index ebc3705..96c072e 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
@@ -58,8 +58,8 @@ CAmEnvironment::CAmEnvironment()
 , mDatabasehandler(std::string(":memory:"))
 , mRoutingSender(mlistRoutingPluginDirs)
 , mCommandSender(mlistRoutingPluginDirs)
-, mControlSender(controllerPlugin)
-, mRouter(&mDatabasehandler,&mControlSender)
+, mpControlSender(NULL)
+, mpRouter(NULL)
 , mpCommandReceiver(NULL)
 , mpRoutingReceiver(NULL)
 , mpControlReceiver(NULL)
@@ -98,20 +98,23 @@ void CAmEnvironment::setSocketHandler(CAmSocketHandler* pSocketHandler)
 
     if(NULL != pSocketHandler)
     {
-        mpCommandReceiver = new CAmCommandReceiver(&mDatabasehandler,&mControlSender,mpSocketHandler);
-        mpRoutingReceiver = new CAmRoutingReceiver(&mDatabasehandler,&mRoutingSender,&mControlSender,mpSocketHandler);
-        mpControlReceiver = new CAmControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,&mRouter);
+    	mpControlSender = new CAmControlSender(controllerPlugin,mpSocketHandler);
+    	mpRouter = new CAmRouter(&mDatabasehandler,mpControlSender);
+
+        mpCommandReceiver = new CAmCommandReceiver(&mDatabasehandler,mpControlSender,mpSocketHandler);
+        mpRoutingReceiver = new CAmRoutingReceiver(&mDatabasehandler,&mRoutingSender,mpControlSender,mpSocketHandler);
+        mpControlReceiver = new CAmControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,mpRouter);
 
         //startup all the Plugins and Interfaces
-        mControlSender.startupController(mpControlReceiver);
+        mpControlSender->startupController(mpControlReceiver);
         mCommandSender.startupInterfaces(mpCommandReceiver);
         mRoutingSender.startupInterfaces(mpRoutingReceiver);
 
         //when the routingInterface is done, all plugins are loaded:
-        mControlSender.setControllerReady();
+        mpControlSender->setControllerReady();
 
         // Starting TelnetServer
-        mpTelnetServer = new CAmTelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,&mControlSender,mpControlReceiver,&mDatabasehandler,&mRouter,servPort,3);
+        mpTelnetServer = new CAmTelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,mpControlSender,mpControlReceiver,&mDatabasehandler,mpRouter,servPort,3);
     }
 }
 
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
index 06d10fe..af51047 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
@@ -67,8 +67,8 @@ class CAmEnvironment : public ::testing::Environment
   CAmDatabaseHandler   mDatabasehandler;
   CAmRoutingSender     mRoutingSender;
   CAmCommandSender     mCommandSender;
-  CAmControlSender     mControlSender;
-  CAmRouter            mRouter;
+  CAmControlSender*    mpControlSender;
+  CAmRouter*           mpRouter;
 
   CAmCommandReceiver*  mpCommandReceiver;
   CAmRoutingReceiver*  mpRoutingReceiver;
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
index db69086..39acd77 100644
--- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
@@ -75,6 +75,9 @@ TARGET_LINK_LIBRARIES(AmTelnetServerTest
     ${CMAKE_THREAD_LIBS_INIT}
     ${GTEST_LIBRARIES}
     gmock
+    ${CMAKE_DL_LIBS}
+    rt
+    pthread
 )
 
 INSTALL(TARGETS AmTelnetServerTest 
diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 5aa3e8d..ea4600a 100644
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -82,6 +82,7 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusTest
     ${PYTHON_LIBRARY}
     ${GTEST_LIBRARIES}
     gmock
+    rt
 )
 
 
@@ -93,6 +94,7 @@ TARGET_LINK_LIBRARIES(AmCommandSenderDbusSignalTest
     ${PYTHON_LIBRARY}
     ${GTEST_LIBRARIES}
     gmock
+    rt
 )
 
 INSTALL(TARGETS AmCommandSenderDbusTest