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

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

Change-Id: Ib79cac91c3e8eb378a9e7b4b5f796b797d787940
This commit is contained in:
Amy Zhang 2020-07-30 21:47:50 +00:00 committed by Automerger Merge Worker
commit fdf8ca84aa
2 changed files with 24 additions and 10 deletions

View file

@ -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

View file

@ -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