diff options
Diffstat (limited to 'AudioManagerDaemon/test/AmTelnetServerTest')
3 files changed, 34 insertions, 20 deletions
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp index 686ac92..429ceda 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp @@ -54,7 +54,11 @@ CAmEnvironment::CAmEnvironment() : mlistRoutingPluginDirs() , mlistCommandPluginDirs() , mSocketHandler() +#ifdef WITH_DATABASE_STORAGE , mDatabasehandler(std::string(":memory:")) +#else +, mDatabasehandler() +#endif , mRoutingSender(mlistRoutingPluginDirs) , mCommandSender(mlistRoutingPluginDirs) , mControlSender(controllerPlugin,&mSocketHandler) @@ -139,6 +143,17 @@ void CAmTelnetServerTest::TearDown() } +void CAmTelnetServerTest::sendCmd(std::string & command ) +{ + ssize_t sizesent = send(staticSocket, command.c_str(), command.size(), 0); + ASSERT_EQ(static_cast<uint>(sizesent),command.size()); + + char buffer[1000]; + memset(buffer,0,sizeof(buffer)); + int read=recv(staticSocket,buffer,sizeof(buffer),0); + ASSERT_GT(read,1); +} + TEST_F(CAmTelnetServerTest,connectTelnetServer) { struct sockaddr_in servAddr; @@ -168,31 +183,23 @@ TEST_F(CAmTelnetServerTest,connectTelnetServer) TEST_F(CAmTelnetServerTest,sendCmdTelnetServer) { - std::string string("help"); - - ssize_t sizesent = send(staticSocket, string.c_str(), string.size(), 0); - ASSERT_EQ(static_cast<uint>(sizesent),string.size()); + std::string cmd("help"); + sendCmd(cmd); +} - char buffer[1000]; - memset(buffer,0,sizeof(buffer)); - int read=recv(staticSocket,buffer,sizeof(buffer),0); - ASSERT_GT(read,1); +TEST_F(CAmTelnetServerTest,sendDumpCmdTelnetServer) +{ + std::string cmd1("info"); + std::string cmd3("dump"); + sendCmd(cmd1); + sendCmd(cmd3); } TEST_F(CAmTelnetServerTest,closeTelnetServerConnection) { - std::string string ("exit"); - + std::string cmd("exit"); mpSocketHandler->stop_listening(); - - ssize_t sizesent = send(staticSocket, string.c_str(), string.size(), 0); - ASSERT_EQ(static_cast<uint>(sizesent),string.size()); - - char buffer[1000]; - memset(buffer,0,sizeof(buffer)); - int read=recv(staticSocket,buffer,sizeof(buffer),0); - ASSERT_GT(read,1); - + sendCmd(cmd); close(staticSocket); staticSocket = -1; } diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h index a584b97..5a03ba7 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h @@ -25,6 +25,7 @@ #include "gtest/gtest.h" #include "CAmTelnetServer.h" #include "CAmDatabaseHandler.h" +#include "CAmMapHandler.h" #include "CAmRoutingSender.h" #include "CAmCommandSender.h" #include "CAmControlSender.h" @@ -35,6 +36,7 @@ namespace am class CAmSocketHandler; class CAmDatabaseHandler; +class CAmMapHandler; class CAmRoutingSender; class CAmCommandSender; class CAmControlSender; @@ -64,7 +66,11 @@ class CAmEnvironment : public ::testing::Environment std::vector<std::string> mlistCommandPluginDirs; CAmSocketHandler mSocketHandler; +#ifdef WITH_DATABASE_STORAGE CAmDatabaseHandler mDatabasehandler; +#else + CAmMapHandler mDatabasehandler; +#endif CAmRoutingSender mRoutingSender; CAmCommandSender mCommandSender; CAmControlSender mControlSender; @@ -89,7 +95,7 @@ class CAmTelnetServerTest : public ::testing::Test void SetUp() ; void TearDown() ; - + void sendCmd(std::string & command ); //int mSocket; }; diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index 999ba1d..b2981eb 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -54,6 +54,7 @@ file(GLOB TELNET_SRCS_CXX "../../src/CAmCommandSender.cpp" "../../src/CAmControlReceiver.cpp" "../../src/CAmControlSender.cpp" + "../../src/CAmMapHandler.cpp" "../../src/CAmDatabaseHandler.cpp" "../../src/CAmDatabaseObserver.cpp" "../../src/CAmRoutingReceiver.cpp" |