Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0803cd8 authored by Shunkai Yao's avatar Shunkai Yao
Browse files

AIDL Effect: Update vts test cases naming to remove timestamp. 

Bug: 261646550
Test: atest VtsHalAudioEffectTargetTest
Change-Id: I80ac39b5c9a51e006b80682398a61c000ef8c293
parent f56afb30

audio/aidl/vts/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ cc_test { 
    srcs: ["VtsHalAudioEffectTargetTest.cpp"],

}



cc_test {

    name: "VtsHalBassBoostTargetTest",

    defaults: ["VtsHalAudioTargetTestDefaults"],

    srcs: ["VtsHalBassBoostTargetTest.cpp"],

}



cc_test {

    name: "VtsHalEqualizerTargetTest",

    defaults: ["VtsHalAudioTargetTestDefaults"],

audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp

+2 −9
Original line number Diff line number Diff line
@@ -752,16 +752,9 @@ INSTANTIATE_TEST_SUITE_P( 
        ::testing::Combine(testing::ValuesIn(

                EffectFactoryHelper::getAllEffectDescriptors(IFactory::descriptor))),

        [](const testing::TestParamInfo<AudioEffectTest::ParamType>& info) {

            auto msSinceEpoch = std::chrono::duration_cast<std::chrono::nanoseconds>(

                                        std::chrono::system_clock::now().time_since_epoch())

                                        .count();

            auto instance = std::get<PARAM_INSTANCE_NAME>(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;

audio/aidl/vts/VtsHalEqualizerTargetTest.cpp

+1 −10
Original line number Diff line number Diff line
@@ -327,18 +327,9 @@ INSTANTIATE_TEST_SUITE_P( 
                                   IFactory::descriptor, kEqualizerTypeUUID)),

                           testing::ValuesIn(kBandLevels)),

        [](const testing::TestParamInfo<EqualizerTest::ParamType>& info) {

            auto msSinceEpoch = std::chrono::duration_cast<std::chrono::nanoseconds>(

                                        std::chrono::system_clock::now().time_since_epoch())

                                        .count();

            auto instance = std::get<PARAM_INSTANCE_NAME>(info.param);

            std::string bandLevel = std::to_string(std::get<PARAM_BAND_LEVEL>(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;

audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp

+2 −11
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <aidl/Vintf.h>

#include <string>



#define LOG_TAG "VtsHalLoudnessEnhancerTest"
@@ -129,19 +130,9 @@ INSTANTIATE_TEST_SUITE_P( 
                                   IFactory::descriptor, kLoudnessEnhancerTypeUUID)),

                           testing::ValuesIn(kGainMbValues)),

        [](const testing::TestParamInfo<LoudnessEnhancerParamTest::ParamType>& info) {

            auto msSinceEpoch = std::chrono::duration_cast<std::chrono::nanoseconds>(

                                        std::chrono::system_clock::now().time_since_epoch())

                                        .count();

            auto instance = std::get<PARAM_INSTANCE_NAME>(info.param);

            std::string gainMb = std::to_string(std::get<PARAM_GAIN_MB>(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;