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

Commit 2ff1f0a2 authored by Shunkai Yao's avatar Shunkai Yao Committed by Android (Google) Code Review
Browse files

Merge changes I95f19d20,I57d924d1 into 24D1-dev 

* changes:
  minor improvements for VtsHalAudioEffectFactoryTargetTest
  Effect Aidl: make EffectFactoryHelper methods static only
parents b2869538 c43c4558

audio/aidl/vts/EffectFactoryHelper.h

+0 −20
Original line number Diff line number Diff line
@@ -36,21 +36,6 @@ using aidl::android::media::audio::common::AudioUuid; 


class EffectFactoryHelper {

  public:

    explicit EffectFactoryHelper(const std::string& name) : mServiceName(name) {}



    void ConnectToFactoryService() {

        mEffectFactory = IFactory::fromBinder(binderUtil.connectToService(mServiceName));

        ASSERT_NE(mEffectFactory, nullptr);

    }



    void RestartFactoryService() {

        ASSERT_NE(mEffectFactory, nullptr);

        mEffectFactory = IFactory::fromBinder(binderUtil.restartService());

        ASSERT_NE(mEffectFactory, nullptr);

    }



    std::shared_ptr<IFactory> GetFactory() const { return mEffectFactory; }



    static std::vector<std::pair<std::shared_ptr<IFactory>, Descriptor>> getAllEffectDescriptors(

            std::string serviceName, std::optional<AudioUuid> type = std::nullopt) {

        AudioHalBinderServiceUtil util;
@@ -84,9 +69,4 @@ class EffectFactoryHelper { 
        return EffectFactoryHelper::getHalVersion(factory) >=

               aidl::android::hardware::audio::effect::kReopenSupportedVersion;

    }



  private:

    std::shared_ptr<IFactory> mEffectFactory;

    std::string mServiceName;

    AudioHalBinderServiceUtil binderUtil;

};

audio/aidl/vts/VtsHalAudioEffectFactoryTargetTest.cpp

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

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

  public:

    void SetUp() override {

        mFactoryHelper = std::make_unique<EffectFactoryHelper>(GetParam());

        connectAndGetFactory();

    }

    void SetUp() override { connectAndGetFactory(); }



    void TearDown() override {

        for (auto& effect : mEffects) {
@@ -68,13 +65,14 @@ class EffectFactoryTest : public testing::TestWithParam<std::string> { 
        }

    }



    std::unique_ptr<EffectFactoryHelper> mFactoryHelper;

    const std::string kServiceName = GetParam();

    std::shared_ptr<IFactory> mEffectFactory;

    std::vector<std::shared_ptr<IEffect>> mEffects;

    const Descriptor::Identity kNullId = {.uuid = getEffectUuidNull()};

    const Descriptor::Identity kZeroId = {.uuid = getEffectUuidZero()};

    const Descriptor kNullDesc = {.common.id = kNullId};

    const Descriptor kZeroDesc = {.common.id = kZeroId};

    AudioHalBinderServiceUtil mBinderUtil;



    template <typename Functor>

    void ForEachId(const std::vector<Descriptor::Identity> ids, Functor functor) {
@@ -117,8 +115,11 @@ class EffectFactoryTest : public testing::TestWithParam<std::string> { 
        }

    }

    void connectAndGetFactory() {

        ASSERT_NO_FATAL_FAILURE(mFactoryHelper->ConnectToFactoryService());

        mEffectFactory = mFactoryHelper->GetFactory();

        mEffectFactory = IFactory::fromBinder(mBinderUtil.connectToService(kServiceName));

        ASSERT_NE(mEffectFactory, nullptr);

    }

    void restartAndGetFactory() {

        mEffectFactory = IFactory::fromBinder(mBinderUtil.restartService());

        ASSERT_NE(mEffectFactory, nullptr);

    }

};
@@ -128,7 +129,8 @@ TEST_P(EffectFactoryTest, SetupAndTearDown) { 
}



TEST_P(EffectFactoryTest, CanBeRestarted) {

    ASSERT_NO_FATAL_FAILURE(mFactoryHelper->RestartFactoryService());

    ASSERT_NE(mEffectFactory, nullptr);

    restartAndGetFactory();

}



/**
@@ -250,8 +252,7 @@ TEST_P(EffectFactoryTest, CreateDestroyWithRestart) { 
    EXPECT_NE(descs.size(), 0UL);

    creatAndDestroyDescs(descs);



    mFactoryHelper->RestartFactoryService();



    restartAndGetFactory();

    connectAndGetFactory();

    creatAndDestroyDescs(descs);

}
@@ -263,8 +264,7 @@ TEST_P(EffectFactoryTest, EffectInvalidAfterRestart) { 
    EXPECT_NE(descs.size(), 0UL);

    std::vector<std::shared_ptr<IEffect>> effects = createWithDescs(descs);



    ASSERT_NO_FATAL_FAILURE(mFactoryHelper->RestartFactoryService());



    restartAndGetFactory();

    connectAndGetFactory();

    destroyEffects(effects, EX_ILLEGAL_ARGUMENT);

}