summaryrefslogtreecommitdiff
path: root/AudioManagerCore/test
diff options
context:
space:
mode:
authorMartin Koch <mkoch@de.adit-jv.com>2020-01-17 09:07:47 +0100
committerMartin Koch <mkoch@de.adit-jv.com>2020-01-17 09:14:51 +0100
commitc1e284360ec02b06ccb0a97a00fed05ef0bb2c60 (patch)
tree752b600be063bd3938e7e8fc7b304ac46f53ef1d /AudioManagerCore/test
parenta2af83777be4860d554bceaf28c87218729cf309 (diff)
downloadaudiomanager-c1e284360ec02b06ccb0a97a00fed05ef0bb2c60.tar.gz
AM: add plural form of setSystemProperties for global configuration attributes to command and control interface
- implement plural form of requests and acknowledgments in core - provide empty default implementations in interfaces to ensure backward compatibility with older plugins - accommodate extension in module tests Main purpose of this extension is to allow for one-shot (uninterrupted), consistent change of multiple, possibly interrelated configuration attributes. Signed-off-by: Martin Koch <mkoch@de.adit-jv.com>
Diffstat (limited to 'AudioManagerCore/test')
-rw-r--r--AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp2
-rw-r--r--AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h2
-rw-r--r--AudioManagerCore/test/MockIAmCommandSend.h2
-rw-r--r--AudioManagerCore/test/MockIAmControlSend.h2
4 files changed, 8 insertions, 0 deletions
diff --git a/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp b/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp
index 77b6ecb..f318852 100644
--- a/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp
+++ b/AudioManagerCore/test/AmMapHandlerTest/CAmTestDatabaseObserver.cpp
@@ -80,6 +80,8 @@ CAmDatabaseObserver::CAmDatabaseObserver()
{ MockDatabaseObserver::getMockObserverObject()->sinkMuteStateChanged(sinkID, muteState); };
dboSystemPropertyChanged = [&](const am_SystemProperty_s& SystemProperty)
{ MockDatabaseObserver::getMockObserverObject()->systemPropertyChanged(SystemProperty); };
+ dboSystemPropertiesChanged = [&](const std::vector<am_SystemProperty_s>& listSystemProperties)
+ { MockDatabaseObserver::getMockObserverObject()->systemPropertiesChanged(listSystemProperties); };
dboTimingInformationChanged = [&](const am_mainConnectionID_t mainConnection, const am_timeSync_t time)
{ MockDatabaseObserver::getMockObserverObject()->timingInformationChanged(mainConnection,time); };
dboSinkUpdated = [&](const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties, const bool visible)
diff --git a/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h b/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h
index 894db07..0c7399c 100644
--- a/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h
+++ b/AudioManagerCore/test/AmMapHandlerTest/MockDatabaseObserver.h
@@ -69,6 +69,7 @@ public:
virtual void volumeChanged(const am_sinkID_t sinkID, const am_mainVolume_t volume) = 0;
virtual void sinkMuteStateChanged(const am_sinkID_t sinkID, const am_MuteState_e muteState) = 0;
virtual void systemPropertyChanged(const am_SystemProperty_s& SystemProperty) = 0;
+ virtual void systemPropertiesChanged(const std::vector<am_SystemProperty_s>& listSystemProperties) = 0;
virtual void timingInformationChanged(const am_mainConnectionID_t mainConnection, const am_timeSync_t time) = 0;
virtual void sinkUpdated(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties, const bool visible) = 0;
virtual void sourceUpdated(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties, const bool visible) = 0;
@@ -105,6 +106,7 @@ class MockDatabaseObserver : public IAmDatabaseObserver{
MOCK_METHOD2(volumeChanged, void(const am_sinkID_t sinkID, const am_mainVolume_t volume));
MOCK_METHOD2(sinkMuteStateChanged, void(const am_sinkID_t sinkID, const am_MuteState_e muteState));
MOCK_METHOD1(systemPropertyChanged, void(const am_SystemProperty_s& SystemProperty));
+ MOCK_METHOD1(systemPropertiesChanged, void(const std::vector<am_SystemProperty_s>& listSystemProperties));
MOCK_METHOD2(timingInformationChanged, void(const am_mainConnectionID_t mainConnection, const am_timeSync_t time));
MOCK_METHOD4(sinkUpdated, void(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties, const bool visible));
MOCK_METHOD4(sourceUpdated, void(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties, const bool visible));
diff --git a/AudioManagerCore/test/MockIAmCommandSend.h b/AudioManagerCore/test/MockIAmCommandSend.h
index 2310c81..f7cb9bb 100644
--- a/AudioManagerCore/test/MockIAmCommandSend.h
+++ b/AudioManagerCore/test/MockIAmCommandSend.h
@@ -75,6 +75,8 @@ class MockIAmCommandSend : public IAmCommandSend {
void(const am_sinkID_t sinkID, const am_MuteState_e muteState));
MOCK_METHOD1(cbSystemPropertyChanged,
void(const am_SystemProperty_s& systemProperty));
+ MOCK_METHOD1(cbSystemPropertiesChanged,
+ void(const std::vector<am_SystemProperty_s>& listSystemProperties));
MOCK_METHOD2(cbTimingInformationChanged,
void(const am_mainConnectionID_t mainConnectionID, const am_timeSync_t time));
MOCK_METHOD3(cbSinkUpdated,
diff --git a/AudioManagerCore/test/MockIAmControlSend.h b/AudioManagerCore/test/MockIAmControlSend.h
index 1f0b7df..9115d00 100644
--- a/AudioManagerCore/test/MockIAmControlSend.h
+++ b/AudioManagerCore/test/MockIAmControlSend.h
@@ -53,6 +53,8 @@ class MockIAmControlSend : public IAmControlSend {
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_METHOD1(hookUserSetSystemProperties,
+ am_Error_e(const std::vector<am_SystemProperty_s>& listSystemProperties));
MOCK_METHOD2(hookUserVolumeChange,
am_Error_e(const am_sinkID_t SinkID, const am_mainVolume_t newVolume));
MOCK_METHOD2(hookUserVolumeStep,