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

Commit 4b469e5e authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge changes I95f19d20,Ic720e74c into main am: 49800ab8 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3004391



Change-Id: I25f64a7a514c4e521c576597690a301795764cea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bdac767c 49800ab8

audio/aidl/vts/VtsHalAudioEffectFactoryTargetTest.cpp

+8 −9
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class EffectFactoryTest : public testing::TestWithParam<std::string> { 
        }

    }



    std::string kServiceName = GetParam();

    const std::string kServiceName = GetParam();

    std::shared_ptr<IFactory> mEffectFactory;

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

    const Descriptor::Identity kNullId = {.uuid = getEffectUuidNull()};
@@ -118,6 +118,10 @@ class EffectFactoryTest : public testing::TestWithParam<std::string> { 
        mEffectFactory = IFactory::fromBinder(mBinderUtil.connectToService(kServiceName));

        ASSERT_NE(mEffectFactory, nullptr);

    }

    void restartAndGetFactory() {

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

        ASSERT_NE(mEffectFactory, nullptr);

    }

};



TEST_P(EffectFactoryTest, SetupAndTearDown) {
@@ -126,8 +130,7 @@ TEST_P(EffectFactoryTest, SetupAndTearDown) { 


TEST_P(EffectFactoryTest, CanBeRestarted) {

    ASSERT_NE(mEffectFactory, nullptr);

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

    ASSERT_NE(mEffectFactory, nullptr);

    restartAndGetFactory();

}



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

    creatAndDestroyDescs(descs);



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

    ASSERT_NE(mEffectFactory, nullptr);



    restartAndGetFactory();

    connectAndGetFactory();

    creatAndDestroyDescs(descs);

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

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



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

    ASSERT_NE(mEffectFactory, nullptr);



    restartAndGetFactory();

    connectAndGetFactory();

    destroyEffects(effects, EX_ILLEGAL_ARGUMENT);

}