Remove some TODOs from tuner HAL and its VTS.

1) The tuner cases should be always allowed on devices w/o tuner.
  -- VTS is common for all devices, we must allow the tuner cases to
     pass/skip on non TV devices.
  -- The tuner HAL is also optional on TV devices, like OTT, the tuner
     VTS cases should be skipped on those devices too.
2) Filter type has been checked in Demux::attachRecordFilter().

Bug: 188709323
Test: make vts
Change-Id: Ifd1cb805d7f5d552a4aa7365ba78ff87b8a3ccc1
This commit is contained in:
Hongguang Chen
2021-05-19 15:43:29 -07:00
parent b098e79d83
commit 8fc14a8d99
3 changed files with 1 additions and 11 deletions

View File

@@ -79,7 +79,6 @@ 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> {
@@ -101,7 +100,6 @@ 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> {
@@ -127,7 +125,6 @@ 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> {
@@ -179,7 +176,6 @@ 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> {
@@ -218,7 +214,6 @@ 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> {
@@ -250,7 +245,6 @@ 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> {
@@ -290,7 +284,6 @@ 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> {
@@ -327,6 +320,5 @@ class TunerDescramblerHidlTest : public testing::TestWithParam<std::string> {
DvrTests mDvrTests;
};
// TODO remove from the allow list once the cf tv target is enabled for testing
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDescramblerHidlTest);
} // namespace

View File

@@ -81,7 +81,6 @@ Return<Result> Dvr::attachFilter(const sp<V1_0::IFilter>& filter) {
return status;
}
// TODO check if the attached filter is a record filter
if (!mDemux->attachRecordFilter(filterId)) {
return Result::INVALID_ARGUMENT;
}

View File

@@ -156,6 +156,5 @@ class TunerBroadcastHidlTest : public testing::TestWithParam<std::string> {
FrontendConfig1_1 frontendConf);
};
// TODO remove from the allow list once the cf tv target is enabled for testing
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerBroadcastHidlTest);
} // namespace
} // namespace