diff options
Diffstat (limited to 'AudioManagerCore/test')
4 files changed, 16 insertions, 0 deletions
diff --git a/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp b/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp index ddf0abb..77b6ecb 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp +++ b/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp @@ -64,8 +64,12 @@ CAmDatabaseObserver::CAmDatabaseObserver() { MockDatabaseObserver::getMockObserverObject()->mainConnectionStateChanged(connectionID, connectionState); }; dboMainSinkSoundPropertyChanged = [&](const am_sinkID_t sinkID, const am_MainSoundProperty_s& SoundProperty) { MockDatabaseObserver::getMockObserverObject()->mainSinkSoundPropertyChanged(sinkID, SoundProperty); }; + dboMainSinkSoundPropertiesChanged = [&](const am_sinkID_t sinkID, const std::vector<am_MainSoundProperty_s>& listSoundProperties) + { MockDatabaseObserver::getMockObserverObject()->mainSinkSoundPropertiesChanged(sinkID, listSoundProperties); }; dboMainSourceSoundPropertyChanged = [&](const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty) { MockDatabaseObserver::getMockObserverObject()->mainSourceSoundPropertyChanged(sourceID, SoundProperty); }; + dboMainSourceSoundPropertiesChanged = [&](const am_sourceID_t sourceID, const std::vector<am_MainSoundProperty_s>& listSoundProperties) + { MockDatabaseObserver::getMockObserverObject()->mainSourceSoundPropertiesChanged(sourceID, listSoundProperties); }; dboSinkAvailabilityChanged = [&](const am_sinkID_t sinkID, const am_Availability_s& availability) { MockDatabaseObserver::getMockObserverObject()->sinkAvailabilityChanged(sinkID, availability); }; dboSourceAvailabilityChanged = [&](const am_sourceID_t sourceID, const am_Availability_s& availability) diff --git a/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h b/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h index 82e1ea4..894db07 100644 --- a/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h +++ b/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h @@ -61,7 +61,9 @@ public: virtual void removeCrossfader(const am_crossfaderID_t crossfaderID) = 0; virtual void mainConnectionStateChanged(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState) = 0; virtual void mainSinkSoundPropertyChanged(const am_sinkID_t sinkID, const am_MainSoundProperty_s& SoundProperty) = 0; + virtual void mainSinkSoundPropertiesChanged(const am_sinkID_t sinkID, const std::vector<am_MainSoundProperty_s>& listSoundProperties) = 0; virtual void mainSourceSoundPropertyChanged(const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty) = 0; + virtual void mainSourceSoundPropertiesChanged(const am_sourceID_t sourceID, const std::vector<am_MainSoundProperty_s>& listSoundProperties) = 0; virtual void sinkAvailabilityChanged(const am_sinkID_t sinkID, const am_Availability_s& availability) = 0; virtual void sourceAvailabilityChanged(const am_sourceID_t sourceID, const am_Availability_s& availability) = 0; virtual void volumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) = 0; @@ -95,7 +97,9 @@ class MockDatabaseObserver : public IAmDatabaseObserver{ MOCK_METHOD1(removeCrossfader, void(const am_crossfaderID_t crossfaderID)); MOCK_METHOD2(mainConnectionStateChanged, void(const am_mainConnectionID_t connectionID, const am_ConnectionState_e connectionState)); MOCK_METHOD2(mainSinkSoundPropertyChanged, void(const am_sinkID_t sinkID, const am_MainSoundProperty_s& SoundProperty)); + MOCK_METHOD2(mainSinkSoundPropertiesChanged, void(const am_sinkID_t sinkID, const std::vector<am_MainSoundProperty_s>& listSoundProperties)); MOCK_METHOD2(mainSourceSoundPropertyChanged, void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& SoundProperty)); + MOCK_METHOD2(mainSourceSoundPropertiesChanged, void(const am_sourceID_t sourceID, const std::vector<am_MainSoundProperty_s>& listSoundProperties)); MOCK_METHOD2(sinkAvailabilityChanged, void(const am_sinkID_t sinkID, const am_Availability_s& availability)); MOCK_METHOD2(sourceAvailabilityChanged, void(const am_sourceID_t sourceID, const am_Availability_s& availability)); MOCK_METHOD2(volumeChanged, void(const am_sinkID_t sinkID, const am_mainVolume_t volume)); diff --git a/AudioManagerCore/test/MockIAmCommandSend.h b/AudioManagerCore/test/MockIAmCommandSend.h index 36bc1cb..2310c81 100644 --- a/AudioManagerCore/test/MockIAmCommandSend.h +++ b/AudioManagerCore/test/MockIAmCommandSend.h @@ -59,8 +59,12 @@ class MockIAmCommandSend : public IAmCommandSend { 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(cbMainSinkSoundPropertiesChanged, + void(const am_sinkID_t sinkID, const std::vector<am_MainSoundProperty_s>& listSoundProperties)); MOCK_METHOD2(cbMainSourceSoundPropertyChanged, void(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty)); + MOCK_METHOD2(cbMainSourceSoundPropertiesChanged, + void(const am_sourceID_t sourcekID, const std::vector<am_MainSoundProperty_s>& listSoundProperties)); MOCK_METHOD2(cbSinkAvailabilityChanged, void(const am_sinkID_t sinkID, const am_Availability_s& availability)); MOCK_METHOD2(cbSourceAvailabilityChanged, diff --git a/AudioManagerCore/test/MockIAmControlSend.h b/AudioManagerCore/test/MockIAmControlSend.h index 36f12a2..1f0b7df 100644 --- a/AudioManagerCore/test/MockIAmControlSend.h +++ b/AudioManagerCore/test/MockIAmControlSend.h @@ -45,8 +45,12 @@ class MockIAmControlSend : public IAmControlSend { 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(hookUserSetMainSinkSoundProperties, + am_Error_e(const am_sinkID_t sinkID, const std::vector<am_MainSoundProperty_s > &listSoundProperty)); MOCK_METHOD2(hookUserSetMainSourceSoundProperty, am_Error_e(const am_sourceID_t sourceID, const am_MainSoundProperty_s& soundProperty)); + MOCK_METHOD2(hookUserSetMainSourceSoundProperties, + am_Error_e(const am_sourceID_t sourceID, const std::vector<am_MainSoundProperty_s > &listSoundProperty)); MOCK_METHOD1(hookUserSetSystemProperty, am_Error_e(const am_SystemProperty_s& property)); MOCK_METHOD2(hookUserVolumeChange, |