diff options
author | christian linke <christian.linke@bmw.de> | 2013-01-11 13:09:26 +0100 |
---|---|---|
committer | christian linke <christian.linke@bmw.de> | 2013-01-11 13:09:26 +0100 |
commit | 0269a33680a25e5d682761e8af434611cb28d00c (patch) | |
tree | 75d9373329f35502ac2272b6d5d37d1aea1f392b /AudioManagerDaemon/test | |
parent | 1c3e5d99546d0c2d803d50411168d0d887365399 (diff) | |
download | audiomanager-0269a33680a25e5d682761e8af434611cb28d00c.tar.gz |
* add support to switch dedicated plugins off, fix databasehandler regarding getSourceInfo and getSinkInfo, add and fix tests for database
Signed-off-by: christian linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test')
7 files changed, 119 insertions, 57 deletions
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index a5143ef..14e8577 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -31,6 +31,7 @@ using namespace testing; //extern int GetRandomNumber(int nLow, int nHigh); //extern bool equalSoundProperty (const am_SoundProperty_s a, const am_SoundProperty_s b); extern bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundProperty_s b); +extern bool equalNotificationConfiguration(const am_NotificationConfiguration_s a, const am_NotificationConfiguration_s b); //extern bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b); extern bool equalClassProperties(const am_ClassProperty_s a, const am_ClassProperty_s b); extern std::string int2string(int i); @@ -214,7 +215,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainConnectionInfo) } -TEST_F(CAmDatabaseHandlerTest,getSinKInfo) +TEST_F(CAmDatabaseHandlerTest,getSinkInfo) { //fill the connection database am_Sink_s staticSink, firstDynamicSink, secondDynamicSink; @@ -271,7 +272,18 @@ TEST_F(CAmDatabaseHandlerTest,getSinKInfo) am_Sink_s sinkData; ASSERT_EQ(E_OK, pDatabaseHandler.getSinkInfoDB(secondDynamicSinkID,sinkData)); - ASSERT_TRUE( (secondDynamicSink.available.availability == sinkData.available.availability) && (secondDynamicSink.available.availabilityReason == sinkData.available.availabilityReason) && (secondDynamicSink.sinkClassID == sinkData.sinkClassID) && (secondDynamicSink.domainID == sinkData.domainID) && (secondDynamicSink.visible == sinkData.visible) && (secondDynamicSink.name.compare(sinkData.name) == 0) && (secondDynamicSink.volume == sinkData.volume) && std::equal(secondDynamicSink.listConnectionFormats.begin(), secondDynamicSink.listConnectionFormats.end(), sinkData.listConnectionFormats.begin()) && std::equal(secondDynamicSink.listMainSoundProperties.begin(), secondDynamicSink.listMainSoundProperties.end(), sinkData.listMainSoundProperties.begin(), equalMainSoundProperty)); + ASSERT_TRUE( (secondDynamicSink.available.availability == sinkData.available.availability) && // + (secondDynamicSink.available.availabilityReason == sinkData.available.availabilityReason) && // + (secondDynamicSink.sinkClassID == sinkData.sinkClassID) && // + (secondDynamicSink.domainID == sinkData.domainID) && // + (secondDynamicSink.visible == sinkData.visible) && // + (secondDynamicSink.name.compare(sinkData.name) == 0) && // + (secondDynamicSink.volume == sinkData.volume) && // + std::equal(secondDynamicSink.listConnectionFormats.begin(), secondDynamicSink.listConnectionFormats.end(), sinkData.listConnectionFormats.begin()) && // + std::equal(secondDynamicSink.listMainSoundProperties.begin(), secondDynamicSink.listMainSoundProperties.end(), sinkData.listMainSoundProperties.begin(), equalMainSoundProperty) && // + std::equal(secondDynamicSink.listNotificationConfigurations.begin(), secondDynamicSink.listNotificationConfigurations.end(), sinkData.listNotificationConfigurations.begin(), equalNotificationConfiguration) && // + std::equal(secondDynamicSink.listMainNotificationConfigurations.begin(), secondDynamicSink.listMainNotificationConfigurations.end(), sinkData.listMainNotificationConfigurations.begin(), equalNotificationConfiguration) // + ); } @@ -335,8 +347,16 @@ TEST_F(CAmDatabaseHandlerTest,getSourceInfo) am_Source_s sourceData; ASSERT_EQ(E_OK, pDatabaseHandler.getSourceInfoDB(secondDynamicSourceID,sourceData)); - ASSERT_TRUE( - (secondDynamicSource.available.availability == sourceData.available.availability) && (secondDynamicSource.available.availabilityReason == sourceData.available.availabilityReason) && (secondDynamicSource.sourceClassID == sourceData.sourceClassID) && (secondDynamicSource.domainID == sourceData.domainID) && (secondDynamicSource.interruptState == sourceData.interruptState) && (secondDynamicSource.visible == sourceData.visible) && (secondDynamicSource.name.compare(sourceData.name) == 0) && (secondDynamicSource.volume == sourceData.volume) && std::equal(secondDynamicSource.listConnectionFormats.begin(), secondDynamicSource.listConnectionFormats.end(), sourceData.listConnectionFormats.begin()) && std::equal(secondDynamicSource.listMainSoundProperties.begin(), secondDynamicSource.listMainSoundProperties.end(), sourceData.listMainSoundProperties.begin(), equalMainSoundProperty)); + ASSERT_TRUE((secondDynamicSource.available.availability == sourceData.available.availability) && // + (secondDynamicSource.available.availabilityReason == sourceData.available.availabilityReason) && // + (secondDynamicSource.sourceClassID == sourceData.sourceClassID) && (secondDynamicSource.domainID == sourceData.domainID) && // + (secondDynamicSource.interruptState == sourceData.interruptState) && (secondDynamicSource.visible == sourceData.visible) && // + (secondDynamicSource.name.compare(sourceData.name) == 0) && (secondDynamicSource.volume == sourceData.volume) && // + std::equal(secondDynamicSource.listConnectionFormats.begin(), secondDynamicSource.listConnectionFormats.end(), sourceData.listConnectionFormats.begin()) && // + std::equal(secondDynamicSource.listMainSoundProperties.begin(), secondDynamicSource.listMainSoundProperties.end(), sourceData.listMainSoundProperties.begin(), equalMainSoundProperty) && // + std::equal(secondDynamicSource.listMainNotificationConfigurations.begin(), secondDynamicSource.listMainNotificationConfigurations.end(), sourceData.listMainNotificationConfigurations.begin(), equalNotificationConfiguration) && // + std::equal(secondDynamicSource.listNotificationConfigurations.begin(), secondDynamicSource.listNotificationConfigurations.end(), sourceData.listNotificationConfigurations.begin(), equalNotificationConfiguration) // + ); } @@ -1917,7 +1937,7 @@ TEST_F(CAmDatabaseHandlerTest,enterSinksCorrect) TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) { - am_Sink_s testSinkData; + am_Sink_s testSinkData, readoutData; pCF.createSink(testSinkData); testSinkData.sinkID = 4; am_sinkID_t sinkID; @@ -1937,9 +1957,17 @@ TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations.begin()->notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations.begin()->notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listNotificationConfigurations.begin()->notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationParameter,notify.notificationParameter); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationStatus,notify.notificationStatus); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].notificationType,notify.notificationType); + + ASSERT_EQ(E_OK,pDatabaseHandler.getSinkInfoDB(testSinkData.sinkID,readoutData)) + << "ERROR: database error"; + + ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationParameter,notify.notificationParameter); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationStatus,notify.notificationStatus); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].notificationType,notify.notificationType); + } TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) @@ -1965,12 +1993,12 @@ TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); } -TEST_F(CAmDatabaseHandlerTest,removeNotifications) +TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) { am_Sink_s testSinkData; pCF.createSink(testSinkData); @@ -1993,14 +2021,45 @@ TEST_F(CAmDatabaseHandlerTest,removeNotifications) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationParameter,notify.notificationParameter); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationStatus,notify.notificationStatus); - ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations.begin()->notificationType,notify.notificationType); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); //now we remove the sink ASSERT_EQ(E_OK,pDatabaseHandler.removeSinkDB(sinkID)); } +TEST_F(CAmDatabaseHandlerTest,removeNotificationsSource) +{ + am_Source_s testSourceData; + pCF.createSource(testSourceData); + testSourceData.sourceID = 4; + am_sourceID_t sourceID; + std::vector<am_Source_s> listSources; + + am_NotificationConfiguration_s notify; + notify.notificationType=NT_UNKNOWN; + notify.notificationStatus=NS_CHANGE; + notify.notificationParameter=25; + + testSourceData.listMainNotificationConfigurations.push_back(notify); + + //enter the sink in the database + ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(testSourceData,sourceID)) + << "ERROR: database error"; + + //read it again + ASSERT_EQ(E_OK,pDatabaseHandler.getListSources(listSources)) + << "ERROR: database error"; + + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationParameter,notify.notificationParameter); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationStatus,notify.notificationStatus); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].notificationType,notify.notificationType); + + //now we remove the sink + ASSERT_EQ(E_OK,pDatabaseHandler.removeSourceDB(sourceID)); +} + TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) { am_Sink_s testSinkData; @@ -2032,13 +2091,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; - ASSERT_EQ(returnList[0].notificationParameter,notify.notificationParameter); - ASSERT_EQ(returnList[0].notificationStatus,notify.notificationStatus); - ASSERT_EQ(returnList[0].notificationType,notify.notificationType); - - ASSERT_EQ(returnList[1].notificationParameter,notify1.notificationParameter); - ASSERT_EQ(returnList[1].notificationStatus,notify1.notificationStatus); - ASSERT_EQ(returnList[1].notificationType,notify1.notificationType); + std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); } @@ -2073,13 +2126,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; - ASSERT_EQ(returnList[0].notificationParameter,notify.notificationParameter); - ASSERT_EQ(returnList[0].notificationStatus,notify.notificationStatus); - ASSERT_EQ(returnList[0].notificationType,notify.notificationType); - - ASSERT_EQ(returnList[1].notificationParameter,notify1.notificationParameter); - ASSERT_EQ(returnList[1].notificationStatus,notify1.notificationStatus); - ASSERT_EQ(returnList[1].notificationType,notify1.notificationType); + std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); } @@ -2119,13 +2166,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; - ASSERT_EQ(returnList[0].notificationParameter,notify.notificationParameter); - ASSERT_EQ(returnList[0].notificationStatus,notify.notificationStatus); - ASSERT_EQ(returnList[0].notificationType,notify.notificationType); - - ASSERT_EQ(returnList[1].notificationParameter,notify1.notificationParameter); - ASSERT_EQ(returnList[1].notificationStatus,notify1.notificationStatus); - ASSERT_EQ(returnList[1].notificationType,notify1.notificationType); + std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); //change a setting ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSourceNotificationConfigurationDB(sourceID,notify2)); @@ -2133,9 +2174,9 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[1].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[1].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[1].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); + ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); + ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); } @@ -2175,13 +2216,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; - ASSERT_EQ(returnList[0].notificationParameter,notify.notificationParameter); - ASSERT_EQ(returnList[0].notificationStatus,notify.notificationStatus); - ASSERT_EQ(returnList[0].notificationType,notify.notificationType); - - ASSERT_EQ(returnList[1].notificationParameter,notify1.notificationParameter); - ASSERT_EQ(returnList[1].notificationStatus,notify1.notificationStatus); - ASSERT_EQ(returnList[1].notificationType,notify1.notificationType); + std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSinkNotificationConfigurationDB(sinkID,notify2)) << "ERROR: database error"; @@ -2189,9 +2224,9 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[1].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[1].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[1].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); + ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); + ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); } //Commented out - gives always a warning.. diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt index f4c7ecb..83e7197 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt @@ -61,8 +61,8 @@ file(GLOB DATABASE_SRCS_CXX ) IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} + SET (DATABASE_SRCS_CXX + ${DATABASE_SRCS_CXX} "../../src/CAmNodeStateCommunicator.cpp") ENDIF(WITH_NSM) diff --git a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt index 67c1065..d820118 100644 --- a/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRouterTest/CMakeLists.txt @@ -61,8 +61,8 @@ file(GLOB ROUTING_SRCS_CXX ) IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} + SET (ROUTING_SRCS_CXX + ${ROUTING_SRCS_CXX} "../../src/CAmNodeStateCommunicator.cpp") ENDIF(WITH_NSM) diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt index 2928335..3799151 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CMakeLists.txt @@ -62,8 +62,8 @@ file(GLOB ROUTING_INTERFACE_SRCS_CXX ) IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} + SET (ROUTING_INTERFACE_SRCS_CXX + ${ROUTING_INTERFACE_SRCS_CXX} "../../src/CAmNodeStateCommunicator.cpp") ENDIF(WITH_NSM) diff --git a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt index 925b2f0..999ba1d 100644 --- a/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt +++ b/AudioManagerDaemon/test/AmTelnetServerTest/CMakeLists.txt @@ -68,8 +68,8 @@ file(GLOB TELNET_SRCS_CXX ) IF(WITH_NSM) - SET (CONTROL_INTERFACE_SRCS_CXX - ${CONTROL_INTERFACE_SRCS_CXX} + SET (TELNET_SRCS_CXX + ${TELNET_SRCS_CXX} "../../src/CAmNodeStateCommunicator.cpp") ENDIF(WITH_NSM) diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index b11c3a2..c1f1af4 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -109,6 +109,11 @@ bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundPr return (a.type == b.type && a.value == b.value); } +bool equalNotificationConfiguration(const am_NotificationConfiguration_s a, const am_NotificationConfiguration_s b) +{ + return (a.notificationParameter == b.notificationParameter && a.notificationStatus == b.notificationStatus && a.notificationType == b.notificationType); +} + bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b) { return (a.connectionFormat == b.connectionFormat && a.domainID == b.domainID && a.sinkID == b.sinkID && a.sourceID == b.sourceID); @@ -235,6 +240,8 @@ void CAmCommonFunctions::createSink(am_Sink_s& sink) const sink.listConnectionFormats = getStandardConnectionFormatList(); sink.listSoundProperties = getStandardSoundPropertyList(); sink.listMainSoundProperties = getStandardMainSoundPropertyList(); + sink.listNotificationConfigurations = getStandardNotificationConfigurationList(); + sink.listMainNotificationConfigurations = getStandardNotificationConfigurationList(); sink.mainVolume = 12; sink.muteState = MS_UNMUTED; sink.visible = true; @@ -252,6 +259,8 @@ void CAmCommonFunctions::createSource(am_Source_s& source) const source.listConnectionFormats = getStandardConnectionFormatList(); source.listSoundProperties = getStandardSoundPropertyList(); source.listMainSoundProperties = getStandardMainSoundPropertyList(); + source.listMainNotificationConfigurations=getStandardNotificationConfigurationList(); + source.listNotificationConfigurations=getStandardNotificationConfigurationList(); source.interruptState = IS_OFF; source.visible = true; source.volume = 23; @@ -307,6 +316,23 @@ std::vector<bool> CAmCommonFunctions::getStandardConvertionMatrix() return convMatrix; } +std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardNotificationConfigurationList() +{ + std::vector<am_NotificationConfiguration_s> listNotificationConfigurations; + am_NotificationConfiguration_s tempNotificationConfiguration; + tempNotificationConfiguration.notificationParameter=12; + tempNotificationConfiguration.notificationStatus=NS_PERIODIC; + tempNotificationConfiguration.notificationType=NT_MAX; + listNotificationConfigurations.push_back(tempNotificationConfiguration); + + tempNotificationConfiguration.notificationParameter=16; + tempNotificationConfiguration.notificationStatus=NS_CHANGE; + tempNotificationConfiguration.notificationType=NT_UNKNOWN; + listNotificationConfigurations.push_back(tempNotificationConfiguration); + + return (listNotificationConfigurations); +} + void CAmCommonFunctions::connectionList2RoutingList(std::vector<am_RoutingElement_s> & routingList, const std::vector<am_Connection_s>& connectionList) { am_RoutingElement_s routingElement; diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index 20d7de7..0c9e362 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -34,6 +34,7 @@ public: static std::vector<am_SoundProperty_s> getStandardSoundPropertyList(); static std::vector<am_MainSoundProperty_s> getStandardMainSoundPropertyList(); static std::vector<bool> getStandardConvertionMatrix(); + static std::vector<am_NotificationConfiguration_s> getStandardNotificationConfigurationList(); bool compareSource(std::vector<am_Source_s>::iterator listIterator, const am_Source_s& sourceData); bool compareSink(std::vector<am_Sink_s>::iterator listIterator, const am_Sink_s& sinkData); bool compareGateway(std::vector<am_Gateway_s>::iterator listIterator, const am_Gateway_s& gatewayData); |