Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use customized toString for UUID in VTS" into main

Browse Source
This commit is contained in:
Shunkai Yao
2024-04-02 16:45:52 +00:00
committed by Gerrit Code Review
parent bbd7bba074 fb8f39452a
commit e237f5bfaa
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp
View File

@@ -559,7 +559,7 @@ INSTANTIATE_TEST_SUITE_P(
::android::internal::ToString(std::get<INPUT_GAIN_PARAM>(info.param)); ::android::internal::ToString(std::get<INPUT_GAIN_PARAM>(info.param));
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_inputGains_" + gains; toString(descriptor.common.id.uuid) + "_inputGains_" + gains;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -652,7 +652,7 @@ INSTANTIATE_TEST_SUITE_P(
std::to_string(std::get<LIMITER_ENGINE_IN_USE>(info.param)); std::to_string(std::get<LIMITER_ENGINE_IN_USE>(info.param));
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_limiterConfig_" + toString(descriptor.common.id.uuid) + "_limiterConfig_" +
cfg.toString() + "_engineSetting_" + engineLimiterInUse; cfg.toString() + "_engineSetting_" + engineLimiterInUse;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -726,7 +726,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_" + channelConfig + toString(descriptor.common.id.uuid) + "_" + channelConfig +
"_engineInUse_" + engineInUse; "_engineInUse_" + engineInUse;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -868,7 +868,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string stageInUse = std::to_string(std::get<EQ_BAND_STAGE_IN_USE>(info.param)); std::string stageInUse = std::to_string(std::get<EQ_BAND_STAGE_IN_USE>(info.param));
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_bands_" + bands + toString(descriptor.common.id.uuid) + "_bands_" + bands +
"_stageInUse_" + stageInUse; "_stageInUse_" + stageInUse;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
@@ -986,7 +986,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string stageInUse = std::to_string(std::get<MBC_BAND_STAGE_IN_USE>(info.param)); std::string stageInUse = std::to_string(std::get<MBC_BAND_STAGE_IN_USE>(info.param));
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_bands_" + mbcBands + toString(descriptor.common.id.uuid) + "_bands_" + mbcBands +
"_stageInUse_" + stageInUse; "_stageInUse_" + stageInUse;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');

17
audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp
View File

@@ -249,7 +249,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_roomHfLevel" + roomHfLevel; toString(descriptor.common.id.uuid) + "_roomHfLevel" + roomHfLevel;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -289,7 +289,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_decayTime" + decayTime; toString(descriptor.common.id.uuid) + "_decayTime" + decayTime;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -329,8 +329,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_decayHfRatio" + toString(descriptor.common.id.uuid) + "_decayHfRatio" + decayHfRatio;
decayHfRatio;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -370,7 +369,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_level" + level; toString(descriptor.common.id.uuid) + "_level" + level;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -410,7 +409,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_delay" + delay; toString(descriptor.common.id.uuid) + "_delay" + delay;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -450,7 +449,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_diffusion" + diffusion; toString(descriptor.common.id.uuid) + "_diffusion" + diffusion;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -490,7 +489,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_density" + density; toString(descriptor.common.id.uuid) + "_density" + density;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;
@@ -527,7 +526,7 @@ INSTANTIATE_TEST_SUITE_P(
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_bypass" + bypass; toString(descriptor.common.id.uuid) + "_bypass" + bypass;
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;

4
audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
View File

@@ -225,7 +225,7 @@ INSTANTIATE_TEST_SUITE_P(
std::to_string(std::get<PARAM_VIBRATION_INFORMATION_MAX_AMPLITUDE>(info.param)); std::to_string(std::get<PARAM_VIBRATION_INFORMATION_MAX_AMPLITUDE>(info.param));
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString() + "_hapticScaleId" + toString(descriptor.common.id.uuid) + "_hapticScaleId" +
hapticScaleID + "_hapticScaleVibScale" + hapticScaleVibScale + hapticScaleID + "_hapticScaleVibScale" + hapticScaleVibScale +
"_resonantFrequency" + resonantFrequency + "_qFactor" + qFactor + "_resonantFrequency" + resonantFrequency + "_qFactor" + qFactor +
"_maxAmplitude" + maxAmplitude; "_maxAmplitude" + maxAmplitude;
@@ -422,7 +422,7 @@ INSTANTIATE_TEST_SUITE_P(
auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second; auto descriptor = std::get<PARAM_INSTANCE_NAME>(info.param).second;
std::string name = "Implementor_" + descriptor.common.implementor + "_name_" + std::string name = "Implementor_" + descriptor.common.implementor + "_name_" +
descriptor.common.name + "_UUID_" + descriptor.common.name + "_UUID_" +
descriptor.common.id.uuid.toString(); toString(descriptor.common.id.uuid);
std::replace_if( std::replace_if(
name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_');
return name; return name;