summaryrefslogtreecommitdiff
path: root/AudioManagerDaemon/test/CAmCommonFunctions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'AudioManagerDaemon/test/CAmCommonFunctions.cpp')
-rw-r--r--AudioManagerDaemon/test/CAmCommonFunctions.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
index 8c5821d..7ee9090 100644
--- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp
+++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp
@@ -133,8 +133,17 @@ std::string int2string(int i)
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);
+ 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 CAmCommonFunctions::compareSink(std::vector<am_Sink_s>::iterator listIterator, const am_Sink_s& sinkData)