summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/test
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-03-01 19:12:55 +0100
committerchristian mueller <christian.ei.mueller@bmw.de>2012-03-01 19:12:55 +0100
commitdfcafbec34e0e454d9995551998af5d40a27c7ad (patch)
treed93d70fea7feb7004f6a2ce9bfce9b83d3469e42 /AudioManagerDaemon/test
parentffccf1e2003cea4230413ccfdfd4cd6515484e4f (diff)
downloadaudiomanager-dfcafbec34e0e454d9995551998af5d40a27c7ad.tar.gz
* fix [GAM-28] problems in routingsender.cpp
* [GAM-27] major refactoring: bringing everything to standardized names * Enhancement of CAmSerializer.h * improvement of documentation * adoption & regeneration of inerfaces
Diffstat (limited to 'AudioManagerDaemon/test')
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp (renamed from AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp)46
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h (renamed from AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h)67
-rw-r--r--AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/controlInterface/CMakeLists.txt)40
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp (renamed from AudioManagerDaemon/test/database/databaseTest.cpp)146
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h (renamed from AudioManagerDaemon/test/database/databaseTest.h)55
-rw-r--r--AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/database/CMakeLists.txt)40
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp (renamed from AudioManagerDaemon/test/routing/routingTest.cpp)49
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h (renamed from AudioManagerDaemon/test/routing/routingTest.h)58
-rw-r--r--AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/routing/CMakeLists.txt)38
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp (renamed from AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp)42
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h (renamed from AudioManagerDaemon/test/routingInterface/routingInterfaceTest.h)50
-rw-r--r--AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/routingInterface/CMakeLists.txt)40
-rw-r--r--AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp (renamed from AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp)88
-rw-r--r--AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h (renamed from AudioManagerDaemon/test/sockethandler/sockethandlerTest.h)40
-rw-r--r--AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/sockethandler/CMakeLists.txt)24
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp (renamed from AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp)34
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h87
-rw-r--r--AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt (renamed from AudioManagerDaemon/test/telnetserver/CMakeLists.txt)46
-rw-r--r--AudioManagerDaemon/test/CAmCommonFunctions.cpp (renamed from AudioManagerDaemon/test/CommonFunctions.cpp)68
-rw-r--r--AudioManagerDaemon/test/CAmCommonFunctions.h (renamed from AudioManagerDaemon/test/CommonFunctions.h)4
-rw-r--r--AudioManagerDaemon/test/CMakeLists.txt12
-rw-r--r--AudioManagerDaemon/test/IAmCommandBackdoor.h (renamed from AudioManagerDaemon/test/CommandInterfaceBackdoor.h)20
-rw-r--r--AudioManagerDaemon/test/IAmControlBackdoor.h (renamed from AudioManagerDaemon/test/ControlInterfaceBackdoor.h)16
-rw-r--r--AudioManagerDaemon/test/IAmRoutingBackdoor.h (renamed from AudioManagerDaemon/test/RoutingInterfaceBackdoor.h)18
-rw-r--r--AudioManagerDaemon/test/MockIAmCommandSend.h82
-rw-r--r--AudioManagerDaemon/test/MockIAmControlSend.h134
-rw-r--r--AudioManagerDaemon/test/MockIAmRoutingSend.h (renamed from AudioManagerDaemon/test/routingInterface/MockRoutingInterface.h)6
-rw-r--r--AudioManagerDaemon/test/controlInterface/MockInterfaces.h182
-rw-r--r--AudioManagerDaemon/test/database/MockInterfaces.h189
-rw-r--r--AudioManagerDaemon/test/routing/MockInterfaces.h187
-rw-r--r--AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h87
31 files changed, 825 insertions, 1170 deletions
diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
index c262692..6e9ead1 100644
--- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp
@@ -21,19 +21,19 @@
* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
*
*/
-#include "controlInterfaceTest.h"
+#include "CAmControlInterfaceTest.h"
#include <algorithm>
#include <string>
#include <vector>
#include <set>
-#include "DLTWrapper.h"
+#include "shared/CAmDltWrapper.h"
using namespace am;
using namespace testing;
-controlInterfaceTest::controlInterfaceTest() :
+CAmControlInterfaceTest::CAmControlInterfaceTest() :
pSocketHandler(), //
- pDBusWrapper((DBusWrapper*) 1), //
+ pDBusWrapper((CAmDbusWrapper*) 1), //
plistCommandPluginDirs(), //
plistRoutingPluginDirs(), //
pDatabaseHandler(std::string(":memory:")), //
@@ -56,20 +56,20 @@ controlInterfaceTest::controlInterfaceTest() :
}
-controlInterfaceTest::~controlInterfaceTest()
+CAmControlInterfaceTest::~CAmControlInterfaceTest()
{
}
-void controlInterfaceTest::SetUp()
+void CAmControlInterfaceTest::SetUp()
{
logInfo("RoutingSendInterface Test started");
}
-void controlInterfaceTest::TearDown()
+void CAmControlInterfaceTest::TearDown()
{
}
-TEST_F(controlInterfaceTest,registerDomain)
+TEST_F(CAmControlInterfaceTest,registerDomain)
{
am_Domain_s domain;
@@ -82,7 +82,7 @@ TEST_F(controlInterfaceTest,registerDomain)
ASSERT_EQ(domainID, 2);
}
-TEST_F(controlInterfaceTest,deregisterDomain)
+TEST_F(CAmControlInterfaceTest,deregisterDomain)
{
am_domainID_t domainID = 34;
@@ -91,7 +91,7 @@ TEST_F(controlInterfaceTest,deregisterDomain)
ASSERT_EQ(E_OK, pRoutingReceiver.deregisterDomain(domainID));
}
-TEST_F(controlInterfaceTest,registerSink)
+TEST_F(CAmControlInterfaceTest,registerSink)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -103,7 +103,7 @@ TEST_F(controlInterfaceTest,registerSink)
ASSERT_EQ(sinkID, 2);
}
-TEST_F(controlInterfaceTest,deregisterSink)
+TEST_F(CAmControlInterfaceTest,deregisterSink)
{
am_sinkID_t sinkID = 12;
@@ -112,7 +112,7 @@ TEST_F(controlInterfaceTest,deregisterSink)
ASSERT_EQ(E_OK, pRoutingReceiver.deregisterSink(sinkID));
}
-TEST_F(controlInterfaceTest,registerSource)
+TEST_F(CAmControlInterfaceTest,registerSource)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -124,7 +124,7 @@ TEST_F(controlInterfaceTest,registerSource)
ASSERT_EQ(sourceID, 2);
}
-TEST_F(controlInterfaceTest,deregisterSource)
+TEST_F(CAmControlInterfaceTest,deregisterSource)
{
am_sourceID_t sourceID = 12;
@@ -133,7 +133,7 @@ TEST_F(controlInterfaceTest,deregisterSource)
ASSERT_EQ(E_OK, pRoutingReceiver.deregisterSource(sourceID));
}
-TEST_F(controlInterfaceTest,registerGateway)
+TEST_F(CAmControlInterfaceTest,registerGateway)
{
am_Gateway_s gateway;
am_gatewayID_t gatewayID;
@@ -145,7 +145,7 @@ TEST_F(controlInterfaceTest,registerGateway)
ASSERT_EQ(gatewayID, 2);
}
-TEST_F(controlInterfaceTest,deregisterGateway)
+TEST_F(CAmControlInterfaceTest,deregisterGateway)
{
am_gatewayID_t gatewayID = 12;
@@ -154,7 +154,7 @@ TEST_F(controlInterfaceTest,deregisterGateway)
ASSERT_EQ(E_OK, pRoutingReceiver.deregisterGateway(gatewayID));
}
-TEST_F(controlInterfaceTest,ackConnect)
+TEST_F(CAmControlInterfaceTest,ackConnect)
{
am_connectionID_t connectionID;
am_Sink_s sink;
@@ -209,7 +209,7 @@ TEST_F(controlInterfaceTest,ackConnect)
ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2));
}
-TEST_F(controlInterfaceTest,ackDisconnect)
+TEST_F(CAmControlInterfaceTest,ackDisconnect)
{
am_connectionID_t connectionID;
am_Sink_s sink;
@@ -262,7 +262,7 @@ TEST_F(controlInterfaceTest,ackDisconnect)
ASSERT_EQ(E_NON_EXISTENT, pControlReceiver.disconnect(handle,2));
}
-TEST_F(controlInterfaceTest,setSourceState)
+TEST_F(CAmControlInterfaceTest,setSourceState)
{
am_Source_s source;
@@ -312,7 +312,7 @@ TEST_F(controlInterfaceTest,setSourceState)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceState(handle,source.sourceID,SS_PAUSED));
}
-TEST_F(controlInterfaceTest,SetSinkVolumeChange)
+TEST_F(CAmControlInterfaceTest,SetSinkVolumeChange)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -362,7 +362,7 @@ TEST_F(controlInterfaceTest,SetSinkVolumeChange)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23));
}
-TEST_F(controlInterfaceTest,ackSetSourceVolumeChange)
+TEST_F(CAmControlInterfaceTest,ackSetSourceVolumeChange)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -412,7 +412,7 @@ TEST_F(controlInterfaceTest,ackSetSourceVolumeChange)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23));
}
-TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
+TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -464,7 +464,7 @@ TEST_F(controlInterfaceTest,ackSetSinkSoundProperty)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkSoundProperty(handle,sink.sinkID,soundProperty));
}
-TEST_F(controlInterfaceTest,ackSetSourceSoundProperty)
+TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -516,7 +516,7 @@ TEST_F(controlInterfaceTest,ackSetSourceSoundProperty)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceSoundProperty(handle,source.sourceID,soundProperty));
}
-TEST_F(controlInterfaceTest,crossFading)
+TEST_F(CAmControlInterfaceTest,crossFading)
{
//todo: implement crossfading test
}
diff --git a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
index 72e2f63..a39e9ed 100644
--- a/AudioManagerDaemon/test/controlInterface/controlInterfaceTest.h
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.h
@@ -28,47 +28,48 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
-#include <dbus/DBusWrapper.h>
-#include "MockInterfaces.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "RoutingReceiver.h"
-#include "DatabaseObserver.h"
-#include "ControlSender.h"
-#include "RoutingSender.h"
-#include "SocketHandler.h"
-#include "Router.h"
-#include "../RoutingInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../ControlInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
+#include "CAmDatabaseHandler.h"
+#include "CAmControlReceiver.h"
+#include "CAmRoutingReceiver.h"
+#include "CAmDatabaseObserver.h"
+#include "CAmControlSender.h"
+#include "CAmRoutingSender.h"
+#include "CAmRouter.h"
+#include "../IAmRoutingBackdoor.h"
+#include "../IAmCommandBackdoor.h"
+#include "../IAmControlBackdoor.h"
+#include "../CAmCommonFunctions.h"
+#include "../MockIAmRoutingSend.h"
+#include "../MockIAmControlSend.h"
+#include "shared/CAmSocketHandler.h"
+#include "shared/CAmDbusWrapper.h"
namespace am
{
-class controlInterfaceTest: public ::testing::Test
+class CAmControlInterfaceTest: public ::testing::Test
{
public:
- controlInterfaceTest();
- ~controlInterfaceTest();
- SocketHandler pSocketHandler;
- DBusWrapper* pDBusWrapper;
+ CAmControlInterfaceTest();
+ ~CAmControlInterfaceTest();
+ CAmSocketHandler pSocketHandler;
+ CAmDbusWrapper* pDBusWrapper;
std::vector<std::string> plistCommandPluginDirs;
std::vector<std::string> plistRoutingPluginDirs;
- DatabaseHandler pDatabaseHandler;
- RoutingSender pRoutingSender;
- CommandSender pCommandSender;
- MockControlSendInterface pMockControlInterface;
- MockRoutingSendInterface pMockRoutingInterface;
- RoutingInterfaceBackdoor pRoutingInterfaceBackdoor;
- CommandInterfaceBackdoor pCommandInterfaceBackdoor;
- ControlInterfaceBackdoor pControlInterfaceBackdoor;
- ControlSender pControlSender;
- Router pRouter;
- DatabaseObserver pDatabaseObserver;
- ControlReceiver pControlReceiver;
- RoutingReceiver pRoutingReceiver;
- CommonFunctions pCF;
+ CAmDatabaseHandler pDatabaseHandler;
+ CAmRoutingSender pRoutingSender;
+ CAmCommandSender pCommandSender;
+ MockIAmControlSend pMockControlInterface;
+ MockIAmRoutingSend pMockRoutingInterface;
+ IAmRoutingBackdoor pRoutingInterfaceBackdoor;
+ IAmCommandBackdoor pCommandInterfaceBackdoor;
+ IAmControlBackdoor pControlInterfaceBackdoor;
+ CAmControlSender pControlSender;
+ CAmRouter pRouter;
+ CAmDatabaseObserver pDatabaseObserver;
+ CAmControlReceiver pControlReceiver;
+ CAmRoutingReceiver pRoutingReceiver;
+ CAmCommonFunctions pCF;
void SetUp();
void TearDown();
};
diff --git a/AudioManagerDaemon/test/controlInterface/CMakeLists.txt b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
index bdf8ac5..54f7c35 100644
--- a/AudioManagerDaemon/test/controlInterface/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# Copyright (C) 2011, BMW AG
#
-# GeniviAudioMananger ControlInterfaceTest
+# GeniviAudioMananger AmControlInterfaceTest
#
# \file CMakeLists.txt
#
@@ -23,7 +23,7 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(controlInterfacetest)
+PROJECT(AmControlInterfaceTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
@@ -33,36 +33,36 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
${GTEST_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB CONTROL_INTERFACE_SRCS_CXX
- "../../src/DatabaseHandler.cpp"
- "../../src/DatabaseObserver.cpp"
- "../../src/RoutingSender.cpp"
- "../../src/RoutingReceiver.cpp"
- "../../src/CommandSender.cpp"
- "../../src/ControlReceiver.cpp"
- "../../src/ControlSender.cpp"
- "../../src/Router.cpp"
- "../../src/DLTWrapper.cpp"
- "../../src/SocketHandler.cpp"
- "../../src/CommandReceiver.cpp"
- "../CommonFunctions.cpp"
+ "../../src/CAmDatabaseHandler.cpp"
+ "../../src/CAmDatabaseObserver.cpp"
+ "../../src/CAmRoutingSender.cpp"
+ "../../src/CAmRoutingReceiver.cpp"
+ "../../src/CAmCommandSender.cpp"
+ "../../src/CAmControlReceiver.cpp"
+ "../../src/CAmControlSender.cpp"
+ "../../src/CAmRouter.cpp"
+ "../../src/CAmDltWrapper.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmCommandReceiver.cpp"
+ "../CAmCommonFunctions.cpp"
"*.cpp"
)
-ADD_EXECUTABLE(controlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX})
+ADD_EXECUTABLE(AmControlInterfaceTest ${CONTROL_INTERFACE_SRCS_CXX})
-TARGET_LINK_LIBRARIES(controlInterfaceTest
+TARGET_LINK_LIBRARIES(AmControlInterfaceTest
${SQLITE_LIBRARIES}
${DLT_LIBRARIES}
${DBUS_LIBRARY}
@@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(controlInterfaceTest
gmock
)
-INSTALL(TARGETS controlInterfaceTest
+INSTALL(TARGETS AmControlInterfaceTest
DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
diff --git a/AudioManagerDaemon/test/database/databaseTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
index a43e436..a5948ed 100644
--- a/AudioManagerDaemon/test/database/databaseTest.cpp
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
@@ -23,12 +23,12 @@
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#include "databaseTest.h"
+#include "CAmDatabaseHandlerTest.h"
#include <algorithm>
#include <string>
#include <vector>
#include <set>
-#include "DLTWrapper.h"
+#include "shared/CAmDltWrapper.h"
using namespace am;
using namespace testing;
@@ -40,7 +40,7 @@ extern bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_Main
extern bool equalClassProperties(const am_ClassProperty_s a, const am_ClassProperty_s b);
extern std::string int2string(int i);
-databasetest::databasetest() :
+CAmDatabaseHandlerTest::CAmDatabaseHandlerTest() :
plistRoutingPluginDirs(), //
plistCommandPluginDirs(), //
pSocketHandler(),//
@@ -59,11 +59,11 @@ databasetest::databasetest() :
pCommandInterfaceBackdoor.injectInterface(&pCommandSender, &pMockInterface);
}
-databasetest::~databasetest()
+CAmDatabaseHandlerTest::~CAmDatabaseHandlerTest()
{
}
-void databasetest::createMainConnectionSetup()
+void CAmDatabaseHandlerTest::createMainConnectionSetup()
{
//fill the connection database
am_Connection_s connection;
@@ -135,15 +135,15 @@ void databasetest::createMainConnectionSetup()
ASSERT_EQ(true, equal);
}
-void databasetest::SetUp()
+void CAmDatabaseHandlerTest::SetUp()
{
}
-void databasetest::TearDown()
+void CAmDatabaseHandlerTest::TearDown()
{
}
-TEST_F(databasetest,getMainConnectionInfo)
+TEST_F(CAmDatabaseHandlerTest,getMainConnectionInfo)
{
//fill the connection database
am_Connection_s connection;
@@ -219,7 +219,7 @@ TEST_F(databasetest,getMainConnectionInfo)
}
-TEST_F(databasetest,getSinKInfo)
+TEST_F(CAmDatabaseHandlerTest,getSinKInfo)
{
//fill the connection database
am_Sink_s staticSink, firstDynamicSink, secondDynamicSink;
@@ -280,7 +280,7 @@ TEST_F(databasetest,getSinKInfo)
}
-TEST_F(databasetest,getSourceInfo)
+TEST_F(CAmDatabaseHandlerTest,getSourceInfo)
{
//fill the connection database
am_Source_s staticSource, firstDynamicSource, secondDynamicSource;
@@ -346,7 +346,7 @@ TEST_F(databasetest,getSourceInfo)
}
-TEST_F(databasetest, peekSourceID)
+TEST_F(CAmDatabaseHandlerTest, peekSourceID)
{
std::string sourceName("myClassID");
@@ -370,7 +370,7 @@ TEST_F(databasetest, peekSourceID)
ASSERT_EQ(sourceClassID, peekID);
}
-TEST_F(databasetest, peekSinkID)
+TEST_F(CAmDatabaseHandlerTest, peekSinkID)
{
std::string sinkName("myClassID");
@@ -394,7 +394,7 @@ TEST_F(databasetest, peekSinkID)
ASSERT_EQ(sinkClassID, peekID);
}
-TEST_F(databasetest,crossfaders)
+TEST_F(CAmDatabaseHandlerTest,crossfaders)
{
@@ -434,7 +434,7 @@ TEST_F(databasetest,crossfaders)
ASSERT_EQ(crossfader.name.compare(listCrossfaders[0].name), 0);
}
-TEST_F(databasetest,crossfadersGetFromDomain)
+TEST_F(CAmDatabaseHandlerTest,crossfadersGetFromDomain)
{
@@ -477,7 +477,7 @@ TEST_F(databasetest,crossfadersGetFromDomain)
}
-TEST_F(databasetest,sourceState)
+TEST_F(CAmDatabaseHandlerTest,sourceState)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -497,7 +497,7 @@ TEST_F(databasetest,sourceState)
ASSERT_EQ(listSources[0].sourceState, SS_ON);
}
-TEST_F(databasetest,sinkVolumeChange)
+TEST_F(CAmDatabaseHandlerTest,sinkVolumeChange)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -515,7 +515,7 @@ TEST_F(databasetest,sinkVolumeChange)
ASSERT_EQ(listSinks[0].volume, 34);
}
-TEST_F(databasetest,sourceVolumeChange)
+TEST_F(CAmDatabaseHandlerTest,sourceVolumeChange)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -533,7 +533,7 @@ TEST_F(databasetest,sourceVolumeChange)
ASSERT_EQ(listSources[0].volume, 34);
}
-TEST_F(databasetest, peekSource)
+TEST_F(CAmDatabaseHandlerTest, peekSource)
{
std::vector<am_Source_s> listSources;
am_sourceID_t sourceID, source2ID, source3ID;
@@ -564,7 +564,7 @@ TEST_F(databasetest, peekSource)
ASSERT_EQ(source3ID, source2ID);
}
-TEST_F(databasetest, peekSourceDouble)
+TEST_F(CAmDatabaseHandlerTest, peekSourceDouble)
{
std::vector<am_Source_s> listSources;
am_sourceID_t sourceID;
@@ -595,7 +595,7 @@ TEST_F(databasetest, peekSourceDouble)
ASSERT_TRUE(listSources[0].sourceID==sourceID);
}
-TEST_F(databasetest, peekSink)
+TEST_F(CAmDatabaseHandlerTest, peekSink)
{
std::vector<am_Sink_s> listSinks;
am_sinkID_t sinkID, sink2ID, sink3ID;
@@ -626,7 +626,7 @@ TEST_F(databasetest, peekSink)
ASSERT_EQ(sink3ID, sink2ID);
}
-TEST_F(databasetest, peekSinkDouble)
+TEST_F(CAmDatabaseHandlerTest, peekSinkDouble)
{
std::vector<am_Sink_s> listSinks;
am_sinkID_t sinkID;
@@ -657,7 +657,7 @@ TEST_F(databasetest, peekSinkDouble)
ASSERT_TRUE(listSinks[0].sinkID==sinkID);
}
-TEST_F(databasetest,changeConnectionTimingInformationCheckMainConnection)
+TEST_F(CAmDatabaseHandlerTest,changeConnectionTimingInformationCheckMainConnection)
{
std::vector<am_Connection_s> connectionList;
std::vector<am_MainConnectionType_s> mainList;
@@ -682,7 +682,7 @@ TEST_F(databasetest,changeConnectionTimingInformationCheckMainConnection)
ASSERT_EQ(mainList[0].delay, 216);
}
-TEST_F(databasetest,changeConnectionTimingInformation)
+TEST_F(CAmDatabaseHandlerTest,changeConnectionTimingInformation)
{
am_Connection_s connection;
am_connectionID_t connectionID;
@@ -699,7 +699,7 @@ TEST_F(databasetest,changeConnectionTimingInformation)
ASSERT_TRUE(connectionList[0].delay==24);
}
-TEST_F(databasetest,getSinkClassOfSink)
+TEST_F(CAmDatabaseHandlerTest,getSinkClassOfSink)
{
std::vector<am_SinkClass_s> sinkClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -737,7 +737,7 @@ TEST_F(databasetest,getSinkClassOfSink)
ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),returnClass.listClassProperties.begin(),equalClassProperties));
}
-TEST_F(databasetest,getSourceClassOfSource)
+TEST_F(CAmDatabaseHandlerTest,getSourceClassOfSource)
{
std::vector<am_SourceClass_s> sourceClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -771,7 +771,7 @@ TEST_F(databasetest,getSourceClassOfSource)
ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),sinkSourceClass.listClassProperties.begin(),equalClassProperties));
}
-TEST_F(databasetest,removeSourceClass)
+TEST_F(CAmDatabaseHandlerTest,removeSourceClass)
{
std::vector<am_SourceClass_s> sourceClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -799,7 +799,7 @@ TEST_F(databasetest,removeSourceClass)
ASSERT_TRUE(sourceClassList.empty());
}
-TEST_F(databasetest,updateSourceClass)
+TEST_F(CAmDatabaseHandlerTest,updateSourceClass)
{
std::vector<am_SourceClass_s> sourceClassList;
std::vector<am_ClassProperty_s> classPropertyList, changedPropertyList;
@@ -832,7 +832,7 @@ TEST_F(databasetest,updateSourceClass)
ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),changedPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest,enterSourceClass)
+TEST_F(CAmDatabaseHandlerTest,enterSourceClass)
{
std::vector<am_SourceClass_s> sourceClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -857,7 +857,7 @@ TEST_F(databasetest,enterSourceClass)
ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest,enterSourceClassStatic)
+TEST_F(CAmDatabaseHandlerTest,enterSourceClassStatic)
{
std::vector<am_SourceClass_s> sourceClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -882,7 +882,7 @@ TEST_F(databasetest,enterSourceClassStatic)
ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest,removeSinkClass)
+TEST_F(CAmDatabaseHandlerTest,removeSinkClass)
{
std::vector<am_SinkClass_s> sinkClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -910,7 +910,7 @@ TEST_F(databasetest,removeSinkClass)
ASSERT_TRUE(sinkClassList.empty());
}
-TEST_F(databasetest,updateSinkClass)
+TEST_F(CAmDatabaseHandlerTest,updateSinkClass)
{
std::vector<am_SinkClass_s> sinkClassList;
std::vector<am_ClassProperty_s> classPropertyList, changedPropertyList;
@@ -943,7 +943,7 @@ TEST_F(databasetest,updateSinkClass)
ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),changedPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest,enterSinkClass)
+TEST_F(CAmDatabaseHandlerTest,enterSinkClass)
{
std::vector<am_SinkClass_s> sinkClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -968,7 +968,7 @@ TEST_F(databasetest,enterSinkClass)
ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest,enterSinkClassStatic)
+TEST_F(CAmDatabaseHandlerTest,enterSinkClassStatic)
{
std::vector<am_SinkClass_s> sinkClassList;
std::vector<am_ClassProperty_s> classPropertyList;
@@ -993,7 +993,7 @@ TEST_F(databasetest,enterSinkClassStatic)
ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
}
-TEST_F(databasetest, changeSystemProperty)
+TEST_F(CAmDatabaseHandlerTest, changeSystemProperty)
{
std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
am_SystemProperty_s systemProperty;
@@ -1009,7 +1009,7 @@ TEST_F(databasetest, changeSystemProperty)
ASSERT_EQ(listReturn[0].value, systemProperty.value);
}
-TEST_F(databasetest, systemProperties)
+TEST_F(CAmDatabaseHandlerTest, systemProperties)
{
std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
am_SystemProperty_s systemProperty;
@@ -1024,7 +1024,7 @@ TEST_F(databasetest, systemProperties)
ASSERT_EQ(listReturn[0].value, systemProperty.value);
}
-TEST_F(databasetest,enterSourcesCorrect)
+TEST_F(CAmDatabaseHandlerTest,enterSourcesCorrect)
{
//fill the connection database
am_Source_s staticSource, firstDynamicSource, secondDynamicSource;
@@ -1084,7 +1084,7 @@ TEST_F(databasetest,enterSourcesCorrect)
ASSERT_EQ(true, equal);
}
-TEST_F(databasetest, changeSourceMainSoundProperty)
+TEST_F(CAmDatabaseHandlerTest, changeSourceMainSoundProperty)
{
std::vector<am_Source_s> listSources;
am_Source_s source;
@@ -1108,7 +1108,7 @@ TEST_F(databasetest, changeSourceMainSoundProperty)
}
}
-TEST_F(databasetest, changeSinkMuteState)
+TEST_F(CAmDatabaseHandlerTest, changeSinkMuteState)
{
std::vector<am_Sink_s> listSinks;
am_Sink_s sink;
@@ -1123,7 +1123,7 @@ TEST_F(databasetest, changeSinkMuteState)
ASSERT_EQ(muteState, listSinks[0].muteState);
}
-TEST_F(databasetest, changeSinkMainSoundProperty)
+TEST_F(CAmDatabaseHandlerTest, changeSinkMainSoundProperty)
{
std::vector<am_Sink_s> listSinks;
am_Sink_s sink;
@@ -1148,7 +1148,7 @@ TEST_F(databasetest, changeSinkMainSoundProperty)
}
}
-TEST_F(databasetest, peekDomain)
+TEST_F(CAmDatabaseHandlerTest, peekDomain)
{
std::vector<am_Domain_s> listDomains;
am_Domain_s domain;
@@ -1166,7 +1166,7 @@ TEST_F(databasetest, peekDomain)
ASSERT_TRUE(listDomains[0].domainID==domainID);
}
-TEST_F(databasetest, peekDomainFirstEntered)
+TEST_F(CAmDatabaseHandlerTest, peekDomainFirstEntered)
{
std::vector<am_Domain_s> listDomains;
am_Domain_s domain;
@@ -1181,7 +1181,7 @@ TEST_F(databasetest, peekDomainFirstEntered)
ASSERT_TRUE(listDomains.size()==1);
}
-TEST_F(databasetest, changeDomainState)
+TEST_F(CAmDatabaseHandlerTest, changeDomainState)
{
std::vector<am_Domain_s> listDomains;
am_Domain_s domain;
@@ -1194,7 +1194,7 @@ TEST_F(databasetest, changeDomainState)
ASSERT_EQ(newState, listDomains[0].state);
}
-TEST_F(databasetest, changeMainConnectionState)
+TEST_F(CAmDatabaseHandlerTest, changeMainConnectionState)
{
std::vector<am_MainConnection_s> listMainConnections;
createMainConnectionSetup();
@@ -1204,7 +1204,7 @@ TEST_F(databasetest, changeMainConnectionState)
ASSERT_EQ(CS_DISCONNECTING, listMainConnections[0].connectionState);
}
-TEST_F(databasetest, changeSinkAvailability)
+TEST_F(CAmDatabaseHandlerTest, changeSinkAvailability)
{
std::vector<am_Sink_s> listSinks;
am_Sink_s sink;
@@ -1222,7 +1222,7 @@ TEST_F(databasetest, changeSinkAvailability)
ASSERT_EQ(availability.availabilityReason, listSinks[0].available.availabilityReason);
}
-TEST_F(databasetest, changeSourceAvailability)
+TEST_F(CAmDatabaseHandlerTest, changeSourceAvailability)
{
std::vector<am_Source_s> listSources;
am_Source_s source;
@@ -1241,7 +1241,7 @@ TEST_F(databasetest, changeSourceAvailability)
ASSERT_EQ(availability.availabilityReason, listSources[0].available.availabilityReason);
}
-TEST_F(databasetest,changeMainConnectionRoute)
+TEST_F(CAmDatabaseHandlerTest,changeMainConnectionRoute)
{
std::vector<am_MainConnection_s> originalList;
std::vector<am_MainConnection_s> newList;
@@ -1288,7 +1288,7 @@ TEST_F(databasetest,changeMainConnectionRoute)
ASSERT_FALSE(std::equal(newList[0].listConnectionID.begin(),newList[0].listConnectionID.end(),originalList[0].listConnectionID.begin()));
}
-TEST_F(databasetest,changeMainSinkVolume)
+TEST_F(CAmDatabaseHandlerTest,changeMainSinkVolume)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -1304,7 +1304,7 @@ TEST_F(databasetest,changeMainSinkVolume)
ASSERT_EQ(listSinks[0].mainVolume, newVol);
}
-TEST_F(databasetest,getMainSourceSoundProperties)
+TEST_F(CAmDatabaseHandlerTest,getMainSourceSoundProperties)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -1318,7 +1318,7 @@ TEST_F(databasetest,getMainSourceSoundProperties)
ASSERT_TRUE(std::equal(mainSoundProperties.begin(),mainSoundProperties.end(),listMainSoundProperties.begin(),equalMainSoundProperty));
}
-TEST_F(databasetest,getMainSinkSoundProperties)
+TEST_F(CAmDatabaseHandlerTest,getMainSinkSoundProperties)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -1332,7 +1332,7 @@ TEST_F(databasetest,getMainSinkSoundProperties)
ASSERT_TRUE(std::equal(mainSoundProperties.begin(),mainSoundProperties.end(),listMainSoundProperties.begin(),equalMainSoundProperty));
}
-TEST_F(databasetest,getMainSources)
+TEST_F(CAmDatabaseHandlerTest,getMainSources)
{
am_Source_s source, source1, source2;
am_sourceID_t sourceID;
@@ -1364,7 +1364,7 @@ TEST_F(databasetest,getMainSources)
ASSERT_TRUE(equal);
}
-TEST_F(databasetest,getMainSinks)
+TEST_F(CAmDatabaseHandlerTest,getMainSinks)
{
am_Sink_s sink, sink1, sink2;
am_sinkID_t sinkID;
@@ -1395,7 +1395,7 @@ TEST_F(databasetest,getMainSinks)
ASSERT_TRUE(equal);
}
-TEST_F(databasetest,getVisibleMainConnections)
+TEST_F(CAmDatabaseHandlerTest,getVisibleMainConnections)
{
createMainConnectionSetup();
std::vector<am_MainConnectionType_s> listVisibleMainConnections;
@@ -1409,7 +1409,7 @@ TEST_F(databasetest,getVisibleMainConnections)
ASSERT_EQ(listMainConnections[0].sourceID, listVisibleMainConnections[0].sourceID);
}
-TEST_F(databasetest,getListSourcesOfDomain)
+TEST_F(CAmDatabaseHandlerTest,getListSourcesOfDomain)
{
am_Source_s source, source2;
am_Domain_s domain;
@@ -1440,7 +1440,7 @@ TEST_F(databasetest,getListSourcesOfDomain)
ASSERT_TRUE(std::equal(sourceList.begin(),sourceList.end(),sourceCheckList.begin()) && !sourceList.empty());
}
-TEST_F(databasetest,getListSinksOfDomain)
+TEST_F(CAmDatabaseHandlerTest,getListSinksOfDomain)
{
am_Sink_s sink, sink2;
am_Domain_s domain;
@@ -1469,7 +1469,7 @@ TEST_F(databasetest,getListSinksOfDomain)
ASSERT_TRUE(std::equal(sinkList.begin(),sinkList.end(),sinkCheckList.begin()) && !sinkList.empty());
}
-TEST_F(databasetest,getListGatewaysOfDomain)
+TEST_F(CAmDatabaseHandlerTest,getListGatewaysOfDomain)
{
@@ -1518,7 +1518,7 @@ TEST_F(databasetest,getListGatewaysOfDomain)
ASSERT_TRUE(std::equal(gatewayList.begin(),gatewayList.end(),gatewayCheckList.begin()) && !gatewayList.empty());
}
-TEST_F(databasetest,removeDomain)
+TEST_F(CAmDatabaseHandlerTest,removeDomain)
{
am_Domain_s domain;
am_domainID_t domainID;
@@ -1533,7 +1533,7 @@ TEST_F(databasetest,removeDomain)
ASSERT_TRUE(listDomains.empty());
}
-TEST_F(databasetest,removeGateway)
+TEST_F(CAmDatabaseHandlerTest,removeGateway)
{
@@ -1560,7 +1560,7 @@ TEST_F(databasetest,removeGateway)
ASSERT_TRUE(listGateways.empty());
}
-TEST_F(databasetest,removeSink)
+TEST_F(CAmDatabaseHandlerTest,removeSink)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -1576,7 +1576,7 @@ TEST_F(databasetest,removeSink)
ASSERT_TRUE(listSinks.empty());
}
-TEST_F(databasetest,removeSource)
+TEST_F(CAmDatabaseHandlerTest,removeSource)
{
//fill the connection database
am_Source_s source;
@@ -1594,7 +1594,7 @@ TEST_F(databasetest,removeSource)
ASSERT_TRUE(listSources.empty());
}
-TEST_F(databasetest, removeMainConnection)
+TEST_F(CAmDatabaseHandlerTest, removeMainConnection)
{
createMainConnectionSetup();
@@ -1603,31 +1603,31 @@ TEST_F(databasetest, removeMainConnection)
<< "ERROR: database error";
}
-TEST_F(databasetest,removeNonexistentMainConnectionFail)
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentMainConnectionFail)
{
ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeMainConnectionDB(34))
<< "ERROR: database error";
}
-TEST_F(databasetest,removeNonexistentSource)
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentSource)
{
ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeSourceDB(3))
<< "ERROR: database error";
}
-TEST_F(databasetest,removeNonexistentSink)
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentSink)
{
ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeSinkDB(2))
<< "ERROR: database error";
}
-TEST_F(databasetest,removeNonexistentGateway)
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentGateway)
{
ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeGatewayDB(12))
<< "ERROR: database error";
}
-TEST_F(databasetest,registerGatewayCorrect)
+TEST_F(CAmDatabaseHandlerTest,registerGatewayCorrect)
{
@@ -1691,7 +1691,7 @@ TEST_F(databasetest,registerGatewayCorrect)
ASSERT_EQ(true, equal);
}
-TEST_F(databasetest,getGatewayInfo)
+TEST_F(CAmDatabaseHandlerTest,getGatewayInfo)
{
@@ -1760,7 +1760,7 @@ TEST_F(databasetest,getGatewayInfo)
}
-TEST_F(databasetest,enterSinkThatAlreadyExistFail)
+TEST_F(CAmDatabaseHandlerTest,enterSinkThatAlreadyExistFail)
{
//fill the connection database
am_Sink_s staticSink, SecondSink;
@@ -1784,7 +1784,7 @@ TEST_F(databasetest,enterSinkThatAlreadyExistFail)
<< "ERROR: database error";
}
-TEST_F(databasetest,enterSourcesThatAlreadyExistFail)
+TEST_F(CAmDatabaseHandlerTest,enterSourcesThatAlreadyExistFail)
{
//fill the connection database
am_Source_s staticSource, SecondSource;
@@ -1805,7 +1805,7 @@ TEST_F(databasetest,enterSourcesThatAlreadyExistFail)
<< "ERROR: database error";
}
-TEST_F(databasetest,registerDomainCorrect)
+TEST_F(CAmDatabaseHandlerTest,registerDomainCorrect)
{
//initialize domain
std::vector<am_Domain_s> returnList;
@@ -1832,7 +1832,7 @@ TEST_F(databasetest,registerDomainCorrect)
ASSERT_EQ(true, equal);
}
-TEST_F(databasetest,registerConnectionCorrect)
+TEST_F(CAmDatabaseHandlerTest,registerConnectionCorrect)
{
am_Connection_s connection;
am_connectionID_t connectionID;
@@ -1859,12 +1859,12 @@ TEST_F(databasetest,registerConnectionCorrect)
ASSERT_EQ(true, equal);
}
-TEST_F(databasetest,enterMainConnectionCorrect)
+TEST_F(CAmDatabaseHandlerTest,enterMainConnectionCorrect)
{
createMainConnectionSetup();
}
-TEST_F(databasetest,enterSinksCorrect)
+TEST_F(CAmDatabaseHandlerTest,enterSinksCorrect)
{
//fill the connection database
am_Sink_s staticSink, firstDynamicSink, secondDynamicSink;
@@ -1933,7 +1933,7 @@ TEST_F(databasetest,enterSinksCorrect)
int main(int argc, char **argv)
{
- DLTWrapper::instance()->registerApp("databse", "databasetest");
+ CAmDltWrapper::instance()->registerApp("databse", "databasetest");
logInfo("Database Test started ");
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
diff --git a/AudioManagerDaemon/test/database/databaseTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
index 4dba9c6..a66af97 100644
--- a/AudioManagerDaemon/test/database/databaseTest.h
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
@@ -31,41 +31,42 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
-#include "MockInterfaces.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "ControlSender.h"
-#include "DatabaseObserver.h"
-#include "RoutingSender.h"
-#include "Router.h"
-#include "ControlSender.h"
-#include "SocketHandler.h"
-#include "../ControlInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
+#include "CAmDatabaseHandler.h"
+#include "CAmControlReceiver.h"
+#include "CAmControlSender.h"
+#include "CAmDatabaseObserver.h"
+#include "CAmRoutingSender.h"
+#include "CAmRouter.h"
+#include "CAmControlSender.h"
+#include "../IAmControlBackdoor.h"
+#include "../IAmCommandBackdoor.h"
+#include "../CAmCommonFunctions.h"
+#include "../MockIAmControlSend.h"
+#include "../MockIAmCommandSend.h"
+#include "shared/CAmSocketHandler.h"
namespace am
{
-class databasetest: public ::testing::Test
+class CAmDatabaseHandlerTest: public ::testing::Test
{
public:
- databasetest();
- ~databasetest();
+ CAmDatabaseHandlerTest();
+ ~CAmDatabaseHandlerTest();
std::vector<std::string> plistRoutingPluginDirs;
std::vector<std::string> plistCommandPluginDirs;
- SocketHandler pSocketHandler;
- DatabaseHandler pDatabaseHandler;
- RoutingSender pRoutingSender;
- CommandSender pCommandSender;
- MockCommandSendInterface pMockInterface;
- RoutingInterfaceBackdoor pRoutingInterfaceBackdoor;
- CommandInterfaceBackdoor pCommandInterfaceBackdoor;
- ControlSender pControlSender;
- Router pRouter;
- ControlReceiver pControlReceiver;
- DatabaseObserver pObserver;
- CommonFunctions pCF;
+ CAmSocketHandler pSocketHandler;
+ CAmDatabaseHandler pDatabaseHandler;
+ CAmRoutingSender pRoutingSender;
+ CAmCommandSender pCommandSender;
+ MockIAmCommandSend pMockInterface;
+ IAmRoutingBackdoor pRoutingInterfaceBackdoor;
+ IAmCommandBackdoor pCommandInterfaceBackdoor;
+ CAmControlSender pControlSender;
+ CAmRouter pRouter;
+ CAmControlReceiver pControlReceiver;
+ CAmDatabaseObserver pObserver;
+ CAmCommonFunctions pCF;
void SetUp();
void TearDown();
diff --git a/AudioManagerDaemon/test/database/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
index 18e2883..da326da 100644
--- a/AudioManagerDaemon/test/database/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# Copyright (C) 2011, BMW AG
#
-# GeniviAudioMananger DatbaseTest
+# GeniviAudioMananger AmDatabaseHandlerTest
#
# \file CMakeLists.txt
#
@@ -23,7 +23,7 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(datbaseTest)
+PROJECT(AmDatabaseHandlerTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
@@ -33,35 +33,35 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB DATABASE_SRCS_CXX
- "../../src/DatabaseHandler.cpp"
- "../../src/DatabaseObserver.cpp"
- "../../src/CommandSender.cpp"
- "../../src/RoutingSender.cpp"
- "../../src/ControlReceiver.cpp"
- "../../src/ControlSender.cpp"
- "../../src/Router.cpp"
- "../../src/DLTWrapper.cpp"
- "../../src/SocketHandler.cpp"
- "../../src/CommandReceiver.cpp"
- "../../src/RoutingReceiver.cpp"
- "../CommonFunctions.cpp"
+ "../../src/CAmDatabaseHandler.cpp"
+ "../../src/CAmDatabaseObserver.cpp"
+ "../../src/CAmCommandSender.cpp"
+ "../../src/CAmRoutingSender.cpp"
+ "../../src/CAmControlReceiver.cpp"
+ "../../src/CAmControlSender.cpp"
+ "../../src/CAmRouter.cpp"
+ "../../src/CAmDltWrapper.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmCommandReceiver.cpp"
+ "../../src/CAmRoutingReceiver.cpp"
+ "../CAmCommonFunctions.cpp"
"*.cpp"
)
-ADD_EXECUTABLE( databasetest ${DATABASE_SRCS_CXX})
+ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX})
-TARGET_LINK_LIBRARIES( databasetest
+TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest
${SQLITE_LIBRARIES}
${DLT_LIBRARIES}
${DBUS_LIBRARY}
@@ -70,7 +70,7 @@ TARGET_LINK_LIBRARIES( databasetest
gmock
)
-INSTALL(TARGETS databasetest
+INSTALL(TARGETS AmDatabaseHandlerTest
DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
diff --git a/AudioManagerDaemon/test/routing/routingTest.cpp b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp
index aa3f333..27ad546 100644
--- a/AudioManagerDaemon/test/routing/routingTest.cpp
+++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.cpp
@@ -23,23 +23,14 @@
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#include "routingTest.h"
-#include "MockInterfaces.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "ControlSender.h"
-#include "DatabaseObserver.h"
-#include "Router.h"
-#include "../ControlInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
-#include "DLTWrapper.h"
+#include "CAmRouterTest.h"
#include <string.h>
+#include "shared/CAmDltWrapper.h"
using namespace am;
using namespace testing;
-routingTest::routingTest() :
+CAmRouterTest::CAmRouterTest() :
plistRoutingPluginDirs(), //
plistCommandPluginDirs(), //
pSocketHandler(), //
@@ -61,16 +52,16 @@ routingTest::routingTest() :
pControlInterfaceBackdoor.replaceController(&pControlSender, &pMockControlInterface);
}
-routingTest::~routingTest()
+CAmRouterTest::~CAmRouterTest()
{
}
-void routingTest::SetUp()
+void CAmRouterTest::SetUp()
{
logInfo("Routing Test started ");
}
-void routingTest::TearDown()
+void CAmRouterTest::TearDown()
{
}
@@ -79,7 +70,7 @@ arg4=arg3;
}
//test that checks just sinks and source in a domain but connectionformats do not match
-TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats)
+TEST_F(CAmRouterTest,simpleRoute2withDomainNoMatchFormats)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -140,7 +131,7 @@ TEST_F(routingTest,simpleRoute2withDomainNoMatchFormats)
}
//test that checks just sinks and source in a domain
-TEST_F(routingTest,simpleRoute2withDomain)
+TEST_F(CAmRouterTest,simpleRoute2withDomain)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -202,7 +193,7 @@ TEST_F(routingTest,simpleRoute2withDomain)
}
//test that checks just 2 domains, one sink one source with only one connection format each
-TEST_F(routingTest,simpleRoute2DomainsOnlyFree)
+TEST_F(CAmRouterTest,simpleRoute2DomainsOnlyFree)
{
@@ -310,7 +301,7 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFree)
}
//test that checks just 2 domains, one sink one source with only one connection format each
-TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
+TEST_F(CAmRouterTest,simpleRoute2DomainsOnlyFreeNotFree)
{
@@ -434,7 +425,7 @@ TEST_F(routingTest,simpleRoute2DomainsOnlyFreeNotFree)
}
//test that checks 3 domains, one sink one source, longer lists of connectionformats.
-TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2)
+TEST_F(CAmRouterTest,simpleRoute3DomainsListConnectionFormats_2)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -594,7 +585,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_2)
}
//test that checks 3 domains, one sink one source, longer lists of connectionformats.
-TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1)
+TEST_F(CAmRouterTest,simpleRoute3DomainsListConnectionFormats_1)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -749,7 +740,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats_1)
//test that checks 3 domains, one sink one source, longer lists of connectionformats.
-TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats)
+TEST_F(CAmRouterTest,simpleRoute3DomainsListConnectionFormats)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -898,7 +889,7 @@ TEST_F(routingTest,simpleRoute3DomainsListConnectionFormats)
//test that checks 4 domains, one sink and one source but there are 2 routes because there are 2 gateways
-TEST_F(routingTest,simpleRoute4Domains2Routes)
+TEST_F(CAmRouterTest,simpleRoute4Domains2Routes)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -1132,7 +1123,7 @@ TEST_F(routingTest,simpleRoute4Domains2Routes)
}
//test that checks 3 domains, one sink one source but the connectionformat of third domains do not fit.
-TEST_F(routingTest,simpleRoute3DomainsNoConnection)
+TEST_F(CAmRouterTest,simpleRoute3DomainsNoConnection)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -1276,7 +1267,7 @@ TEST_F(routingTest,simpleRoute3DomainsNoConnection)
ASSERT_EQ(0, listRoutes.size());
}
//test that checks just 2 domains, one sink one source with only one connection format each
-TEST_F(routingTest,simpleRoute2Domains)
+TEST_F(CAmRouterTest,simpleRoute2Domains)
{
@@ -1384,7 +1375,7 @@ TEST_F(routingTest,simpleRoute2Domains)
}
//test that checks just 2 domains, one sink one source but the connectionformat of source
-TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats)
+TEST_F(CAmRouterTest,simpleRoute2DomainsNoMatchConnectionFormats)
{
@@ -1490,7 +1481,7 @@ TEST_F(routingTest,simpleRoute2DomainsNoMatchConnectionFormats)
}
//test that checks 3 domains, one sink one source.
-TEST_F(routingTest,simpleRoute3Domains)
+TEST_F(CAmRouterTest,simpleRoute3Domains)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -1635,7 +1626,7 @@ TEST_F(routingTest,simpleRoute3Domains)
}
//test that checks 4 domains, one sink and one source.
-TEST_F(routingTest,simpleRoute4Domains)
+TEST_F(CAmRouterTest,simpleRoute4Domains)
{
EXPECT_CALL(pMockControlInterface,getConnectionFormatChoice(_,_,_,_,_)).WillRepeatedly(DoAll(returnConnectionFormat(), Return(E_OK)));
@@ -1821,7 +1812,7 @@ TEST_F(routingTest,simpleRoute4Domains)
int main(int argc, char **argv)
{
- DLTWrapper::instance()->registerApp("routing", "routingtest");
+ CAmDltWrapper::instance()->registerApp("routing", "CAmRouterTest");
logInfo("Routing Test started ");
::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS();
diff --git a/AudioManagerDaemon/test/routing/routingTest.h b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h
index 64ed8c5..53788be 100644
--- a/AudioManagerDaemon/test/routing/routingTest.h
+++ b/AudioManagerDaemon/test/AmRouterTest/CAmRouterTest.h
@@ -30,46 +30,48 @@
#include <gtest/gtest.h>
#include <gmock/gmock.h>
+
#include <algorithm>
#include <string>
#include <vector>
#include <set>
-#include "MockInterfaces.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "ControlSender.h"
-#include "DatabaseObserver.h"
-#include "RoutingSender.h"
-#include "Router.h"
-#include "SocketHandler.h"
-#include "../ControlInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
+#include "CAmDatabaseHandler.h"
+#include "CAmControlReceiver.h"
+#include "CAmControlSender.h"
+#include "CAmDatabaseObserver.h"
+#include "CAmRoutingSender.h"
+#include "CAmRouter.h"
+#include "shared/CAmSocketHandler.h"
+#include "../IAmControlBackdoor.h"
+#include "../IAmCommandBackdoor.h"
+#include "../CAmCommonFunctions.h"
+#include "../MockIAmControlSend.h"
+#include "../MockIAmCommandSend.h"
namespace am
{
-class routingTest: public ::testing::Test
+class CAmRouterTest: public ::testing::Test
{
public:
- routingTest();
- ~routingTest();
+ CAmRouterTest();
+ ~CAmRouterTest();
std::vector<std::string> plistRoutingPluginDirs;
std::vector<std::string> plistCommandPluginDirs;
- SocketHandler pSocketHandler;
- DatabaseHandler pDatabaseHandler;
- ControlSender pControlSender;
- Router pRouter;
- RoutingSender pRoutingSender;
- CommandSender pCommandSender;
- MockCommandSendInterface pMockInterface;
- MockControlSendInterface pMockControlInterface;
- RoutingInterfaceBackdoor pRoutingInterfaceBackdoor;
- CommandInterfaceBackdoor pCommandInterfaceBackdoor;
- ControlInterfaceBackdoor pControlInterfaceBackdoor;
- ControlReceiver pControlReceiver;
- DatabaseObserver pObserver;
- CommonFunctions pCF;
+ CAmSocketHandler pSocketHandler;
+ CAmDatabaseHandler pDatabaseHandler;
+ CAmControlSender pControlSender;
+ CAmRouter pRouter;
+ CAmRoutingSender pRoutingSender;
+ CAmCommandSender pCommandSender;
+ MockIAmCommandSend pMockInterface;
+ MockIAmControlSend pMockControlInterface;
+ IAmRoutingBackdoor pRoutingInterfaceBackdoor;
+ IAmCommandBackdoor pCommandInterfaceBackdoor;
+ IAmControlBackdoor pControlInterfaceBackdoor;
+ CAmControlReceiver pControlReceiver;
+ CAmDatabaseObserver pObserver;
+ CAmCommonFunctions pCF;
void SetUp();
void TearDown();
diff --git a/AudioManagerDaemon/test/routing/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
index a7c70f9..3c06729 100644
--- a/AudioManagerDaemon/test/routing/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt
@@ -23,7 +23,7 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(routingTest)
+PROJECT(AmRouterTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
@@ -33,35 +33,35 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB ROUTING_SRCS_CXX
- "../../src/DatabaseHandler.cpp"
- "../../src/DatabaseObserver.cpp"
- "../../src/CommandSender.cpp"
- "../../src/RoutingSender.cpp"
- "../../src/ControlReceiver.cpp"
- "../../src/ControlSender.cpp"
- "../../src/Router.cpp"
- "../../src/DLTWrapper.cpp"
- "../../src/SocketHandler.cpp"
- "../../src/CommandReceiver.cpp"
- "../../src/RoutingReceiver.cpp"
- "../CommonFunctions.cpp"
+ "../../src/CAmDatabaseHandler.cpp"
+ "../../src/CAmDatabaseObserver.cpp"
+ "../../src/CAmCommandSender.cpp"
+ "../../src/CAmRoutingSender.cpp"
+ "../../src/CAmControlReceiver.cpp"
+ "../../src/CAmControlSender.cpp"
+ "../../src/CAmRouter.cpp"
+ "../../src/CAmDltWrapper.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmCommandReceiver.cpp"
+ "../../src/CAmRoutingReceiver.cpp"
+ "../CAmCommonFunctions.cpp"
"*.cpp"
)
-ADD_EXECUTABLE( routingtest ${ROUTING_SRCS_CXX})
+ADD_EXECUTABLE( AmRouterTest ${ROUTING_SRCS_CXX})
-TARGET_LINK_LIBRARIES( routingtest
+TARGET_LINK_LIBRARIES( AmRouterTest
${SQLITE_LIBRARIES}
${DLT_LIBRARIES}
${DBUS_LIBRARY}
@@ -70,7 +70,7 @@ TARGET_LINK_LIBRARIES( routingtest
gmock
)
-INSTALL(TARGETS routingtest
+INSTALL(TARGETS AmRouterTest
DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
diff --git a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
index a827ebe..3e8cd21 100644
--- a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.cpp
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp
@@ -23,13 +23,13 @@
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#include "routingInterfaceTest.h"
-#include "DLTWrapper.h"
+#include "CAmRoutingInterfaceTest.h"
+#include "shared/CAmDltWrapper.h"
using namespace am;
using namespace testing;
-routingInterfaceTest::routingInterfaceTest() :
+CAmRoutingInterfaceTest::CAmRoutingInterfaceTest() :
plistRoutingPluginDirs(), //
plistCommandPluginDirs(), //
pSocketHandler(), //
@@ -50,21 +50,21 @@ routingInterfaceTest::routingInterfaceTest() :
pCommandInterfaceBackdoor.unloadPlugins(&pCommandSender);
}
-routingInterfaceTest::~routingInterfaceTest()
+CAmRoutingInterfaceTest::~CAmRoutingInterfaceTest()
{
}
-void routingInterfaceTest::SetUp()
+void CAmRoutingInterfaceTest::SetUp()
{
logInfo("RoutingSendInterface Test started ");
}
-void routingInterfaceTest::TearDown()
+void CAmRoutingInterfaceTest::TearDown()
{
}
-TEST_F(routingInterfaceTest,abort)
+TEST_F(CAmRoutingInterfaceTest,abort)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -108,14 +108,14 @@ TEST_F(routingInterfaceTest,abort)
ASSERT_EQ(E_NON_EXISTENT, pControlReceiver.abortAction(handle));
}
-TEST_F(routingInterfaceTest,abortNonExistent)
+TEST_F(CAmRoutingInterfaceTest,abortNonExistent)
{
EXPECT_CALL(pMockInterface,asyncAbort(_)).Times(0);
am_Handle_s handle;
ASSERT_EQ(E_NON_EXISTENT, pControlReceiver.abortAction(handle));
}
-TEST_F(routingInterfaceTest,alreadyConnected)
+TEST_F(CAmRoutingInterfaceTest,alreadyConnected)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -139,7 +139,7 @@ TEST_F(routingInterfaceTest,alreadyConnected)
ASSERT_EQ(handle.handleType, H_CONNECT);
}
-TEST_F(routingInterfaceTest,setSinkSoundPropertyNoChange)
+TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -163,7 +163,7 @@ TEST_F(routingInterfaceTest,setSinkSoundPropertyNoChange)
ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkSoundProperty(handle,sinkID,soundProperty));
}
-TEST_F(routingInterfaceTest,setSourceState)
+TEST_F(CAmRoutingInterfaceTest,setSourceState)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -185,7 +185,7 @@ TEST_F(routingInterfaceTest,setSourceState)
ASSERT_EQ(handle.handleType, H_SETSOURCESTATE);
}
-TEST_F(routingInterfaceTest,setSourceSoundProperty)
+TEST_F(CAmRoutingInterfaceTest,setSourceSoundProperty)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -211,7 +211,7 @@ TEST_F(routingInterfaceTest,setSourceSoundProperty)
ASSERT_TRUE(listHandles[0].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,setSinkSoundProperty)
+TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -237,7 +237,7 @@ TEST_F(routingInterfaceTest,setSinkSoundProperty)
ASSERT_TRUE(listHandles[0].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,setSourceVolumeNoChange)
+TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -263,7 +263,7 @@ TEST_F(routingInterfaceTest,setSourceVolumeNoChange)
ASSERT_TRUE(listHandles.empty());
}
-TEST_F(routingInterfaceTest,setSourceVolume)
+TEST_F(CAmRoutingInterfaceTest,setSourceVolume)
{
am_Source_s source;
am_sourceID_t sourceID;
@@ -291,7 +291,7 @@ TEST_F(routingInterfaceTest,setSourceVolume)
ASSERT_TRUE(listHandles[0].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,setSinkVolumeNoChange)
+TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -317,7 +317,7 @@ TEST_F(routingInterfaceTest,setSinkVolumeNoChange)
ASSERT_TRUE(listHandles.empty());
}
-TEST_F(routingInterfaceTest,setSinkVolume)
+TEST_F(CAmRoutingInterfaceTest,setSinkVolume)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -345,7 +345,7 @@ TEST_F(routingInterfaceTest,setSinkVolume)
ASSERT_TRUE(listHandles[0].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,connect)
+TEST_F(CAmRoutingInterfaceTest,connect)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -371,7 +371,7 @@ TEST_F(routingInterfaceTest,connect)
ASSERT_TRUE(listHandles[0].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,disconnect)
+TEST_F(CAmRoutingInterfaceTest,disconnect)
{
am_Sink_s sink;
am_sinkID_t sinkID;
@@ -400,7 +400,7 @@ TEST_F(routingInterfaceTest,disconnect)
ASSERT_TRUE(listHandles[1].handleType==handle.handleType);
}
-TEST_F(routingInterfaceTest,nothingTodisconnect)
+TEST_F(CAmRoutingInterfaceTest,nothingTodisconnect)
{
am_Handle_s handle;
am_connectionID_t connectionID = 4;
@@ -410,7 +410,7 @@ TEST_F(routingInterfaceTest,nothingTodisconnect)
ASSERT_TRUE(listHandles.empty());
}
-TEST_F(routingInterfaceTest,setSourceStateNoChange)
+TEST_F(CAmRoutingInterfaceTest,setSourceStateNoChange)
{
am_Source_s source;
am_sourceID_t sourceID;
diff --git a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.h b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
index f102221..a66599d 100644
--- a/AudioManagerDaemon/test/routingInterface/routingInterfaceTest.h
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.h
@@ -32,39 +32,39 @@
#include <string>
#include <vector>
#include <set>
-#include "MockRoutingInterface.h"
-#include "DatabaseHandler.h"
-#include "ControlReceiver.h"
-#include "ControlSender.h"
-#include "DatabaseObserver.h"
-#include "SocketHandler.h"
-#include "Router.h"
-#include "../RoutingInterfaceBackdoor.h"
-#include "../CommandInterfaceBackdoor.h"
-#include "../CommonFunctions.h"
+#include "CAmDatabaseHandler.h"
+#include "CAmControlReceiver.h"
+#include "CAmControlSender.h"
+#include "CAmDatabaseObserver.h"
+#include "CAmRouter.h"
+#include "../IAmRoutingBackdoor.h"
+#include "../IAmCommandBackdoor.h"
+#include "../CAmCommonFunctions.h"
+#include "../MockIAmRoutingSend.h"
+#include "shared/CAmSocketHandler.h"
namespace am
{
-class routingInterfaceTest: public ::testing::Test
+class CAmRoutingInterfaceTest: public ::testing::Test
{
public:
- routingInterfaceTest();
- ~routingInterfaceTest();
+ CAmRoutingInterfaceTest();
+ ~CAmRoutingInterfaceTest();
std::vector<std::string> plistRoutingPluginDirs;
std::vector<std::string> plistCommandPluginDirs;
- SocketHandler pSocketHandler;
- DatabaseHandler pDatabaseHandler;
- RoutingSender pRoutingSender;
- CommandSender pCommandSender;
- ControlSender pControlSender;
- Router pRouter;
- MockRoutingSendInterface pMockInterface;
- RoutingInterfaceBackdoor pRoutingInterfaceBackdoor;
- CommandInterfaceBackdoor pCommandInterfaceBackdoor;
- ControlReceiver pControlReceiver;
- DatabaseObserver pObserver;
- CommonFunctions pCF;
+ CAmSocketHandler pSocketHandler;
+ CAmDatabaseHandler pDatabaseHandler;
+ CAmRoutingSender pRoutingSender;
+ CAmCommandSender pCommandSender;
+ CAmControlSender pControlSender;
+ CAmRouter pRouter;
+ MockIAmRoutingSend pMockInterface;
+ IAmRoutingBackdoor pRoutingInterfaceBackdoor;
+ IAmCommandBackdoor pCommandInterfaceBackdoor;
+ CAmControlReceiver pControlReceiver;
+ CAmDatabaseObserver pObserver;
+ CAmCommonFunctions pCF;
void SetUp();
void TearDown();
};
diff --git a/AudioManagerDaemon/test/routingInterface/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
index fbb4ac1..ac87e8d 100644
--- a/AudioManagerDaemon/test/routingInterface/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# Copyright (C) 2011, BMW AG
#
-# GeniviAudioMananger RoutingInterfaceTest
+# GeniviAudioMananger AmRoutingInterfaceTest
#
# \file CMakeLists.txt
#
@@ -23,7 +23,7 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(routingInterfaceTest)
+PROJECT(AmRoutingInterfaceTest)
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
@@ -34,35 +34,35 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB ROUTING_INTERFACE_SRCS_CXX
- "../../src/ControlReceiver.cpp"
- "../../src/DatabaseHandler.cpp"
- "../../src/DatabaseObserver.cpp"
- "../../src/CommandSender.cpp"
- "../../src/RoutingSender.cpp"
- "../../src/Router.cpp"
- "../../src/ControlSender.cpp"
- "../CommonFunctions.cpp"
- "../../src/DLTWrapper.cpp"
- "../../src/SocketHandler.cpp"
- "../../src/RoutingReceiver.cpp"
- "../../src/CommandReceiver.cpp"
+ "../../src/CAmControlReceiver.cpp"
+ "../../src/CAmDatabaseHandler.cpp"
+ "../../src/CAmDatabaseObserver.cpp"
+ "../../src/CAmCommandSender.cpp"
+ "../../src/CAmRoutingSender.cpp"
+ "../../src/CAmRouter.cpp"
+ "../../src/CAmControlSender.cpp"
+ "../CAmCommonFunctions.cpp"
+ "../../src/CAmDltWrapper.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmRoutingReceiver.cpp"
+ "../../src/CAmCommandReceiver.cpp"
"*.cpp"
)
-ADD_EXECUTABLE(routinginterfacetest ${ROUTING_INTERFACE_SRCS_CXX})
+ADD_EXECUTABLE(AmRoutingInterfaceTest ${ROUTING_INTERFACE_SRCS_CXX})
-TARGET_LINK_LIBRARIES(routinginterfacetest
+TARGET_LINK_LIBRARIES(AmRoutingInterfaceTest
${SQLITE_LIBRARIES}
${DLT_LIBRARIES}
${DBUS_LIBRARY}
@@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(routinginterfacetest
gmock
)
-INSTALL(TARGETS routinginterfacetest
+INSTALL(TARGETS AmRoutingInterfaceTest
DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
diff --git a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
index 91eee2c..b0b5639 100644
--- a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.cpp
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.cpp
@@ -23,15 +23,17 @@
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#include "sockethandlerTest.h"
+#include "CAmSocketHandlerTest.h"
#include <stdio.h>
-#include <sys/socket.h> /* for socket(), connect(), (), and recv() */
-#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */
+#include <sys/socket.h>
+#include <arpa/inet.h>
#include <sys/ioctl.h>
#include <string.h>
#include <netdb.h>
#include <fcntl.h>
#include <sys/un.h>
+#include <sys/poll.h>
+#include "shared/CAmSocketHandler.h"
//todo: expand test, implement more usecases
//todo: test removeFD
@@ -41,29 +43,29 @@
using namespace testing;
using namespace am;
-sockethandlerTest::sockethandlerTest()
+CAmSocketHandlerTest::CAmSocketHandlerTest()
{
}
-sockethandlerTest::~sockethandlerTest()
+CAmSocketHandlerTest::~CAmSocketHandlerTest()
{
}
-timerCallBack::timerCallBack(SocketHandler *myHandler) :
- pTimer1Callback(this, &timerCallBack::timer1Callback), //
- pTimer2Callback(this, &timerCallBack::timer2Callback), //
- pTimer3Callback(this, &timerCallBack::timer3Callback), //
- pTimer4Callback(this, &timerCallBack::timer4Callback), //
+CAmTimerCb::CAmTimerCb(CAmSocketHandler *myHandler) :
+ pTimer1Callback(this, &CAmTimerCb::timer1Callback), //
+ pTimer2Callback(this, &CAmTimerCb::timer2Callback), //
+ pTimer3Callback(this, &CAmTimerCb::timer3Callback), //
+ pTimer4Callback(this, &CAmTimerCb::timer4Callback), //
mSocketHandler(myHandler)
{
}
-am::timerCallBack::~timerCallBack()
+am::CAmTimerCb::~CAmTimerCb()
{
}
-void am::timerCallBack::timer1Callback(sh_timerHandle_t handle, void* userData)
+void am::CAmTimerCb::timer1Callback(sh_timerHandle_t handle, void* userData)
{
(void) handle;
(void) userData;
@@ -71,12 +73,12 @@ void am::timerCallBack::timer1Callback(sh_timerHandle_t handle, void* userData)
timespec timeout;
timeout.tv_nsec = 0;
timeout.tv_sec = 1;
- shTimerCallBack *buf = &pTimer1Callback;
+ CAmShTimerCallBack *buf = &pTimer1Callback;
sh_timerHandle_t handle_;
mSocketHandler->addTimer(timeout, buf, handle_, NULL);
}
-void am::timerCallBack::timer2Callback(sh_timerHandle_t handle, void* userData)
+void am::CAmTimerCb::timer2Callback(sh_timerHandle_t handle, void* userData)
{
(void) handle;
(void) userData;
@@ -84,18 +86,18 @@ void am::timerCallBack::timer2Callback(sh_timerHandle_t handle, void* userData)
timespec timeout;
timeout.tv_nsec = 0;
timeout.tv_sec = 1;
- shTimerCallBack *buf = &pTimer2Callback;
+ CAmShTimerCallBack *buf = &pTimer2Callback;
sh_timerHandle_t handle_;
mSocketHandler->addTimer(timeout, buf, handle_, NULL);
}
-void am::timerCallBack::timer3Callback(sh_timerHandle_t, void* userData)
+void am::CAmTimerCb::timer3Callback(sh_timerHandle_t, void* userData)
{
(void) userData;
std::cout << "callback3 called" << std::endl;
}
-void am::timerCallBack::timer4Callback(sh_timerHandle_t, void* userData)
+void am::CAmTimerCb::timer4Callback(sh_timerHandle_t, void* userData)
{
(void) userData;
std::cout << "callback4 called" << std::endl;
@@ -105,9 +107,9 @@ void am::timerCallBack::timer4Callback(sh_timerHandle_t, void* userData)
void* playWithSocketServer(void* data)
{
(void) data;
- SocketHandler myHandler;
- SamplePlugin::sockType_e type = SamplePlugin::INET;
- SamplePlugin myplugin(&myHandler, type);
+ CAmSocketHandler myHandler;
+ CAmSamplePlugin::sockType_e type = CAmSamplePlugin::INET;
+ CAmSamplePlugin myplugin(&myHandler, type);
myHandler.start_listenting();
return (NULL);
}
@@ -115,14 +117,14 @@ void* playWithSocketServer(void* data)
void* playWithUnixSocketServer(void* data)
{
(void) data;
- SocketHandler myHandler;
- SamplePlugin::sockType_e type = SamplePlugin::UNIX;
- SamplePlugin myplugin(&myHandler, type);
+ CAmSocketHandler myHandler;
+ CAmSamplePlugin::sockType_e type = CAmSamplePlugin::UNIX;
+ CAmSamplePlugin myplugin(&myHandler, type);
myHandler.start_listenting();
return (NULL);
}
-TEST(sockethandlerTest,playWithUNIXSockets)
+TEST(CAmSocketHandlerTest,playWithUNIXSockets)
{
pthread_t serverThread;
struct sockaddr_un servAddr;
@@ -157,7 +159,7 @@ TEST(sockethandlerTest,playWithUNIXSockets)
pthread_join(serverThread, NULL);
}
-TEST(sockethandlerTest,playWithSockets)
+TEST(CAmSocketHandlerTest,playWithSockets)
{
pthread_t serverThread;
struct sockaddr_in servAddr;
@@ -202,11 +204,11 @@ TEST(sockethandlerTest,playWithSockets)
pthread_join(serverThread, NULL);
}
-TEST(sockethandlerTest,playWithTimers)
+TEST(CAmSocketHandlerTest,playWithTimers)
{
gDispatchDone = 0;
- SocketHandler myHandler;
- timerCallBack testCallback(&myHandler);
+ CAmSocketHandler myHandler;
+ CAmTimerCb testCallback(&myHandler);
timespec timeoutTime, timeout2, timeout3, timeout4;
timeoutTime.tv_sec = 3;
timeoutTime.tv_nsec = 0;
@@ -216,10 +218,10 @@ TEST(sockethandlerTest,playWithTimers)
timeout3.tv_sec = 2;
timeout4.tv_nsec = 0;
timeout4.tv_sec = 13;
- shTimerCallBack* buf = &testCallback.pTimer1Callback;
- shTimerCallBack* buf2 = &testCallback.pTimer2Callback;
- shTimerCallBack* buf3 = &testCallback.pTimer3Callback;
- shTimerCallBack* buf4 = &testCallback.pTimer4Callback;
+ CAmShTimerCallBack* buf = &testCallback.pTimer1Callback;
+ CAmShTimerCallBack* buf2 = &testCallback.pTimer2Callback;
+ CAmShTimerCallBack* buf3 = &testCallback.pTimer3Callback;
+ CAmShTimerCallBack* buf4 = &testCallback.pTimer4Callback;
sh_timerHandle_t handle;
myHandler.addTimer(timeoutTime, buf, handle, NULL);
myHandler.addTimer(timeout2, buf2, handle, NULL);
@@ -229,11 +231,11 @@ TEST(sockethandlerTest,playWithTimers)
}
-void sockethandlerTest::SetUp()
+void CAmSocketHandlerTest::SetUp()
{
}
-void sockethandlerTest::TearDown()
+void CAmSocketHandlerTest::TearDown()
{
}
@@ -243,11 +245,11 @@ int main(int argc, char **argv)
return RUN_ALL_TESTS();
}
-am::SamplePlugin::SamplePlugin(SocketHandler *mySocketHandler, sockType_e socketType) :
- connectFiredCB(this, &SamplePlugin::connectSocket), //
- receiveFiredCB(this, &SamplePlugin::receiveData), //
- sampleDispatchCB(this, &SamplePlugin::dispatchData), //
- sampleCheckCB(this, &SamplePlugin::check), //
+am::CAmSamplePlugin::CAmSamplePlugin(CAmSocketHandler *mySocketHandler, sockType_e socketType) :
+ connectFiredCB(this, &CAmSamplePlugin::connectSocket), //
+ receiveFiredCB(this, &CAmSamplePlugin::receiveData), //
+ sampleDispatchCB(this, &CAmSamplePlugin::dispatchData), //
+ sampleCheckCB(this, &CAmSamplePlugin::check), //
mSocketHandler(mySocketHandler), //
mConnecthandle(), //
mReceiveHandle(), //
@@ -297,7 +299,7 @@ am::SamplePlugin::SamplePlugin(SocketHandler *mySocketHandler, sockType_e socket
std::cout << "setup server - listening" << std::endl;
}
-void am::SamplePlugin::connectSocket(const pollfd pollfd1, const sh_pollHandle_t handle, void *userData)
+void am::CAmSamplePlugin::connectSocket(const pollfd pollfd1, const sh_pollHandle_t handle, void *userData)
{
(void) handle;
(void) userData;
@@ -316,7 +318,7 @@ void am::SamplePlugin::connectSocket(const pollfd pollfd1, const sh_pollHandle_t
}
-void am::SamplePlugin::receiveData(const pollfd pollfd, const sh_pollHandle_t handle, void *userData)
+void am::CAmSamplePlugin::receiveData(const pollfd pollfd, const sh_pollHandle_t handle, void *userData)
{
(void) handle;
(void) userData;
@@ -333,7 +335,7 @@ void am::SamplePlugin::receiveData(const pollfd pollfd, const sh_pollHandle_t ha
}
}
-bool am::SamplePlugin::dispatchData(const sh_pollHandle_t handle, void *userData)
+bool am::CAmSamplePlugin::dispatchData(const sh_pollHandle_t handle, void *userData)
{
(void) handle;
(void) userData;
@@ -352,7 +354,7 @@ bool am::SamplePlugin::dispatchData(const sh_pollHandle_t handle, void *userData
return false;
}
-bool am::SamplePlugin::check(const sh_pollHandle_t handle, void *userData)
+bool am::CAmSamplePlugin::check(const sh_pollHandle_t handle, void *userData)
{
(void) handle;
(void) userData;
diff --git a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.h b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h
index abb8ace..f45376e 100644
--- a/AudioManagerDaemon/test/sockethandler/sockethandlerTest.h
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CAmSocketHandlerTest.h
@@ -28,20 +28,20 @@
#include <gtest/gtest.h>
#include <queue>
-#include "SocketHandler.h"
+#include "shared/CAmSocketHandler.h"
namespace am
{
-class SamplePlugin
+class CAmSamplePlugin
{
public:
enum sockType_e
{
UNIX, INET
};
- SamplePlugin(SocketHandler *mySocketHandler, sockType_e socketType);
- ~SamplePlugin()
+ CAmSamplePlugin(CAmSocketHandler *mySocketHandler, sockType_e socketType);
+ ~CAmSamplePlugin()
{
}
;
@@ -49,37 +49,37 @@ public:
void receiveData(const pollfd pollfd, const sh_pollHandle_t handle, void* userData);
bool dispatchData(const sh_pollHandle_t handle, void* userData);
bool check(const sh_pollHandle_t handle, void* userData);
- shPollFired_T<SamplePlugin> connectFiredCB;
- shPollFired_T<SamplePlugin> receiveFiredCB;
- shPollDispatch_T<SamplePlugin> sampleDispatchCB;
- shPollCheck_T<SamplePlugin> sampleCheckCB;
+ TAmShPollFired<CAmSamplePlugin> connectFiredCB;
+ TAmShPollFired<CAmSamplePlugin> receiveFiredCB;
+ TAmShPollDispatch<CAmSamplePlugin> sampleDispatchCB;
+ TAmShPollCheck<CAmSamplePlugin> sampleCheckCB;
private:
- SocketHandler *mSocketHandler;
+ CAmSocketHandler *mSocketHandler;
sh_pollHandle_t mConnecthandle, mReceiveHandle;
std::queue<std::string> msgList;
};
-class timerCallBack
+class CAmTimerCb
{
public:
- timerCallBack(SocketHandler *SocketHandler);
- virtual ~timerCallBack();
+ CAmTimerCb(CAmSocketHandler *SocketHandler);
+ virtual ~CAmTimerCb();
void timer1Callback(sh_timerHandle_t handle, void * userData);
void timer2Callback(sh_timerHandle_t handle, void * userData);
void timer3Callback(sh_timerHandle_t handle, void * userData);
void timer4Callback(sh_timerHandle_t handle, void * userData);
- shTimerCallBack_T<timerCallBack> pTimer1Callback;
- shTimerCallBack_T<timerCallBack> pTimer2Callback;
- shTimerCallBack_T<timerCallBack> pTimer3Callback;
- shTimerCallBack_T<timerCallBack> pTimer4Callback;
- SocketHandler *mSocketHandler;
+ TAmShTimerCallBack<CAmTimerCb> pTimer1Callback;
+ TAmShTimerCallBack<CAmTimerCb> pTimer2Callback;
+ TAmShTimerCallBack<CAmTimerCb> pTimer3Callback;
+ TAmShTimerCallBack<CAmTimerCb> pTimer4Callback;
+ CAmSocketHandler *mSocketHandler;
};
-class sockethandlerTest: public ::testing::Test
+class CAmSocketHandlerTest: public ::testing::Test
{
public:
- sockethandlerTest();
- ~sockethandlerTest();
+ CAmSocketHandlerTest();
+ ~CAmSocketHandlerTest();
void SetUp();
void TearDown();
};
diff --git a/AudioManagerDaemon/test/sockethandler/CMakeLists.txt b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
index 8858e5a..692b903 100644
--- a/AudioManagerDaemon/test/sockethandler/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmSocketHandlerTest/CMakeLists.txt
@@ -23,16 +23,16 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(socketHandlerTest)
+PROJECT(AmSocketHandlerTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
set(STD_INCLUDE_DIRS "/usr/include")
set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces)
-set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../../includes)
-set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusIncludes)
-set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
+set(AUDIO_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../include)
+set(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
+set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
FIND_PACKAGE(PkgConfig)
@@ -40,25 +40,25 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB Socket_SRCS_CXX
- "../../src/SocketHandler.cpp"
- "../../src/DLTWrapper.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmDltWrapper.cpp"
"*.cpp"
)
-ADD_EXECUTABLE(socketHandlerTest ${Socket_SRCS_CXX})
+ADD_EXECUTABLE(AmSocketHandlerTest ${Socket_SRCS_CXX})
-TARGET_LINK_LIBRARIES(socketHandlerTest
+TARGET_LINK_LIBRARIES(AmSocketHandlerTest
${DLT_LIBRARIES}
${DBUS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(socketHandlerTest
gmock
)
-INSTALL(TARGETS socketHandlerTest
+INSTALL(TARGETS AmSocketHandlerTest
DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
diff --git a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
index d727fff..2219834 100644
--- a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.cpp
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.cpp
@@ -10,9 +10,9 @@
#include <netdb.h> /* for struct hostent */
#include "CAmTelnetServerTest.h"
-#include "CommandReceiver.h"
-#include "RoutingReceiver.h"
-#include "ControlReceiver.h"
+#include "CAmCommandReceiver.h"
+#include "CAmRoutingReceiver.h"
+#include "CAmControlReceiver.h"
using namespace testing;
@@ -23,19 +23,19 @@ using namespace std;
static std::string controllerPlugin = std::string(CONTROLLER_PLUGIN);
static unsigned short servPort = 6060;
static int staticSocket = -1;
-static SocketHandler* mpSocketHandler = NULL;
+static CAmSocketHandler* mpSocketHandler = NULL;
void* startSocketHandler(void* data)
{
- MyEnvironment* Env = static_cast<MyEnvironment*>(data);
- SocketHandler mySocketHandler;
+ CAmEnvironment* Env = static_cast<CAmEnvironment*>(data);
+ CAmSocketHandler mySocketHandler;
Env->setSocketHandler(&mySocketHandler);
mySocketHandler.start_listenting();
Env->setSocketHandler(NULL);
return (NULL);
}
-MyEnvironment::MyEnvironment()
+CAmEnvironment::CAmEnvironment()
: mlistRoutingPluginDirs()
, mlistCommandPluginDirs()
//, mpSocketHandler(NULL)
@@ -52,7 +52,7 @@ MyEnvironment::MyEnvironment()
{
}
-MyEnvironment::~MyEnvironment()
+CAmEnvironment::~CAmEnvironment()
{
usleep(500);
if(NULL != mpTelnetServer)
@@ -65,26 +65,26 @@ MyEnvironment::~MyEnvironment()
delete(mpCommandReceiver);
}
-void MyEnvironment::SetUp()
+void CAmEnvironment::SetUp()
{
pthread_create(&mSocketHandlerThread, NULL, startSocketHandler, this);
sleep(1);
}
-void MyEnvironment::TearDown()
+void CAmEnvironment::TearDown()
{
}
-void MyEnvironment::setSocketHandler(SocketHandler* pSocketHandler)
+void CAmEnvironment::setSocketHandler(CAmSocketHandler* pSocketHandler)
{
mpSocketHandler = pSocketHandler;
if(NULL != pSocketHandler)
{
- mpCommandReceiver = new CommandReceiver(&mDatabasehandler,&mControlSender,mpSocketHandler);
- mpRoutingReceiver = new RoutingReceiver(&mDatabasehandler,&mRoutingSender,&mControlSender,mpSocketHandler);
- mpControlReceiver = new ControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,&mRouter);
+ mpCommandReceiver = new CAmCommandReceiver(&mDatabasehandler,&mControlSender,mpSocketHandler);
+ mpRoutingReceiver = new CAmRoutingReceiver(&mDatabasehandler,&mRoutingSender,&mControlSender,mpSocketHandler);
+ mpControlReceiver = new CAmControlReceiver(&mDatabasehandler,&mRoutingSender,&mCommandSender,mpSocketHandler,&mRouter);
//startup all the Plugins and Interfaces
mControlSender.startupController(mpControlReceiver);
@@ -95,11 +95,11 @@ void MyEnvironment::setSocketHandler(SocketHandler* pSocketHandler)
mControlSender.setControllerReady();
// Starting TelnetServer
- mpTelnetServer = new TelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,&mControlSender,mpControlReceiver,&mDatabasehandler,&mRouter,servPort,3);
+ mpTelnetServer = new CAmTelnetServer(mpSocketHandler,&mCommandSender,mpCommandReceiver,&mRoutingSender,mpRoutingReceiver,&mControlSender,mpControlReceiver,&mDatabasehandler,&mRouter,servPort,3);
}
}
-void MyEnvironment::stopSocketHandler()
+void CAmEnvironment::stopSocketHandler()
{
mpSocketHandler->stop_listening();
}
@@ -184,7 +184,7 @@ TEST_F(CAmTelnetServerTest,closeTelnetServerConnection)
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
- ::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new MyEnvironment);
+ ::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new CAmEnvironment);
(void) env;
return RUN_ALL_TESTS();
}
diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
new file mode 100644
index 0000000..7a87e68
--- /dev/null
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CAmTelnetServerTest.h
@@ -0,0 +1,87 @@
+/*
+ * CAmTelnetServerTest.h
+ *
+ * Created on: Feb 7, 2012
+ * Author: Frank Herchet
+ */
+
+#ifndef CAMTELNETSERVERTEST_H_
+#define CAMTELNETSERVERTEST_H_
+
+#include "gtest/gtest.h"
+#include "CAmTelnetServer.h"
+#include "CAmDatabaseHandler.h"
+#include "CAmRoutingSender.h"
+#include "CAmCommandSender.h"
+#include "CAmControlSender.h"
+#include "CAmRouter.h"
+
+namespace am
+{
+
+class CAmSocketHandler;
+class CAmDatabaseHandler;
+class CAmRoutingSender;
+class CAmCommandSender;
+class CAmControlSender;
+class CAmRouter;
+class CAmCommandReceiver;
+class CAmRoutingReceiver;
+class CAmControlReceiver;
+class CAmTelnetServer;
+
+
+class CAmEnvironment : public ::testing::Environment
+{
+ public:
+ CAmEnvironment();
+
+ ~CAmEnvironment();
+ // Override this to define how to set up the environment.
+ void SetUp();
+ // Override this to define how to tear down the environment.
+ void TearDown();
+
+ void setSocketHandler(CAmSocketHandler* pSocketHandler);
+
+ void stopSocketHandler();
+
+ std::vector<std::string> mlistRoutingPluginDirs;
+ std::vector<std::string> mlistCommandPluginDirs;
+
+ //SocketHandler* mpSocketHandler;
+ CAmDatabaseHandler mDatabasehandler;
+ CAmRoutingSender mRoutingSender;
+ CAmCommandSender mCommandSender;
+ CAmControlSender mControlSender;
+ CAmRouter mRouter;
+
+ CAmCommandReceiver* mpCommandReceiver;
+ CAmRoutingReceiver* mpRoutingReceiver;
+ CAmControlReceiver* mpControlReceiver;
+
+ CAmTelnetServer* mpTelnetServer;
+
+ pthread_t mSocketHandlerThread;
+};
+
+class CAmTelnetServerTest : public ::testing::Test
+{
+ public:
+ CAmTelnetServerTest();
+ ~CAmTelnetServerTest();
+
+
+ void SetUp() ;
+
+ void TearDown() ;
+
+ //int mSocket;
+};
+
+}
+
+
+
+
+#endif /* CAMTELNETSERVERTEST_H_ */
diff --git a/AudioManagerDaemon/test/telnetserver/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
index ff6d90d..c70ec2d 100644
--- a/AudioManagerDaemon/test/telnetserver/CMakeLists.txt
+++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt
@@ -23,16 +23,16 @@
cmake_minimum_required(VERSION 2.6)
-PROJECT(telnetServerText)
+PROJECT(AmTelnetServerTest)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
set(STD_INCLUDE_DIRS "/usr/include")
set(DBUS_FOLDER ${CMAKE_SOURCE_DIR}/../../../dbusInterfaces)
-set(AUDIO_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../../includes)
-set(DBUS_INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusIncludes)
-set(INCLUDES_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
+set(AUDIO_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../include)
+set(DBUS_include_FOLDER ${CMAKE_SOURCE_DIR}/../../../../dbusinclude)
+set(include_FOLDER ${CMAKE_SOURCE_DIR}/../../include)
FIND_PACKAGE(PkgConfig)
@@ -40,37 +40,37 @@ pkg_check_modules(DLT REQUIRED automotive-dlt)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
- ${AUDIO_INCLUDES_FOLDER}
+ ${AUDIO_include_FOLDER}
${DBUS_ARCH_INCLUDE_DIR}
- ${DBUS_INCLUDES_FOLDER}
+ ${DBUS_include_FOLDER}
${CMAKE_SOURCE_DIR}
${STD_INCLUDE_DIRS}
${DLT_INCLUDE_DIRS}
${DBUS_INCLUDE_DIR}
${GTEST_INCLUDE_DIR}
- ${INCLUDES_FOLDER}
+ ${include_FOLDER}
)
file(GLOB TELNET_SRCS_CXX
- "../../src/CommandReceiver.cpp"
- "../../src/CommandSender.cpp"
- "../../src/ControlReceiver.cpp"
- "../../src/ControlSender.cpp"
- "../../src/DatabaseHandler.cpp"
- "../../src/DatabaseObserver.cpp"
- "../../src/RoutingReceiver.cpp"
- "../../src/RoutingSender.cpp"
- "../../src/SocketHandler.cpp"
- "../../src/TelnetServer.cpp"
- "../../src/Router.cpp"
- "../../src/DLTWrapper.cpp"
+ "../../src/CAmCommandReceiver.cpp"
+ "../../src/CAmCommandSender.cpp"
+ "../../src/CAmControlReceiver.cpp"
+ "../../src/CAmControlSender.cpp"
+ "../../src/CAmDatabaseHandler.cpp"
+ "../../src/CAmDatabaseObserver.cpp"
+ "../../src/CAmRoutingReceiver.cpp"
+ "../../src/CAmRoutingSender.cpp"
+ "../../src/CAmSocketHandler.cpp"
+ "../../src/CAmTelnetServer.cpp"
+ "../../src/CAmRouter.cpp"
+ "../../src/CAmDltWrapper.cpp"
"../../src/CAmTelnetMenuHelper.cpp"
"*.cpp"
)
-ADD_EXECUTABLE(telnetServerTest ${TELNET_SRCS_CXX})
+ADD_EXECUTABLE(AmTelnetServerTest ${TELNET_SRCS_CXX})
-TARGET_LINK_LIBRARIES(telnetServerTest
+TARGET_LINK_LIBRARIES(AmTelnetServerTest
${SQLITE_LIBRARIES}
${DLT_LIBRARIES}
${DBUS_LIBRARY}
@@ -80,8 +80,8 @@ TARGET_LINK_LIBRARIES(telnetServerTest
gmock
)
-INSTALL(TARGETS telnetServerTest
- DESTINATION "~/TelnetServerTest/"
+INSTALL(TARGETS AmTelnetServerTest
+ DESTINATION "~/AudioManagerTest/"
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
COMPONENT tests
)
diff --git a/AudioManagerDaemon/test/CommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
index 101548c..5136e59 100644
--- a/AudioManagerDaemon/test/CommonFunctions.cpp
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
@@ -3,7 +3,7 @@
*
* GeniviAudioMananger AudioManagerDaemon
*
- * \file CommonFunctions.cpp
+ * \file CAmCommonFunctions.cpp
*
* \date 20-Oct-2011 3:42:04 PM
* \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -23,23 +23,23 @@
* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
*/
-#include "CommonFunctions.h"
-#include "CommandInterfaceBackdoor.h"
-#include "RoutingInterfaceBackdoor.h"
-#include "ControlInterfaceBackdoor.h"
+#include "CAmCommonFunctions.h"
+#include "IAmCommandBackdoor.h"
+#include "IAmRoutingBackdoor.h"
+#include "IAmControlBackdoor.h"
#include <cassert>
#include <sstream>
using namespace am;
-CommandInterfaceBackdoor::CommandInterfaceBackdoor()
+IAmCommandBackdoor::IAmCommandBackdoor()
{
}
-CommandInterfaceBackdoor::~CommandInterfaceBackdoor()
+IAmCommandBackdoor::~IAmCommandBackdoor()
{
}
-bool CommandInterfaceBackdoor::unloadPlugins(CommandSender *CommandSender)
+bool IAmCommandBackdoor::unloadPlugins(CAmCommandSender *CommandSender)
{
assert(CommandSender != NULL);
CommandSender->unloadLibraries();
@@ -49,7 +49,7 @@ bool CommandInterfaceBackdoor::unloadPlugins(CommandSender *CommandSender)
return false;
}
-bool CommandInterfaceBackdoor::injectInterface(CommandSender *CommandSender, CommandSendInterface *CommandSendInterface)
+bool IAmCommandBackdoor::injectInterface(CAmCommandSender *CommandSender, IAmCommandSend *CommandSendInterface)
{
assert(CommandSender != NULL);
assert(CommandSendInterface != NULL);
@@ -57,14 +57,14 @@ bool CommandInterfaceBackdoor::injectInterface(CommandSender *CommandSender, Com
return true;
}
-RoutingInterfaceBackdoor::RoutingInterfaceBackdoor()
+IAmRoutingBackdoor::IAmRoutingBackdoor()
{
}
-RoutingInterfaceBackdoor::~RoutingInterfaceBackdoor()
+IAmRoutingBackdoor::~IAmRoutingBackdoor()
{
}
-bool RoutingInterfaceBackdoor::unloadPlugins(RoutingSender *RoutingSender)
+bool IAmRoutingBackdoor::unloadPlugins(CAmRoutingSender *RoutingSender)
{
assert(RoutingSender != NULL);
RoutingSender->unloadLibraries();
@@ -74,27 +74,27 @@ bool RoutingInterfaceBackdoor::unloadPlugins(RoutingSender *RoutingSender)
return false;
}
-bool RoutingInterfaceBackdoor::injectInterface(RoutingSender *RoutingSender, RoutingSendInterface *newInterface, const std::string& busname)
+bool IAmRoutingBackdoor::injectInterface(CAmRoutingSender *RoutingSender, IAmRoutingSend *newInterface, const std::string& busname)
{
assert(RoutingSender != NULL);
assert(newInterface != NULL);
- RoutingSender::InterfaceNamePairs newInterfacePair;
+ CAmRoutingSender::InterfaceNamePairs newInterfacePair;
newInterfacePair.routingInterface = newInterface;
newInterfacePair.busName = busname;
RoutingSender->mListInterfaces.push_back(newInterfacePair);
return true;
}
-ControlInterfaceBackdoor::ControlInterfaceBackdoor()
+IAmControlBackdoor::IAmControlBackdoor()
{
}
-ControlInterfaceBackdoor::~ControlInterfaceBackdoor()
+IAmControlBackdoor::~IAmControlBackdoor()
{
}
-bool ControlInterfaceBackdoor::replaceController(ControlSender *controlSender, ControlSendInterface *newController)
+bool IAmControlBackdoor::replaceController(CAmControlSender *controlSender, IAmControlSend *newController)
{
controlSender->mController = newController;
return true;
@@ -131,29 +131,29 @@ std::string int2string(int i)
return out.str();
}
-bool CommonFunctions::compareSource(std::vector<am_Source_s>::iterator listIterator, const am_Source_s& sourceData)
+bool CAmCommonFunctions::compareSource(std::vector<am_Source_s>::iterator listIterator, const am_Source_s& sourceData)
{
return (listIterator->available.availability == sourceData.available.availability) && (listIterator->available.availabilityReason == sourceData.available.availabilityReason) && (listIterator->sourceClassID == sourceData.sourceClassID) && (listIterator->domainID == sourceData.domainID) && (listIterator->interruptState == sourceData.interruptState) && (listIterator->visible == sourceData.visible) && (listIterator->name.compare(sourceData.name) == 0) && (listIterator->volume == sourceData.volume) && std::equal(listIterator->listConnectionFormats.begin(), listIterator->listConnectionFormats.end(), sourceData.listConnectionFormats.begin())
&& std::equal(listIterator->listMainSoundProperties.begin(), listIterator->listMainSoundProperties.end(), sourceData.listMainSoundProperties.begin(), equalMainSoundProperty) && std::equal(listIterator->listSoundProperties.begin(), listIterator->listSoundProperties.end(), sourceData.listSoundProperties.begin(), equalSoundProperty);
}
-bool CommonFunctions::compareSink(std::vector<am_Sink_s>::iterator listIterator, const am_Sink_s& sinkData)
+bool CAmCommonFunctions::compareSink(std::vector<am_Sink_s>::iterator listIterator, const am_Sink_s& sinkData)
{
return (listIterator->available.availability == sinkData.available.availability) && (listIterator->available.availabilityReason == sinkData.available.availabilityReason) && (listIterator->sinkClassID == sinkData.sinkClassID) && (listIterator->domainID == sinkData.domainID) && (listIterator->mainVolume == sinkData.mainVolume) && (listIterator->muteState == sinkData.muteState) && (listIterator->visible == sinkData.visible) && (listIterator->name.compare(sinkData.name) == 0) && (listIterator->volume == sinkData.volume) && std::equal(listIterator->listConnectionFormats.begin(), listIterator->listConnectionFormats.end(), sinkData.listConnectionFormats.begin())
&& std::equal(listIterator->listMainSoundProperties.begin(), listIterator->listMainSoundProperties.end(), sinkData.listMainSoundProperties.begin(), equalMainSoundProperty) && std::equal(listIterator->listSoundProperties.begin(), listIterator->listSoundProperties.end(), sinkData.listSoundProperties.begin(), equalSoundProperty);
}
-bool CommonFunctions::compareGateway(std::vector<am_Gateway_s>::iterator listIterator, const am_Gateway_s& gatewayData)
+bool CAmCommonFunctions::compareGateway(std::vector<am_Gateway_s>::iterator listIterator, const am_Gateway_s& gatewayData)
{
return (listIterator->name.compare(gatewayData.name) == 0) && (listIterator->sinkID == gatewayData.sinkID) && (listIterator->sourceID == gatewayData.sourceID) && (listIterator->controlDomainID == gatewayData.controlDomainID) && (listIterator->domainSinkID == gatewayData.domainSinkID) && (listIterator->domainSourceID == gatewayData.domainSourceID) && std::equal(listIterator->convertionMatrix.begin(), listIterator->convertionMatrix.end(), gatewayData.convertionMatrix.begin()) && std::equal(listIterator->listSourceFormats.begin(), listIterator->listSourceFormats.end(), gatewayData.listSourceFormats.begin()) && std::equal(listIterator->listSinkFormats.begin(), listIterator->listSinkFormats.end(), gatewayData.listSinkFormats.begin());
}
-bool CommonFunctions::compareGateway1(const am_Gateway_s gateway1, const am_Gateway_s gatewayData)
+bool CAmCommonFunctions::compareGateway1(const am_Gateway_s gateway1, const am_Gateway_s gatewayData)
{
return (gateway1.name.compare(gatewayData.name) == 0) && (gateway1.sinkID == gatewayData.sinkID) && (gateway1.sourceID == gatewayData.sourceID) && (gateway1.controlDomainID == gatewayData.controlDomainID) && (gateway1.domainSinkID == gatewayData.domainSinkID) && (gateway1.domainSourceID == gatewayData.domainSourceID) && std::equal(gateway1.convertionMatrix.begin(), gateway1.convertionMatrix.end(), gatewayData.convertionMatrix.begin()) && std::equal(gateway1.listSourceFormats.begin(), gateway1.listSourceFormats.end(), gatewayData.listSourceFormats.begin()) && std::equal(gateway1.listSinkFormats.begin(), gateway1.listSinkFormats.end(), gatewayData.listSinkFormats.begin());
}
-bool CommonFunctions::compareSinkMainSink(std::vector<am_SinkType_s>::iterator listIterator, const std::vector<am_Sink_s>& sinkList)
+bool CAmCommonFunctions::compareSinkMainSink(std::vector<am_SinkType_s>::iterator listIterator, const std::vector<am_Sink_s>& sinkList)
{
std::vector<am_Sink_s>::const_iterator sinkListIterator = sinkList.begin();
for (; sinkListIterator < sinkList.end(); ++sinkListIterator)
@@ -166,7 +166,7 @@ bool CommonFunctions::compareSinkMainSink(std::vector<am_SinkType_s>::iterator l
return false;
}
-bool CommonFunctions::compareSinkMainSource(std::vector<am_SourceType_s>::iterator listIterator, const std::vector<am_Source_s>& sourceList)
+bool CAmCommonFunctions::compareSinkMainSource(std::vector<am_SourceType_s>::iterator listIterator, const std::vector<am_Source_s>& sourceList)
{
std::vector<am_Source_s>::const_iterator sinkListIterator = sourceList.begin();
for (; sinkListIterator < sourceList.end(); ++sinkListIterator)
@@ -179,7 +179,7 @@ bool CommonFunctions::compareSinkMainSource(std::vector<am_SourceType_s>::iterat
return false;
}
-bool CommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
+bool CAmCommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
{
bool retVal = true;
std::vector<am_RoutingElement_s>::iterator itA = a.route.begin(), itB = b.route.begin();
@@ -196,7 +196,7 @@ bool CommonFunctions::compareRoute(am_Route_s a, am_Route_s b)
return retVal;
}
-std::vector<am_ConnectionFormat_e> CommonFunctions::getStandardConnectionFormatList()
+std::vector<am_ConnectionFormat_e> CAmCommonFunctions::getStandardConnectionFormatList()
{
std::vector<am_ConnectionFormat_e> list;
list.push_back(CF_GENIVI_ANALOG);
@@ -204,7 +204,7 @@ std::vector<am_ConnectionFormat_e> CommonFunctions::getStandardConnectionFormatL
return list;
}
-std::vector<am_SoundProperty_s> CommonFunctions::getStandardSoundPropertyList()
+std::vector<am_SoundProperty_s> CAmCommonFunctions::getStandardSoundPropertyList()
{
std::vector<am_SoundProperty_s> soundPropertyList;
am_SoundProperty_s soundProperty;
@@ -217,7 +217,7 @@ std::vector<am_SoundProperty_s> CommonFunctions::getStandardSoundPropertyList()
return soundPropertyList;
}
-std::vector<am_MainSoundProperty_s> CommonFunctions::getStandardMainSoundPropertyList()
+std::vector<am_MainSoundProperty_s> CAmCommonFunctions::getStandardMainSoundPropertyList()
{
std::vector<am_MainSoundProperty_s> mainSoundPropertyList;
am_MainSoundProperty_s mainSoundProperty;
@@ -230,7 +230,7 @@ std::vector<am_MainSoundProperty_s> CommonFunctions::getStandardMainSoundPropert
return mainSoundPropertyList;
}
-void CommonFunctions::createSink(am_Sink_s& sink) const
+void CAmCommonFunctions::createSink(am_Sink_s& sink) const
{
sink.name = "AnySink";
sink.domainID = 4;
@@ -247,7 +247,7 @@ void CommonFunctions::createSink(am_Sink_s& sink) const
sink.sinkID = 0;
}
-void CommonFunctions::createSource(am_Source_s& source) const
+void CAmCommonFunctions::createSource(am_Source_s& source) const
{
source.name = "AnySource";
source.domainID = 4;
@@ -264,7 +264,7 @@ void CommonFunctions::createSource(am_Source_s& source) const
source.sourceState = SS_ON;
}
-void CommonFunctions::createDomain(am_Domain_s & domain) const
+void CAmCommonFunctions::createDomain(am_Domain_s & domain) const
{
domain.domainID = 0;
@@ -276,7 +276,7 @@ void CommonFunctions::createDomain(am_Domain_s & domain) const
domain.state = DS_CONTROLLED;
}
-void CommonFunctions::createGateway(am_Gateway_s & gateway)
+void CAmCommonFunctions::createGateway(am_Gateway_s & gateway)
{
gateway.name = "AnyGateway";
gateway.sinkID = 1;
@@ -291,7 +291,7 @@ void CommonFunctions::createGateway(am_Gateway_s & gateway)
}
-void CommonFunctions::createConnection(am_Connection_s & connection) const
+void CAmCommonFunctions::createConnection(am_Connection_s & connection) const
{
connection.connectionID = 0;
connection.sinkID = 1;
@@ -300,7 +300,7 @@ void CommonFunctions::createConnection(am_Connection_s & connection) const
connection.connectionFormat = CF_GENIVI_ANALOG;
}
-std::vector<bool> CommonFunctions::getStandardConvertionMatrix()
+std::vector<bool> CAmCommonFunctions::getStandardConvertionMatrix()
{
std::vector<bool> convMatrix;
convMatrix.push_back(true);
@@ -312,7 +312,7 @@ std::vector<bool> CommonFunctions::getStandardConvertionMatrix()
return convMatrix;
}
-void CommonFunctions::connectionList2RoutingList(std::vector<am_RoutingElement_s> & routingList, const std::vector<am_Connection_s>& connectionList)
+void CAmCommonFunctions::connectionList2RoutingList(std::vector<am_RoutingElement_s> & routingList, const std::vector<am_Connection_s>& connectionList)
{
am_RoutingElement_s routingElement;
std::vector<am_Connection_s>::const_iterator cIterator = connectionList.begin();
diff --git a/AudioManagerDaemon/test/CommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h
index 6e5a996..9d6b5e6 100644
--- a/AudioManagerDaemon/test/CommonFunctions.h
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.h
@@ -3,7 +3,7 @@
*
* GeniviAudioMananger AudioManagerDaemon
*
- * \file CommonFunctions.h
+ * \file CAmCommonFunctions.h
*
* \date 20-Oct-2011 3:42:04 PM
* \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -31,7 +31,7 @@
namespace am
{
-class CommonFunctions
+class CAmCommonFunctions
{
public:
diff --git a/AudioManagerDaemon/test/CMakeLists.txt b/AudioManagerDaemon/test/CMakeLists.txt
index f7243ad..97600a9 100644
--- a/AudioManagerDaemon/test/CMakeLists.txt
+++ b/AudioManagerDaemon/test/CMakeLists.txt
@@ -27,9 +27,9 @@ cmake_minimum_required(VERSION 2.6)
set(EXECUTABLE_OUTPUT_PATH ${TEST_EXECUTABLE_OUTPUT_PATH})
FIND_PACKAGE(GTest REQUIRED)
-add_subdirectory (database)
-add_subdirectory (routing)
-add_subdirectory (routingInterface)
-add_subdirectory (controlInterface)
-add_subdirectory (sockethandler)
-add_subdirectory (telnetserver)
+add_subdirectory (AmControlInterfaceTest)
+add_subdirectory (AmDatabaseHandlerTest)
+add_subdirectory (AmRouterTest)
+add_subdirectory (AmRoutingInterfaceTest)
+add_subdirectory (AmSocketHandlerTest)
+add_subdirectory (AmTelnetServerTest)
diff --git a/AudioManagerDaemon/test/CommandInterfaceBackdoor.h b/AudioManagerDaemon/test/IAmCommandBackdoor.h
index 5d06fb1..650d3e1 100644
--- a/AudioManagerDaemon/test/CommandInterfaceBackdoor.h
+++ b/AudioManagerDaemon/test/IAmCommandBackdoor.h
@@ -3,7 +3,7 @@
*
* GeniviAudioMananger AudioManagerDaemon
*
- * \file CommandInterfaceBackdoor.h
+ * \file IAmCommandBackdoor
*
* \date 20-Oct-2011 3:42:04 PM
* \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -26,25 +26,25 @@
#ifndef COMMANDINTERFACEBACKDOOR_H_
#define COMMANDINTERFACEBACKDOOR_H_
-#include <command/CommandSendInterface.h>
-#include "CommandSender.h"
+#include <command/IAmCommandSend.h>
+#include "CAmCommandSender.h"
namespace am
{
-class CommandSender;
+class CAmCommandSender;
-class CommandInterfaceBackdoor
+class IAmCommandBackdoor
{
public:
- CommandInterfaceBackdoor();
- virtual ~CommandInterfaceBackdoor();
- bool unloadPlugins(CommandSender *CommandSender);
- bool injectInterface(CommandSender* CommandSender, CommandSendInterface* CommandSendInterface);
+ IAmCommandBackdoor();
+ virtual ~IAmCommandBackdoor();
+ bool unloadPlugins(CAmCommandSender *CommandSender);
+ bool injectInterface(CAmCommandSender* CommandSender, IAmCommandSend* CommandSendInterface);
};
}
-//definitions are in CommonFunctions.cpp!
+//definitions are in CAmCommonFunctions.cpp!
#endif /* COMMANDINTERFACEBACKDOOR_H_ */
diff --git a/AudioManagerDaemon/test/ControlInterfaceBackdoor.h b/AudioManagerDaemon/test/IAmControlBackdoor.h
index 135bc48..90a2c67 100644
--- a/AudioManagerDaemon/test/ControlInterfaceBackdoor.h
+++ b/AudioManagerDaemon/test/IAmControlBackdoor.h
@@ -3,7 +3,7 @@
*
* GeniviAudioMananger AudioManagerDaemon
*
- * \file ControlInterfaceBackdoor.h
+ * \file IAmControlBackdoor.h
*
* \date 20-Oct-2011 3:42:04 PM
* \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -26,20 +26,20 @@
#ifndef CONTROLINTERFACEBACKDOOR_H_
#define CONTROLINTERFACEBACKDOOR_H_
-#include "control/ControlSendInterface.h"
-#include "ControlSender.h"
+#include "control/IAmControlSend.h"
+#include "CAmControlSender.h"
namespace am
{
-class ControlSender;
+class CAmControlSender;
-class ControlInterfaceBackdoor
+class IAmControlBackdoor
{
public:
- ControlInterfaceBackdoor();
- virtual ~ControlInterfaceBackdoor();
- bool replaceController(ControlSender *controlSender, ControlSendInterface *newController);
+ IAmControlBackdoor();
+ virtual ~IAmControlBackdoor();
+ bool replaceController(CAmControlSender *controlSender, IAmControlSend *newController);
};
}
diff --git a/AudioManagerDaemon/test/RoutingInterfaceBackdoor.h b/AudioManagerDaemon/test/IAmRoutingBackdoor.h
index ff7ffdb..9ffff54 100644
--- a/AudioManagerDaemon/test/RoutingInterfaceBackdoor.h
+++ b/AudioManagerDaemon/test/IAmRoutingBackdoor.h
@@ -3,7 +3,7 @@
*
* GeniviAudioMananger AudioManagerDaemon
*
- * \file RoutingInterfaceBackdoor.h
+ * \file IAmRoutingBackdoor.h
*
* \date 20-Oct-2011 3:42:04 PM
* \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -26,24 +26,24 @@
#ifndef ROUTINGINTERFACEBACKDOOR_H_
#define ROUTINGINTERFACEBACKDOOR_H_
-#include "RoutingSender.h"
+#include "CAmRoutingSender.h"
namespace am
{
-class RoutingSender;
+class CAmRoutingSender;
-class RoutingInterfaceBackdoor
+class IAmRoutingBackdoor
{
public:
- RoutingInterfaceBackdoor();
- virtual ~RoutingInterfaceBackdoor();
- bool unloadPlugins(RoutingSender *RoutingSender);
- bool injectInterface(RoutingSender *RoutingSender, RoutingSendInterface *newInterface, const std::string& busname);
+ IAmRoutingBackdoor();
+ virtual ~IAmRoutingBackdoor();
+ bool unloadPlugins(CAmRoutingSender *RoutingSender);
+ bool injectInterface(CAmRoutingSender *RoutingSender, IAmRoutingSend *newInterface, const std::string& busname);
};
}
-//definitions are in CommonFunctions.cpp!
+//definitions are in CAmCommonFunctions.cpp!
#endif /* ROUTINGINTERFACEBACKDOOR_H_ */
diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h
new file mode 100644
index 0000000..1833511
--- /dev/null
+++ b/AudioManagerDaemon/test/MockIAmCommandSend.h
@@ -0,0 +1,82 @@
+/**
+* Copyright (C) 2011, BMW AG
+*
+* GeniviAudioMananger AudioManagerDaemon
+*
+* \file MockInterfaces.h
+*
+* \date 20-Oct-2011 3:42:04 PM
+* \author Christian Mueller (christian.ei.mueller@bmw.de)
+*
+* \section License
+* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
+*
+* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
+* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
+* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
+* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
+* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+*
+* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+*/
+
+#ifndef MOCKCOMMANDINTERFACE_H_
+#define MOCKCOMMANDINTERFACE_H_
+
+#include "command/IAmCommandSend.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace am {
+
+class MockIAmCommandSend : public IAmCommandSend {
+ public:
+ MOCK_METHOD1(startupInterface,
+ am_Error_e(IAmCommandReceive* commandreceiveinterface));
+ MOCK_METHOD1(setCommandReady,
+ void(const uint16_t handle));
+ MOCK_METHOD1(setCommandRundown,
+ void(const uint16_t handle));
+ MOCK_METHOD1(cbNewMainConnection,
+ void(const am_MainConnectionType_s mainConnection));
+ MOCK_METHOD1(cbRemovedMainConnection,
+ void(const am_mainConnectionID_t mainConnection));
+ MOCK_METHOD1(cbNewSink,
+ void(const am_SinkType_s& sink));
+ MOCK_METHOD1(cbRemovedSink,
+ void(const am_sinkID_t sinkID));
+ MOCK_METHOD1(cbNewSource,
+ void(const am_SourceType_s& source));
+ MOCK_METHOD1(cbRemovedSource,
+ void(const am_sourceID_t source));
+ MOCK_METHOD0(cbNumberOfSinkClassesChanged,
+ void());
+ MOCK_METHOD0(cbNumberOfSourceClassesChanged,
+ void());
+ MOCK_METHOD2(cbMainConnectionStateChanged,
+ void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState));
+ MOCK_METHOD2(cbMainSinkSoundPropertyChanged,
+ void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
+ MOCK_METHOD2(cbMainSourceSoundPropertyChanged,
+ void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
+ MOCK_METHOD2(cbSinkAvailabilityChanged,
+ void(const am_sinkID_t sinkID, const am_Availability_s& availability));
+ MOCK_METHOD2(cbSourceAvailabilityChanged,
+ void(const am_sourceID_t sourceID, const am_Availability_s& availability));
+ MOCK_METHOD2(cbVolumeChanged,
+ void(const am_sinkID_t sinkID, const am_mainVolume_t volume));
+ MOCK_METHOD2(cbSinkMuteStateChanged,
+ void(const am_sinkID_t sinkID, const am_MuteState_e muteState));
+ MOCK_METHOD1(cbSystemPropertyChanged,
+ void(const am_SystemProperty_s& systemProperty));
+ MOCK_METHOD2(cbTimingInformationChanged,
+ void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
+ MOCK_CONST_METHOD1(getInterfaceVersion,
+ void(std::string& version));
+};
+
+} // namespace am
+#endif /* MOCKCOMMANDINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h
new file mode 100644
index 0000000..dc45fab
--- /dev/null
+++ b/AudioManagerDaemon/test/MockIAmControlSend.h
@@ -0,0 +1,134 @@
+/**
+* Copyright (C) 2011, BMW AG
+*
+* GeniviAudioMananger AudioManagerDaemon
+*
+* \file MockInterfaces.h
+*
+* \date 20-Oct-2011 3:42:04 PM
+* \author Christian Mueller (christian.ei.mueller@bmw.de)
+*
+* \section License
+* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
+* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
+*
+* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
+* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
+* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
+* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
+* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
+* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
+* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
+*
+* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+*/
+
+#ifndef MOCKCONTROLINTERFACE_H_
+#define MOCKCONTROLINTERFACE_H_
+
+#include "control/IAmControlSend.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace am {
+
+class MockIAmControlSend : public IAmControlSend {
+ public:
+ MOCK_METHOD1(startupController,
+ am_Error_e(IAmControlReceive* controlreceiveinterface));
+ MOCK_METHOD0(setControllerReady,
+ void());
+ MOCK_METHOD0(setControllerRundown,
+ void());
+ MOCK_METHOD3(hookUserConnectionRequest,
+ am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
+ MOCK_METHOD1(hookUserDisconnectionRequest,
+ am_Error_e(const am_mainConnectionID_t connectionID));
+ MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
+ am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
+ MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
+ am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
+ MOCK_METHOD1(hookUserSetSystemProperty,
+ am_Error_e(const am_SystemProperty_s& property));
+ MOCK_METHOD2(hookUserVolumeChange,
+ am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
+ MOCK_METHOD2(hookUserVolumeStep,
+ am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
+ MOCK_METHOD2(hookUserSetSinkMuteState,
+ am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
+ MOCK_METHOD2(hookSystemRegisterDomain,
+ am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
+ MOCK_METHOD1(hookSystemDeregisterDomain,
+ am_Error_e(const am_domainID_t domainID));
+ MOCK_METHOD1(hookSystemDomainRegistrationComplete,
+ void(const am_domainID_t domainID));
+ MOCK_METHOD2(hookSystemRegisterSink,
+ am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
+ MOCK_METHOD1(hookSystemDeregisterSink,
+ am_Error_e(const am_sinkID_t sinkID));
+ MOCK_METHOD2(hookSystemRegisterSource,
+ am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
+ MOCK_METHOD1(hookSystemDeregisterSource,
+ am_Error_e(const am_sourceID_t sourceID));
+ MOCK_METHOD2(hookSystemRegisterGateway,
+ am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
+ MOCK_METHOD1(hookSystemDeregisterGateway,
+ am_Error_e(const am_gatewayID_t gatewayID));
+ MOCK_METHOD2(hookSystemRegisterCrossfader,
+ am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
+ MOCK_METHOD1(hookSystemDeregisterCrossfader,
+ am_Error_e(const am_crossfaderID_t crossfaderID));
+ MOCK_METHOD3(hookSystemSinkVolumeTick,
+ void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
+ MOCK_METHOD3(hookSystemSourceVolumeTick,
+ void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
+ MOCK_METHOD2(hookSystemInterruptStateChange,
+ void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
+ MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
+ void(const am_sinkID_t sinkID, const am_Availability_s& availability));
+ MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
+ void(const am_sourceID_t sourceID, const am_Availability_s& availability));
+ MOCK_METHOD2(hookSystemDomainStateChange,
+ void(const am_domainID_t domainID, const am_DomainState_e state));
+ MOCK_METHOD1(hookSystemReceiveEarlyData,
+ void(const std::vector<am_EarlyData_s>& data));
+ MOCK_METHOD1(hookSystemSpeedChange,
+ void(const am_speed_t speed));
+ MOCK_METHOD2(hookSystemTimingInformationChanged,
+ void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
+ MOCK_METHOD2(cbAckConnect,
+ void(const am_Handle_s handle, const am_Error_e errorID));
+ MOCK_METHOD2(cbAckDisconnect,
+ void(const am_Handle_s handle, const am_Error_e errorID));
+ MOCK_METHOD3(cbAckCrossFade,
+ void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
+ MOCK_METHOD3(cbAckSetSinkVolumeChange,
+ void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
+ MOCK_METHOD3(cbAckSetSourceVolumeChange,
+ void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
+ MOCK_METHOD2(cbAckSetSourceState,
+ void(const am_Handle_s handle, const am_Error_e error));
+ MOCK_METHOD2(cbAckSetSourceSoundProperties,
+ void(const am_Handle_s handle, const am_Error_e error));
+ MOCK_METHOD2(cbAckSetSourceSoundProperty,
+ void(const am_Handle_s handle, const am_Error_e error));
+ MOCK_METHOD2(cbAckSetSinkSoundProperties,
+ void(const am_Handle_s handle, const am_Error_e error));
+ MOCK_METHOD2(cbAckSetSinkSoundProperty,
+ void(const am_Handle_s handle, const am_Error_e error));
+ MOCK_METHOD5(getConnectionFormatChoice,
+ am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
+ MOCK_CONST_METHOD1(getInterfaceVersion,
+ void(std::string& version));
+ MOCK_METHOD0(confirmCommandReady,
+ void());
+ MOCK_METHOD0(confirmRoutingReady,
+ void());
+ MOCK_METHOD0(confirmCommandRundown,
+ void());
+ MOCK_METHOD0(confirmRoutingRundown,
+ void());
+};
+
+} // namespace am
+#endif /* MOCKCONTROLINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/routingInterface/MockRoutingInterface.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h
index 2c21fe6..4e6c6cb 100644
--- a/AudioManagerDaemon/test/routingInterface/MockRoutingInterface.h
+++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h
@@ -26,16 +26,16 @@
#ifndef MOCKROUTINGINTERFACE_H_
#define MOCKROUTINGINTERFACE_H_
-#include <routing/RoutingSendInterface.h>
+#include "routing/IAmRoutingSend.h"
#include <gtest/gtest.h>
#include <gmock/gmock.h>
namespace am {
-class MockRoutingSendInterface : public RoutingSendInterface {
+class MockIAmRoutingSend : public IAmRoutingSend {
public:
MOCK_METHOD1(startupInterface,
- am_Error_e(RoutingReceiveInterface* routingreceiveinterface));
+ am_Error_e(IAmRoutingReceive* routingreceiveinterface));
MOCK_METHOD1(setRoutingReady,
void(const uint16_t handle));
MOCK_METHOD1(setRoutingRundown,
diff --git a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h b/AudioManagerDaemon/test/controlInterface/MockInterfaces.h
deleted file mode 100644
index a341eee..0000000
--- a/AudioManagerDaemon/test/controlInterface/MockInterfaces.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file MockInterfaces.h
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
-*
-* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-*/
-
-#ifndef MOCKROUTINGINTERFACE_H_
-#define MOCKROUTINGINTERFACE_H_
-
-#include <control/ControlSendInterface.h>
-#include <routing/RoutingSendInterface.h>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-namespace am {
-
-class MockRoutingSendInterface : public RoutingSendInterface {
- public:
- MOCK_METHOD1(startupInterface,
- am_Error_e(RoutingReceiveInterface* routingreceiveinterface));
- MOCK_METHOD1(setRoutingReady,
- void(const uint16_t handle));
- MOCK_METHOD1(setRoutingRundown,
- void(const uint16_t handle));
- MOCK_METHOD1(asyncAbort,
- am_Error_e(const am_Handle_s handle));
- MOCK_METHOD5(asyncConnect,
- am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat));
- MOCK_METHOD2(asyncDisconnect,
- am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID));
- MOCK_METHOD5(asyncSetSinkVolume,
- am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
- MOCK_METHOD5(asyncSetSourceVolume,
- am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time));
- MOCK_METHOD3(asyncSetSourceState,
- am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state));
- MOCK_METHOD3(asyncSetSinkSoundProperties,
- am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const std::vector<am_SoundProperty_s>& listSoundProperties));
- MOCK_METHOD3(asyncSetSinkSoundProperty,
- am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_SoundProperty_s& soundProperty));
- MOCK_METHOD3(asyncSetSourceSoundProperties,
- am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const std::vector<am_SoundProperty_s>& listSoundProperties));
- MOCK_METHOD3(asyncSetSourceSoundProperty,
- am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty));
- MOCK_METHOD5(asyncCrossFade,
- am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time));
- MOCK_METHOD2(setDomainState,
- am_Error_e(const am_domainID_t domainID, const am_DomainState_e domainState));
- MOCK_CONST_METHOD1(returnBusName,
- am_Error_e(std::string& BusName));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
-
-};
-
-
-
-class MockControlSendInterface : public ControlSendInterface {
- public:
- MOCK_METHOD1(startupController,
- am_Error_e(ControlReceiveInterface* controlreceiveinterface));
- MOCK_METHOD0(setControllerReady,
- void());
- MOCK_METHOD0(setControllerRundown,
- void());
- MOCK_METHOD3(hookUserConnectionRequest,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
- MOCK_METHOD1(hookUserDisconnectionRequest,
- am_Error_e(const am_mainConnectionID_t connectionID));
- MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
- am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
- am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD1(hookUserSetSystemProperty,
- am_Error_e(const am_SystemProperty_s& property));
- MOCK_METHOD2(hookUserVolumeChange,
- am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
- MOCK_METHOD2(hookUserVolumeStep,
- am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
- MOCK_METHOD2(hookUserSetSinkMuteState,
- am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
- MOCK_METHOD2(hookSystemRegisterDomain,
- am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
- MOCK_METHOD1(hookSystemDeregisterDomain,
- am_Error_e(const am_domainID_t domainID));
- MOCK_METHOD1(hookSystemDomainRegistrationComplete,
- void(const am_domainID_t domainID));
- MOCK_METHOD2(hookSystemRegisterSink,
- am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
- MOCK_METHOD1(hookSystemDeregisterSink,
- am_Error_e(const am_sinkID_t sinkID));
- MOCK_METHOD2(hookSystemRegisterSource,
- am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
- MOCK_METHOD1(hookSystemDeregisterSource,
- am_Error_e(const am_sourceID_t sourceID));
- MOCK_METHOD2(hookSystemRegisterGateway,
- am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
- MOCK_METHOD1(hookSystemDeregisterGateway,
- am_Error_e(const am_gatewayID_t gatewayID));
- MOCK_METHOD2(hookSystemRegisterCrossfader,
- am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
- MOCK_METHOD1(hookSystemDeregisterCrossfader,
- am_Error_e(const am_crossfaderID_t crossfaderID));
- MOCK_METHOD3(hookSystemSinkVolumeTick,
- void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
- MOCK_METHOD3(hookSystemSourceVolumeTick,
- void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
- MOCK_METHOD2(hookSystemInterruptStateChange,
- void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
- MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
- void(const am_sinkID_t sinkID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
- void(const am_sourceID_t sourceID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemDomainStateChange,
- void(const am_domainID_t domainID, const am_DomainState_e state));
- MOCK_METHOD1(hookSystemReceiveEarlyData,
- void(const std::vector<am_EarlyData_s>& data));
- MOCK_METHOD1(hookSystemSpeedChange,
- void(const am_speed_t speed));
- MOCK_METHOD2(hookSystemTimingInformationChanged,
- void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
- MOCK_METHOD2(cbAckConnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD2(cbAckDisconnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD3(cbAckCrossFade,
- void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSinkVolumeChange,
- void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSourceVolumeChange,
- void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceState,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD5(getConnectionFormatChoice,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
- MOCK_METHOD0(confirmCommandReady,
- void());
- MOCK_METHOD0(confirmRoutingReady,
- void());
- MOCK_METHOD0(confirmCommandRundown,
- void());
- MOCK_METHOD0(confirmRoutingRundown,
- void());
-
-};
-
-
-
-
-} // namespace am
-
-
-
-#endif /* MOCKROUTINGINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/database/MockInterfaces.h b/AudioManagerDaemon/test/database/MockInterfaces.h
deleted file mode 100644
index 453add8..0000000
--- a/AudioManagerDaemon/test/database/MockInterfaces.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file MockInterfaces.h
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
-*
-* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
-*/
-
-#ifndef MOCKROUTINGINTERFACE_H_
-#define MOCKROUTINGINTERFACE_H_
-
-#include <control/ControlSendInterface.h>
-#include <command/CommandSendInterface.h>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-namespace am {
-
-class MockCommandSendInterface : public CommandSendInterface {
- public:
- MOCK_METHOD1(startupInterface,
- am_Error_e(CommandReceiveInterface* commandreceiveinterface));
- MOCK_METHOD1(setCommandReady,
- void(const uint16_t handle));
- MOCK_METHOD1(setCommandRundown,
- void(const uint16_t handle));
- MOCK_METHOD1(cbNewMainConnection,
- void(const am_MainConnectionType_s mainConnection));
- MOCK_METHOD1(cbRemovedMainConnection,
- void(const am_mainConnectionID_t mainConnection));
- MOCK_METHOD1(cbNewSink,
- void(const am_SinkType_s& sink));
- MOCK_METHOD1(cbRemovedSink,
- void(const am_sinkID_t sinkID));
- MOCK_METHOD1(cbNewSource,
- void(const am_SourceType_s& source));
- MOCK_METHOD1(cbRemovedSource,
- void(const am_sourceID_t source));
- MOCK_METHOD0(cbNumberOfSinkClassesChanged,
- void());
- MOCK_METHOD0(cbNumberOfSourceClassesChanged,
- void());
- MOCK_METHOD2(cbMainConnectionStateChanged,
- void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState));
- MOCK_METHOD2(cbMainSinkSoundPropertyChanged,
- void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(cbMainSourceSoundPropertyChanged,
- void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(cbSinkAvailabilityChanged,
- void(const am_sinkID_t sinkID, const am_Availability_s& availability));
- MOCK_METHOD2(cbSourceAvailabilityChanged,
- void(const am_sourceID_t sourceID, const am_Availability_s& availability));
- MOCK_METHOD2(cbVolumeChanged,
- void(const am_sinkID_t sinkID, const am_mainVolume_t volume));
- MOCK_METHOD2(cbSinkMuteStateChanged,
- void(const am_sinkID_t sinkID, const am_MuteState_e muteState));
- MOCK_METHOD1(cbSystemPropertyChanged,
- void(const am_SystemProperty_s& systemProperty));
- MOCK_METHOD2(cbTimingInformationChanged,
- void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
-
-};
-
-
-
-
-class MockControlSendInterface : public ControlSendInterface {
- public:
- MOCK_METHOD1(startupController,
- am_Error_e(ControlReceiveInterface* controlreceiveinterface));
- MOCK_METHOD0(setControllerReady,
- void());
- MOCK_METHOD0(setControllerRundown,
- void());
- MOCK_METHOD3(hookUserConnectionRequest,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
- MOCK_METHOD1(hookUserDisconnectionRequest,
- am_Error_e(const am_mainConnectionID_t connectionID));
- MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
- am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
- am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD1(hookUserSetSystemProperty,
- am_Error_e(const am_SystemProperty_s& property));
- MOCK_METHOD2(hookUserVolumeChange,
- am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
- MOCK_METHOD2(hookUserVolumeStep,
- am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
- MOCK_METHOD2(hookUserSetSinkMuteState,
- am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
- MOCK_METHOD2(hookSystemRegisterDomain,
- am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
- MOCK_METHOD1(hookSystemDeregisterDomain,
- am_Error_e(const am_domainID_t domainID));
- MOCK_METHOD1(hookSystemDomainRegistrationComplete,
- void(const am_domainID_t domainID));
- MOCK_METHOD2(hookSystemRegisterSink,
- am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
- MOCK_METHOD1(hookSystemDeregisterSink,
- am_Error_e(const am_sinkID_t sinkID));
- MOCK_METHOD2(hookSystemRegisterSource,
- am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
- MOCK_METHOD1(hookSystemDeregisterSource,
- am_Error_e(const am_sourceID_t sourceID));
- MOCK_METHOD2(hookSystemRegisterGateway,
- am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
- MOCK_METHOD1(hookSystemDeregisterGateway,
- am_Error_e(const am_gatewayID_t gatewayID));
- MOCK_METHOD2(hookSystemRegisterCrossfader,
- am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
- MOCK_METHOD1(hookSystemDeregisterCrossfader,
- am_Error_e(const am_crossfaderID_t crossfaderID));
- MOCK_METHOD3(hookSystemSinkVolumeTick,
- void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
- MOCK_METHOD3(hookSystemSourceVolumeTick,
- void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
- MOCK_METHOD2(hookSystemInterruptStateChange,
- void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
- MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
- void(const am_sinkID_t sinkID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
- void(const am_sourceID_t sourceID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemDomainStateChange,
- void(const am_domainID_t domainID, const am_DomainState_e state));
- MOCK_METHOD1(hookSystemReceiveEarlyData,
- void(const std::vector<am_EarlyData_s>& data));
- MOCK_METHOD1(hookSystemSpeedChange,
- void(const am_speed_t speed));
- MOCK_METHOD2(hookSystemTimingInformationChanged,
- void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
- MOCK_METHOD2(cbAckConnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD2(cbAckDisconnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD3(cbAckCrossFade,
- void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSinkVolumeChange,
- void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSourceVolumeChange,
- void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceState,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD5(getConnectionFormatChoice,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
- MOCK_METHOD0(confirmCommandReady,
- void());
- MOCK_METHOD0(confirmRoutingReady,
- void());
- MOCK_METHOD0(confirmCommandRundown,
- void());
- MOCK_METHOD0(confirmRoutingRundown,
- void());
-
-};
-
-} // namespace am
-
-
-
-#endif /* MOCKROUTINGINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/routing/MockInterfaces.h b/AudioManagerDaemon/test/routing/MockInterfaces.h
deleted file mode 100644
index ea527ac..0000000
--- a/AudioManagerDaemon/test/routing/MockInterfaces.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/**
- * Copyright (C) 2011, BMW AG
- *
- * GeniviAudioMananger AudioManagerDaemon
- *
- * \file MockInterfaces.h
- *
- * \date 20-Oct-2011 3:42:04 PM
- * \author Christian Mueller (christian.ei.mueller@bmw.de)
- *
- * \section License
- * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
- * Copyright (C) 2011, BMW AG Christian Mueller Christian.ei.mueller@bmw.de
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
- * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
- * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
- * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
- * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
- *
- * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
- */
-
-#ifndef MOCKROUTINGINTERFACE_H_
-#define MOCKROUTINGINTERFACE_H_
-
-#include <control/ControlSendInterface.h>
-#include <command/CommandSendInterface.h>
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-
-namespace am
-{
-
-class MockCommandSendInterface : public CommandSendInterface {
- public:
- MOCK_METHOD1(startupInterface,
- am_Error_e(CommandReceiveInterface* commandreceiveinterface));
- MOCK_METHOD1(setCommandReady,
- void(const uint16_t handle));
- MOCK_METHOD1(setCommandRundown,
- void(const uint16_t handle));
- MOCK_METHOD1(cbNewMainConnection,
- void(const am_MainConnectionType_s mainConnection));
- MOCK_METHOD1(cbRemovedMainConnection,
- void(const am_mainConnectionID_t mainConnection));
- MOCK_METHOD1(cbNewSink,
- void(const am_SinkType_s& sink));
- MOCK_METHOD1(cbRemovedSink,
- void(const am_sinkID_t sinkID));
- MOCK_METHOD1(cbNewSource,
- void(const am_SourceType_s& source));
- MOCK_METHOD1(cbRemovedSource,
- void(const am_sourceID_t source));
- MOCK_METHOD0(cbNumberOfSinkClassesChanged,
- void());
- MOCK_METHOD0(cbNumberOfSourceClassesChanged,
- void());
- MOCK_METHOD2(cbMainConnectionStateChanged,
- void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState));
- MOCK_METHOD2(cbMainSinkSoundPropertyChanged,
- void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(cbMainSourceSoundPropertyChanged,
- void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(cbSinkAvailabilityChanged,
- void(const am_sinkID_t sinkID, const am_Availability_s& availability));
- MOCK_METHOD2(cbSourceAvailabilityChanged,
- void(const am_sourceID_t sourceID, const am_Availability_s& availability));
- MOCK_METHOD2(cbVolumeChanged,
- void(const am_sinkID_t sinkID, const am_mainVolume_t volume));
- MOCK_METHOD2(cbSinkMuteStateChanged,
- void(const am_sinkID_t sinkID, const am_MuteState_e muteState));
- MOCK_METHOD1(cbSystemPropertyChanged,
- void(const am_SystemProperty_s& systemProperty));
- MOCK_METHOD2(cbTimingInformationChanged,
- void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
-
-};
-
-
-class MockControlSendInterface : public ControlSendInterface {
- public:
- MOCK_METHOD1(startupController,
- am_Error_e(ControlReceiveInterface* controlreceiveinterface));
- MOCK_METHOD0(setControllerReady,
- void());
- MOCK_METHOD0(setControllerRundown,
- void());
- MOCK_METHOD3(hookUserConnectionRequest,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
- MOCK_METHOD1(hookUserDisconnectionRequest,
- am_Error_e(const am_mainConnectionID_t connectionID));
- MOCK_METHOD2(hookUserSetMainSinkSoundProperty,
- am_Error_e(const am_sinkID_t sinkID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD2(hookUserSetMainSourceSoundProperty,
- am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty));
- MOCK_METHOD1(hookUserSetSystemProperty,
- am_Error_e(const am_SystemProperty_s& property));
- MOCK_METHOD2(hookUserVolumeChange,
- am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
- MOCK_METHOD2(hookUserVolumeStep,
- am_Error_e(const am_sinkID_t SinkID, const int16_t increment));
- MOCK_METHOD2(hookUserSetSinkMuteState,
- am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
- MOCK_METHOD2(hookSystemRegisterDomain,
- am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
- MOCK_METHOD1(hookSystemDeregisterDomain,
- am_Error_e(const am_domainID_t domainID));
- MOCK_METHOD1(hookSystemDomainRegistrationComplete,
- void(const am_domainID_t domainID));
- MOCK_METHOD2(hookSystemRegisterSink,
- am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
- MOCK_METHOD1(hookSystemDeregisterSink,
- am_Error_e(const am_sinkID_t sinkID));
- MOCK_METHOD2(hookSystemRegisterSource,
- am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
- MOCK_METHOD1(hookSystemDeregisterSource,
- am_Error_e(const am_sourceID_t sourceID));
- MOCK_METHOD2(hookSystemRegisterGateway,
- am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
- MOCK_METHOD1(hookSystemDeregisterGateway,
- am_Error_e(const am_gatewayID_t gatewayID));
- MOCK_METHOD2(hookSystemRegisterCrossfader,
- am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
- MOCK_METHOD1(hookSystemDeregisterCrossfader,
- am_Error_e(const am_crossfaderID_t crossfaderID));
- MOCK_METHOD3(hookSystemSinkVolumeTick,
- void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
- MOCK_METHOD3(hookSystemSourceVolumeTick,
- void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
- MOCK_METHOD2(hookSystemInterruptStateChange,
- void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
- MOCK_METHOD2(hookSystemSinkAvailablityStateChange,
- void(const am_sinkID_t sinkID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemSourceAvailablityStateChange,
- void(const am_sourceID_t sourceID, const am_Availability_s& availability));
- MOCK_METHOD2(hookSystemDomainStateChange,
- void(const am_domainID_t domainID, const am_DomainState_e state));
- MOCK_METHOD1(hookSystemReceiveEarlyData,
- void(const std::vector<am_EarlyData_s>& data));
- MOCK_METHOD1(hookSystemSpeedChange,
- void(const am_speed_t speed));
- MOCK_METHOD2(hookSystemTimingInformationChanged,
- void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
- MOCK_METHOD2(cbAckConnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD2(cbAckDisconnect,
- void(const am_Handle_s handle, const am_Error_e errorID));
- MOCK_METHOD3(cbAckCrossFade,
- void(const am_Handle_s handle, const am_HotSink_e hostsink, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSinkVolumeChange,
- void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
- MOCK_METHOD3(cbAckSetSourceVolumeChange,
- void(const am_Handle_s handle, const am_volume_t voulme, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceState,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSourceSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperties,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD2(cbAckSetSinkSoundProperty,
- void(const am_Handle_s handle, const am_Error_e error));
- MOCK_METHOD5(getConnectionFormatChoice,
- am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats));
- MOCK_CONST_METHOD1(getInterfaceVersion,
- void(std::string& version));
- MOCK_METHOD0(confirmCommandReady,
- void());
- MOCK_METHOD0(confirmRoutingReady,
- void());
- MOCK_METHOD0(confirmCommandRundown,
- void());
- MOCK_METHOD0(confirmRoutingRundown,
- void());
-
-};
-
-
-} // namespace am
-
-#endif /* MOCKROUTINGINTERFACE_H_ */
diff --git a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h b/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
deleted file mode 100644
index 182dfa1..0000000
--- a/AudioManagerDaemon/test/telnetserver/CAmTelnetServerTest.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * CAmTelnetServerTest.h
- *
- * Created on: Feb 7, 2012
- * Author: Frank Herchet
- */
-
-#ifndef CAMTELNETSERVERTEST_H_
-#define CAMTELNETSERVERTEST_H_
-
-#include "gtest/gtest.h"
-#include "TelnetServer.h"
-#include "DatabaseHandler.h"
-#include "RoutingSender.h"
-#include "CommandSender.h"
-#include "ControlSender.h"
-#include "Router.h"
-
-namespace am
-{
-
-class SocketHandler;
-class DatabaseHandler;
-class RoutingSender;
-class CommandSender;
-class ControlSender;
-class Router;
-class CommandReceiver;
-class RoutingReceiver;
-class ControlReceiver;
-class TelnetServer;
-
-
-class MyEnvironment : public ::testing::Environment
-{
- public:
- MyEnvironment();
-
- ~MyEnvironment();
- // Override this to define how to set up the environment.
- void SetUp();
- // Override this to define how to tear down the environment.
- void TearDown();
-
- void setSocketHandler(SocketHandler* pSocketHandler);
-
- void stopSocketHandler();
-
- std::vector<std::string> mlistRoutingPluginDirs;
- std::vector<std::string> mlistCommandPluginDirs;
-
- //SocketHandler* mpSocketHandler;
- DatabaseHandler mDatabasehandler;
- RoutingSender mRoutingSender;
- CommandSender mCommandSender;
- ControlSender mControlSender;
- Router mRouter;
-
- CommandReceiver* mpCommandReceiver;
- RoutingReceiver* mpRoutingReceiver;
- ControlReceiver* mpControlReceiver;
-
- TelnetServer* mpTelnetServer;
-
- pthread_t mSocketHandlerThread;
-};
-
-class CAmTelnetServerTest : public ::testing::Test
-{
- public:
- CAmTelnetServerTest();
- ~CAmTelnetServerTest();
-
-
- void SetUp() ;
-
- void TearDown() ;
-
- //int mSocket;
-};
-
-}
-
-
-
-
-#endif /* CAMTELNETSERVERTEST_H_ */