* merge local changes with updated master

2 files changed, 43 insertions, 0 deletions

diff --git a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp
index 259f7b3..46a0c40 100644
--- a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp
+++ b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp
@@ -10,6 +10,18 @@
 namespace am {
 
 CAmTelnetServerTest::CAmTelnetServerTest()
+: mlistRoutingPluginDirs()
+, mlistCommandPluginDirs()
+, mSocketHandler()
+, mDatabasehandler(std::string(":memory:"))
+, mRoutingSender(mlistRoutingPluginDirs)
+, mCommandSender(mlistRoutingPluginDirs)
+, mControlSender(std::string(""))
+, mRouter(&mDatabasehandler,&mControlSender)
+, mCommandReceiver(&mDatabasehandler,&mControlSender,&mSocketHandler)
+, mRoutingReceiver(&mDatabasehandler,&mRoutingSender,&mControlSender,&mSocketHandler)
+, mControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,&mSocketHandler,&mRouter)
+, mTelnetServer(&mSocketHandler,&mCommandSender,&mCommandReceiver,&mRoutingSender,&mRoutingReceiver,&mControlSender,&mControlReceiver,&mDatabasehandler,&mRouter)
 {
    // TODO Auto-generated constructor stub
 
@@ -20,4 +32,18 @@ CAmTelnetServerTest::~CAmTelnetServerTest()
    // TODO Auto-generated destructor stub
 }
 
+CAmTelnetServerTest::SetUp()
+{
+   //startup all the Plugins and Interfaces
+   mControlSender.startupController(&iControlReceiver);
+   mCommandSender.startupInterface(&iCommandReceiver);
+   mRoutingSender.startupRoutingInterface(&iRoutingReceiver);
+
+   //when the routingInterface is done, all plugins are loaded:
+   mControlSender.hookAllPluginsLoaded();
+
+   mSocketHandler.start_listenting();
+
+}
+
 }
diff --git a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
index 6fa5373..aa8e5ba 100644
--- a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
+++ b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
@@ -9,6 +9,7 @@
 #define CAMTELNETSERVERTEST_H_
 
 #include "gtest/gtest.h"
+#include "TelnetServer.h"
 
 
 namespace am {
@@ -23,6 +24,22 @@ class CAmTelnetServerTest : public ::testing::Test{
 
    virtual void TearDown() ;
 
+   std::vector<std::string> mlistRoutingPluginDirs;
+   std::vector<std::string> mlistCommandPluginDirs;
+
+   SocketHandler     mSocketHandler;
+   DatabaseHandler   mDatabasehandler;
+   RoutingSender     mRoutingSender;
+   CommandSender     mCommandSender;
+   ControlSender     mControlSender;
+   Router            mRouter;
+
+   CommandReceiver   mCommandReceiver;
+   RoutingReceiver   mRoutingReceiver;
+   ControlReceiver   mControlReceiver;
+
+   TelnetServer      mTelnetServer;
+
 };
 
 }