diff options
| author | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
|---|---|---|
| committer | christian linke <christian.linke@bmw.de> | 2012-12-17 16:15:11 +0100 |
| commit | 54c5e965fe8f9a53a78834028fd65c792493da2b (patch) | |
| tree | 560d7b1209e6a8d4798de9568e4b4a947c2ab42a /AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp | |
| parent | 215e8a72dc81e8a86dd5b3a8ca40fd2c7c6a0b9c (diff) | |
| download | audiomanager-54c5e965fe8f9a53a78834028fd65c792493da2b.tar.gz | |
* added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp')
| -rw-r--r-- | AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp | 13 |
1 files changed, 6 insertions, 7 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)); |