diff options
Diffstat (limited to 'AudioManagerDaemon/test/AmTelnetServerTest')
3 files changed, 9 insertions, 8 deletions
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index ebc3705..686ac92 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -44,9 +44,8 @@ static CAmSocketHandler* mpSocketHandler = NULL; void* startSocketHandler(void* data) { CAmEnvironment* Env = static_cast<CAmEnvironment*>(data); - CAmSocketHandler mySocketHandler; - Env->setSocketHandler(&mySocketHandler); - mySocketHandler.start_listenting(); + Env->setSocketHandler(&Env->mSocketHandler); + Env->mSocketHandler.start_listenting(); Env->setSocketHandler(NULL); return (NULL); } @@ -54,11 +53,11 @@ void* startSocketHandler(void* data) CAmEnvironment::CAmEnvironment() : mlistRoutingPluginDirs() , mlistCommandPluginDirs() -//, mpSocketHandler(NULL) +, mSocketHandler() , mDatabasehandler(std::string(":memory:")) , mRoutingSender(mlistRoutingPluginDirs) , mCommandSender(mlistRoutingPluginDirs) -, mControlSender(controllerPlugin) +, mControlSender(controllerPlugin,&mSocketHandler) , mRouter(&mDatabasehandler,&mControlSender) , mpCommandReceiver(NULL) , mpRoutingReceiver(NULL) @@ -172,7 +171,7 @@ TEST_F(CAmTelnetServerTest,sendCmdTelnetServer) std::string string("help"); ssize_t sizesent = send(staticSocket, string.c_str(), string.size(), 0); - ASSERT_EQ(sizesent,string.size()); + ASSERT_EQ(static_cast<uint>(sizesent),string.size()); char buffer[1000]; memset(buffer,0,sizeof(buffer)); @@ -187,7 +186,7 @@ TEST_F(CAmTelnetServerTest,closeTelnetServerConnection) mpSocketHandler->stop_listening(); ssize_t sizesent = send(staticSocket, string.c_str(), string.size(), 0); - ASSERT_EQ(sizesent,string.size()); + ASSERT_EQ(static_cast<uint>(sizesent),string.size()); char buffer[1000]; memset(buffer,0,sizeof(buffer)); diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index 06d10fe..a584b97 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -63,7 +63,7 @@ class CAmEnvironment : public ::testing::Environment std::vector<std::string> mlistRoutingPluginDirs; std::vector<std::string> mlistCommandPluginDirs; - //SocketHandler* mpSocketHandler; + CAmSocketHandler mSocketHandler; CAmDatabaseHandler mDatabasehandler; CAmRoutingSender mRoutingSender; CAmCommandSender mCommandSender; diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index b2c44a9..181940c 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -63,6 +63,8 @@ file(GLOB TELNET_SRCS_CXX "../../src/CAmRouter.cpp" "../../src/CAmDltWrapper.cpp" "../../src/CAmTelnetMenuHelper.cpp" + "../../src/CAmNodeStateCommunicator.cpp" + "../../src/CAmDbusWrapper.cpp" "*.cpp" ) |