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

Commit 38ae8301 authored by Amy Zhang's avatar Amy Zhang
Browse files

Add Tuner HAL VTS tests into the exception list of the uninstantiated 

parameterized tests

The previous fix in the ag/12249074 added the allowlist funtion
under the .cpp file. But they should be under the .h file where all
the test suite classes are defined.

Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 161805444
Change-Id: I4ad7270c75ec6b30db82b0b120f21e3759ed7b93
parent f9a98aff

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