diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp index 4f6c19ed59..2be68b8fc0 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp @@ -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 diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h index 6804f3c55f..5a23ca5f4a 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.h @@ -67,6 +67,9 @@ class TunerFrontendHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -86,6 +89,9 @@ class TunerLnbHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -109,6 +115,9 @@ class TunerDemuxHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -135,6 +144,9 @@ class TunerFilterHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -171,6 +183,9 @@ class TunerBroadcastHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -200,6 +215,9 @@ class TunerPlaybackHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -237,6 +255,9 @@ class TunerRecordHidlTest : public testing::TestWithParam { 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 { public: virtual void SetUp() override { @@ -270,4 +291,7 @@ class TunerDescramblerHidlTest : public testing::TestWithParam { 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