diff options
author | Christian Linke <christian.linke@bmw.de> | 2013-01-17 12:47:00 +0100 |
---|---|---|
committer | Christian Linke <christian.linke@bmw.de> | 2013-01-17 12:47:00 +0100 |
commit | 3a1086516a5edf30b3bad6a2e138b03bc0479005 (patch) | |
tree | cfd926004a75be5de643a5a095ca34dafdc861d1 /AudioManagerDaemon/test | |
parent | 0269a33680a25e5d682761e8af434611cb28d00c (diff) | |
download | audiomanager-3a1086516a5edf30b3bad6a2e138b03bc0479005.tar.gz |
* changes that follow the review comments from Thomas G.
Signed-off-by: Christian Linke <christian.linke@bmw.de>
Diffstat (limited to 'AudioManagerDaemon/test')
-rw-r--r-- | AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp | 138 | ||||
-rw-r--r-- | AudioManagerDaemon/test/CAmCommonFunctions.cpp | 14 | ||||
-rw-r--r-- | AudioManagerDaemon/test/MockIAmCommandSend.h | 109 | ||||
-rw-r--r-- | AudioManagerDaemon/test/MockIAmControlSend.h | 20 |
4 files changed, 141 insertions, 140 deletions
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 14e8577..979db81 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -1944,9 +1944,9 @@ TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) std::vector<am_Sink_s> listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listNotificationConfigurations.push_back(notify); //enter the sink in the database @@ -1957,16 +1957,16 @@ TEST_F(CAmDatabaseHandlerTest,enterNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - 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(listSinks.begin()->listNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listNotificationConfigurations[2].type,notify.type); 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); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(readoutData.listNotificationConfigurations[2].type,notify.type); } @@ -1979,9 +1979,9 @@ TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) std::vector<am_Sink_s> listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); @@ -1993,9 +1993,9 @@ TEST_F(CAmDatabaseHandlerTest,enterMainNotificationConfigurationCorrect) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - 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); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].type,notify.type); } TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) @@ -2007,9 +2007,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) std::vector<am_Sink_s> listSinks; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); @@ -2021,9 +2021,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks)) << "ERROR: database error"; - 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); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSinks.begin()->listMainNotificationConfigurations[2].type,notify.type); //now we remove the sink ASSERT_EQ(E_OK,pDatabaseHandler.removeSinkDB(sinkID)); @@ -2038,9 +2038,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSource) std::vector<am_Source_s> listSources; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); @@ -2052,9 +2052,9 @@ TEST_F(CAmDatabaseHandlerTest,removeNotificationsSource) 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); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].parameter,notify.parameter); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].status,notify.status); + ASSERT_EQ(listSources.begin()->listMainNotificationConfigurations[2].type,notify.type); //now we remove the sink ASSERT_EQ(E_OK,pDatabaseHandler.removeSourceDB(sourceID)); @@ -2070,16 +2070,16 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) std::vector<am_NotificationConfiguration_s>returnList; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; testSinkData.listMainNotificationConfigurations.push_back(notify1); @@ -2088,7 +2088,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2105,16 +2105,16 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) std::vector<am_NotificationConfiguration_s>returnList; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; testSourceData.listMainNotificationConfigurations.push_back(notify1); @@ -2123,7 +2123,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2140,21 +2140,21 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) std::vector<am_NotificationConfiguration_s>returnList,returnList1; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.notificationType=NT_MAX; - notify2.notificationStatus=NS_CHANGE; - notify2.notificationParameter=10; + notify2.type=NT_MAX; + notify2.status=NS_CHANGE; + notify2.parameter=10; testSourceData.listMainNotificationConfigurations.push_back(notify1); @@ -2163,7 +2163,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList)) << "ERROR: database error"; std::equal(testSourceData.listMainNotificationConfigurations.begin(),testSourceData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2171,12 +2171,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) //change a setting ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSourceNotificationConfigurationDB(sourceID,notify2)); - ASSERT_EQ(E_OK,pDatabaseHandler.getListSourceMainNotificationConfigurations(sourceID,returnList1)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSourceNotificationConfigurations(sourceID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].parameter,notify2.parameter); + ASSERT_EQ(returnList1[3].status,notify2.status); + ASSERT_EQ(returnList1[3].type,notify2.type); } @@ -2190,21 +2190,21 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) std::vector<am_NotificationConfiguration_s>returnList,returnList1; am_NotificationConfiguration_s notify; - notify.notificationType=NT_UNKNOWN; - notify.notificationStatus=NS_CHANGE; - notify.notificationParameter=25; + notify.type=NT_UNKNOWN; + notify.status=NS_CHANGE; + notify.parameter=25; testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.notificationType=NT_MAX; - notify1.notificationStatus=NS_PERIODIC; - notify1.notificationParameter=5; + notify1.type=NT_MAX; + notify1.status=NS_PERIODIC; + notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.notificationType=NT_MAX; - notify2.notificationStatus=NS_CHANGE; - notify2.notificationParameter=27; + notify2.type=NT_MAX; + notify2.status=NS_CHANGE; + notify2.parameter=27; testSinkData.listMainNotificationConfigurations.push_back(notify1); @@ -2213,7 +2213,7 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) << "ERROR: database error"; //read it again - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList)) << "ERROR: database error"; std::equal(testSinkData.listMainNotificationConfigurations.begin(),testSinkData.listMainNotificationConfigurations.end(),returnList.begin(),equalNotificationConfiguration); @@ -2221,12 +2221,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) ASSERT_EQ(E_OK,pDatabaseHandler.changeMainSinkNotificationConfigurationDB(sinkID,notify2)) << "ERROR: database error"; - ASSERT_EQ(E_OK,pDatabaseHandler.getListSinkMainNotificationConfigurations(sinkID,returnList1)) + ASSERT_EQ(E_OK,pDatabaseHandler.getListMainSinkNotificationConfigurations(sinkID,returnList1)) << "ERROR: database error"; - ASSERT_EQ(returnList1[3].notificationParameter,notify2.notificationParameter); - ASSERT_EQ(returnList1[3].notificationStatus,notify2.notificationStatus); - ASSERT_EQ(returnList1[3].notificationType,notify2.notificationType); + ASSERT_EQ(returnList1[3].parameter,notify2.parameter); + ASSERT_EQ(returnList1[3].status,notify2.status); + ASSERT_EQ(returnList1[3].type,notify2.type); } //Commented out - gives always a warning.. diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index c1f1af4..8c5821d 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -111,7 +111,7 @@ bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundPr 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); + return (a.parameter == b.parameter && a.status == b.status && a.type == b.type); } bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b) @@ -320,14 +320,14 @@ std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardN { std::vector<am_NotificationConfiguration_s> listNotificationConfigurations; am_NotificationConfiguration_s tempNotificationConfiguration; - tempNotificationConfiguration.notificationParameter=12; - tempNotificationConfiguration.notificationStatus=NS_PERIODIC; - tempNotificationConfiguration.notificationType=NT_MAX; + tempNotificationConfiguration.parameter=12; + tempNotificationConfiguration.status=NS_PERIODIC; + tempNotificationConfiguration.type=NT_MAX; listNotificationConfigurations.push_back(tempNotificationConfiguration); - tempNotificationConfiguration.notificationParameter=16; - tempNotificationConfiguration.notificationStatus=NS_CHANGE; - tempNotificationConfiguration.notificationType=NT_UNKNOWN; + tempNotificationConfiguration.parameter=16; + tempNotificationConfiguration.status=NS_CHANGE; + tempNotificationConfiguration.type=NT_UNKNOWN; listNotificationConfigurations.push_back(tempNotificationConfiguration); return (listNotificationConfigurations); diff --git a/AudioManagerDaemon/test/MockIAmCommandSend.h b/AudioManagerDaemon/test/MockIAmCommandSend.h index 70cdc4f..381f323 100644 --- a/AudioManagerDaemon/test/MockIAmCommandSend.h +++ b/AudioManagerDaemon/test/MockIAmCommandSend.h @@ -29,60 +29,61 @@ 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)); - MOCK_METHOD3(cbSinkUpdated, - void(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); - MOCK_METHOD3(cbSourceUpdated, - void(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); - MOCK_METHOD2(cbSinkNotification, - void(const am_sinkID_t sinkID, const am_NotificationPayload_s notification)); - MOCK_METHOD2(cbSourceNotification, - void(const am_sourceID_t sourceID, const am_NotificationPayload_s notification)); - MOCK_METHOD2(cbSinkMainNotificationConfigurationChanged, - void(const am_sinkID_t sinkID, const am_NotificationConfiguration_s mainNotificationConfiguration)); - MOCK_METHOD2(cbSourceMainNotificationConfigurationChanged, - void(const am_sourceID_t sourceID, const am_NotificationConfiguration_s mainNotificationConfiguration)); + MOCK_CONST_METHOD1(getInterfaceVersion, + void(std::string& version)); + 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_METHOD3(cbSinkUpdated, + void(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); + MOCK_METHOD3(cbSourceUpdated, + void(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); + MOCK_METHOD2(cbSinkNotification, + void(const am_sinkID_t sinkID, const am_NotificationPayload_s& notification)); + MOCK_METHOD2(cbSourceNotification, + void(const am_sourceID_t sourceID, const am_NotificationPayload_s& notification)); + MOCK_METHOD2(cbMainSinkNotificationConfigurationChanged, + void(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + MOCK_METHOD2(cbMainSourceNotificationConfigurationChanged, + void(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& mainNotificationConfiguration)); + }; diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index 7f83823..fca6073 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -124,31 +124,31 @@ class MockIAmControlSend : public IAmControlSend { MOCK_METHOD1(confirmRoutingRundown, void(const am_Error_e error)); MOCK_METHOD5(hookSystemUpdateSink, - am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties)); + am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); MOCK_METHOD5(hookSystemUpdateSource, - am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s> listSoundProperties, const std::vector<am_ConnectionFormat_e> listConnectionFormats, std::vector<am_MainSoundProperty_s> listMainSoundProperties)); + am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); MOCK_METHOD4(hookSystemUpdateGateway, - am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e> listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e> listSinkConnectionFormats, const std::vector<bool> convertionMatrix)); - MOCK_METHOD3(cbAckSetVolume, - void(const am_Handle_s handle, const std::vector<am_Volumes_s> listVolumes, const am_Error_e error)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)); + MOCK_METHOD3(cbAckSetVolumes, + void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error)); MOCK_METHOD2(cbAckSetSinkNotificationConfiguration, void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD2(cbAckSetSourceNotificationConfiguration, void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD2(hookSinkNotificationDataChanged, - void(const am_sinkID_t sinkID, const am_NotificationPayload_s payload)); + void(const am_sinkID_t sinkID, const am_NotificationPayload_s& payload)); MOCK_METHOD2(hookSourceNotificationDataChanged, - void(const am_sourceID_t sourceID, const am_NotificationPayload_s payload)); + void(const am_sourceID_t sourceID, const am_NotificationPayload_s& payload)); MOCK_METHOD2(hookUserSetMainSinkNotificationConfiguration, - am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s notificationConfiguration)); + am_Error_e(const am_sinkID_t sinkID, const am_NotificationConfiguration_s& notificationConfiguration)); MOCK_METHOD2(hookUserSetMainSourceNotificationConfiguration, - am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s notificationConfiguration)); + am_Error_e(const am_sourceID_t sourceID, const am_NotificationConfiguration_s& notificationConfiguration)); MOCK_METHOD1(hookSystemNodeStateChanged, void(const NsmNodeState_e NodeStateId)); MOCK_METHOD1(hookSystemNodeApplicationModeChanged, void(const NsmApplicationMode_e ApplicationModeId)); MOCK_METHOD3(hookSystemSessionStateChanged, - void(const std::string sessionName, const int32_t seatID, const NsmSessionState_e sessionStateID)); + void(const std::string& sessionName, const NsmSeat_e seatID, const NsmSessionState_e sessionStateID)); MOCK_METHOD2(hookSystemLifecycleRequest, NsmErrorStatus_e(const uint32_t Request, const uint32_t RequestId)); |