diff --git a/audio/aidl/vts/Android.bp b/audio/aidl/vts/Android.bp index 03e9fcaeee..e3c2589707 100644 --- a/audio/aidl/vts/Android.bp +++ b/audio/aidl/vts/Android.bp @@ -65,6 +65,12 @@ cc_test { srcs: ["VtsHalAudioEffectTargetTest.cpp"], } +cc_test { + name: "VtsHalBassBoostTargetTest", + defaults: ["VtsHalAudioTargetTestDefaults"], + srcs: ["VtsHalBassBoostTargetTest.cpp"], +} + cc_test { name: "VtsHalEqualizerTargetTest", defaults: ["VtsHalAudioTargetTestDefaults"], diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index 8212149f03..4f14bf0b07 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -752,16 +752,9 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Combine(testing::ValuesIn( EffectFactoryHelper::getAllEffectDescriptors(IFactory::descriptor))), [](const testing::TestParamInfo& info) { - auto msSinceEpoch = std::chrono::duration_cast( - std::chrono::system_clock::now().time_since_epoch()) - .count(); auto instance = std::get(info.param); - std::ostringstream address; - address << msSinceEpoch << "_factory_" << instance.first.get(); - std::string name = address.str() + "_UUID_timeLow_" + - ::android::internal::ToString(instance.second.uuid.timeLow) + - "_timeMid_" + - ::android::internal::ToString(instance.second.uuid.timeMid); + std::string name = "TYPE_" + instance.second.type.toString() + "_UUID_" + + instance.second.uuid.toString(); std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; diff --git a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp index f19dff6b00..1b147a647a 100644 --- a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp @@ -327,18 +327,9 @@ INSTANTIATE_TEST_SUITE_P( IFactory::descriptor, kEqualizerTypeUUID)), testing::ValuesIn(kBandLevels)), [](const testing::TestParamInfo& info) { - auto msSinceEpoch = std::chrono::duration_cast( - std::chrono::system_clock::now().time_since_epoch()) - .count(); auto instance = std::get(info.param); std::string bandLevel = std::to_string(std::get(info.param)); - std::ostringstream address; - address << msSinceEpoch << "_factory_" << instance.first.get(); - std::string name = address.str() + "_UUID_timeLow_" + - ::android::internal::ToString(instance.second.uuid.timeLow) + - "_timeMid_" + - ::android::internal::ToString(instance.second.uuid.timeMid) + - "_bandLevel_" + bandLevel; + std::string name = instance.second.uuid.toString() + "_bandLevel_" + bandLevel; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name; diff --git a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp index 1485657cc5..3fd2812c14 100644 --- a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp @@ -15,6 +15,7 @@ */ #include +#include #define LOG_TAG "VtsHalLoudnessEnhancerTest" @@ -129,19 +130,9 @@ INSTANTIATE_TEST_SUITE_P( IFactory::descriptor, kLoudnessEnhancerTypeUUID)), testing::ValuesIn(kGainMbValues)), [](const testing::TestParamInfo& info) { - auto msSinceEpoch = std::chrono::duration_cast( - std::chrono::system_clock::now().time_since_epoch()) - .count(); auto instance = std::get(info.param); std::string gainMb = std::to_string(std::get(info.param)); - - std::ostringstream address; - address << msSinceEpoch << "_factory_" << instance.first.get(); - std::string name = address.str() + "_UUID_timeLow_" + - ::android::internal::ToString(instance.second.uuid.timeLow) + - "_timeMid_" + - ::android::internal::ToString(instance.second.uuid.timeMid) + - "_gainMb" + gainMb; + std::string name = instance.second.uuid.toString() + "_gainMb_" + gainMb; std::replace_if( name.begin(), name.end(), [](const char c) { return !std::isalnum(c); }, '_'); return name;