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

Commit 5cc13496 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "VtsHalTargetTest: Improve error checks" into main

parents f9cb5be6 63d6e2ab

audio/aidl/vts/VtsHalAECTargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -140,12 +140,12 @@ class AECParamTest : public ::testing::TestWithParam<AECParamTestParam>, public 


TEST_P(AECParamTest, SetAndGetEchoDelay) {

    addEchoDelayParam(mEchoDelay);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



TEST_P(AECParamTest, SetAndGetMobileMode) {

    addMobileModeParam(mMobileMode);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> kDescPair;

audio/aidl/vts/VtsHalAGC1TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -140,17 +140,17 @@ class AGC1ParamTest : public ::testing::TestWithParam<AGC1ParamTestParam>, publi 


TEST_P(AGC1ParamTest, SetAndGetTargetPeakLevelParam) {

    addTargetPeakLevelParam(mTargetPeakLevel);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



TEST_P(AGC1ParamTest, SetAndGetMaxCompressionGain) {

    addMaxCompressionGainParam(mMaxCompressionGain);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



TEST_P(AGC1ParamTest, SetAndGetEnableLimiter) {

    addEnableLimiterParam(mEnableLimiter);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> kDescPair;

audio/aidl/vts/VtsHalAGC2TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -146,17 +146,17 @@ class AGC2ParamTest : public ::testing::TestWithParam<AGC2ParamTestParam>, publi 


TEST_P(AGC2ParamTest, SetAndGetDigitalGainParam) {

    addDigitalGainParam(mGain);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



TEST_P(AGC2ParamTest, SetAndGetSaturationMargin) {

    addSaturationMarginParam(mMargin);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



TEST_P(AGC2ParamTest, SetAndGetLevelEstimator) {

    addLevelEstimatorParam(mLevelEstimator);

    SetAndGetParameters();

    ASSERT_NO_FATAL_FAILURE(SetAndGetParameters());

}



std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> kDescPair;

audio/aidl/vts/VtsHalAudioCoreConfigTargetTest.cpp

+4 −2
Original line number Diff line number Diff line
@@ -522,7 +522,8 @@ class AudioCoreConfig : public testing::TestWithParam<std::string> { 
        std::unordered_set<std::string> configurationNames;

        for (const AudioHalCapConfiguration& configuration : domain.configurations) {

            EXPECT_TRUE(configurationNames.insert(configuration.name).second);

            ValidateAudioHalConfigurationRule(configuration.rule, criteria);

            ASSERT_NO_FATAL_FAILURE(

                    ValidateAudioHalConfigurationRule(configuration.rule, criteria));

        }

        auto domainParameters = domain.configurations[0].parameterSettings;

        for (const auto& settingParameter : domainParameters) {
@@ -597,7 +598,8 @@ class AudioCoreConfig : public testing::TestWithParam<std::string> { 
            }

            EXPECT_NO_FATAL_FAILURE(ValidateAudioHalCapCriterion(criterion.value()));

        }

        ValidateAudioHalCapDomains(capCfg.domains.value(), capCfg.criteriaV2.value());

        ASSERT_NO_FATAL_FAILURE(

                ValidateAudioHalCapDomains(capCfg.domains.value(), capCfg.criteriaV2.value()));

    }



    /**

audio/aidl/vts/VtsHalAudioEffectFactoryTargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ using android::hardware::audio::common::testing::detail::TestExecutionTracer; 
/// Effect factory testing.

class EffectFactoryTest : public testing::TestWithParam<std::string> {

  public:

    void SetUp() override { connectAndGetFactory(); }

    void SetUp() override { ASSERT_NO_FATAL_FAILURE(connectAndGetFactory()); }



    void TearDown() override {

        for (auto& effect : mEffects) {
@@ -253,7 +253,7 @@ TEST_P(EffectFactoryTest, CreateDestroyWithRestart) { 
    creatAndDestroyDescs(descs);



    restartAndGetFactory();

    connectAndGetFactory();

    ASSERT_NO_FATAL_FAILURE(connectAndGetFactory());

    creatAndDestroyDescs(descs);

}
@@ -265,7 +265,7 @@ TEST_P(EffectFactoryTest, EffectInvalidAfterRestart) { 
    std::vector<std::shared_ptr<IEffect>> effects = createWithDescs(descs);



    restartAndGetFactory();

    connectAndGetFactory();

    ASSERT_NO_FATAL_FAILURE(connectAndGetFactory());

    destroyEffects(effects, EX_ILLEGAL_ARGUMENT);

}