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

Commit fdf8ca84 authored by Amy Zhang's avatar Amy Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add Tuner HAL VTS tests into the exception list of the uninstantiated... 

Merge "Add Tuner HAL VTS tests into the exception list of the uninstantiated parameterized tests" into rvc-dev-plus-aosp am: f274a621

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

Change-Id: Ib79cac91c3e8eb378a9e7b4b5f796b797d787940
parents c9db1e7a f274a621

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp

+0 −10
Original line number Diff line number Diff line
@@ -572,14 +572,4 @@ INSTANTIATE_TEST_SUITE_P( 
        PerInstance, TunerDescramblerHidlTest,

        testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITuner::descriptor)),

        android::hardware::PrintInstanceNameToString);



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFrontendHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerLnbHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDemuxHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFilterHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerPlaybackHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerRecordHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDescramblerHidlTest);

}  // namespace

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h

+24 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ class TunerFrontendHidlTest : public testing::TestWithParam<std::string> { 
    FrontendTests mFrontendTests;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFrontendHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -86,6 +89,9 @@ class TunerLnbHidlTest : public testing::TestWithParam<std::string> { 
    LnbTests mLnbTests;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerLnbHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -109,6 +115,9 @@ class TunerDemuxHidlTest : public testing::TestWithParam<std::string> { 
    FilterTests mFilterTests;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDemuxHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -135,6 +144,9 @@ class TunerFilterHidlTest : public testing::TestWithParam<std::string> { 
    FilterTests mFilterTests;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFilterHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -171,6 +183,9 @@ class TunerBroadcastHidlTest : public testing::TestWithParam<std::string> { 
    uint32_t* mLnbId = nullptr;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -200,6 +215,9 @@ class TunerPlaybackHidlTest : public testing::TestWithParam<std::string> { 
    void playbackSingleFilterTest(FilterConfig filterConf, DvrConfig dvrConf);

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerPlaybackHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -237,6 +255,9 @@ class TunerRecordHidlTest : public testing::TestWithParam<std::string> { 
    uint32_t* mLnbId = nullptr;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerRecordHidlTest);



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

  public:

    virtual void SetUp() override {
@@ -270,4 +291,7 @@ class TunerDescramblerHidlTest : public testing::TestWithParam<std::string> { 
    DescramblerTests mDescramblerTests;

    DvrTests mDvrTests;

};



// TODO remove from the allow list once the cf tv target is enabled for testing

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDescramblerHidlTest);

}  // namespace