diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-08 04:04:08 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-08 04:04:08 +0000 |
| commit | e28e7da576c9277a17d385b4e8f2867f2550a0bf (patch) | |
| tree | b826f102a98f47861cc5d82ea3253adf521e0bbd | |
| parent | c48c104e447aab55e81168506fb01362052ea456 (diff) | |
| parent | 6c1a0a6b9481a3650d691e7bdf8cfe9e7252c4ee (diff) | |
| download | interfaces-android-vts-11.0_r6.tar.gz | |
Snap for 7804754 from 6c1a0a6b9481a3650d691e7bdf8cfe9e7252c4ee to android11-tests-releaseandroid-vts-11.0_r6android-cts-11.0_r6
Change-Id: I86d724616b08780c3318a48af2b7779427167fed
| -rwxr-xr-x[-rw-r--r--] | tv/tuner/1.0/vts/functional/FrontendTests.cpp | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp index 45951d2b20..caa2f55a4b 100644..100755 --- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp +++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp @@ -430,6 +430,9 @@ void FrontendTests::getFrontendIdByType(FrontendType feType, uint32_t& feId) { void FrontendTests::tuneTest(FrontendConfig frontendConf) { uint32_t feId; + if (frontendConf.type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; + getFrontendIdByType(frontendConf.type, feId); ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(openFrontendById(feId)); @@ -442,6 +445,8 @@ void FrontendTests::tuneTest(FrontendConfig frontendConf) { void FrontendTests::scanTest(FrontendConfig frontendConf, FrontendScanType scanType) { uint32_t feId; + if (frontendConf.type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; getFrontendIdByType(frontendConf.type, feId); ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(openFrontendById(feId)); diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp index 7c7f0f6ebc..8e62c8cd3c 100644..100755 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp @@ -37,6 +37,8 @@ void TunerFilterHidlTest::configSingleFilterInDemuxTest(FilterConfig filterConf, uint32_t demuxId; sp<IDemux> demux; uint32_t filterId; + if (frontendConf.type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; mFrontendTests.getFrontendIdByType(frontendConf.type, feId); ASSERT_TRUE(feId != INVALID_ID); @@ -174,6 +176,9 @@ void TunerRecordHidlTest::recordSingleFilterTest(FilterConfig filterConf, uint32_t filterId; sp<IFilter> filter; + if (frontendConf.type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; + mFrontendTests.getFrontendIdByType(frontendConf.type, feId); ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(mFrontendTests.openFrontendById(feId)); @@ -240,6 +245,9 @@ void TunerRecordHidlTest::attachSingleFilterToRecordDvrTest(FilterConfig filterC uint32_t filterId; sp<IFilter> filter; + if (frontendConf.type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; + mFrontendTests.getFrontendIdByType(frontendConf.type, feId); ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(mFrontendTests.openFrontendById(feId)); @@ -390,6 +398,8 @@ TEST_P(TunerDemuxHidlTest, openDemux) { uint32_t demuxId; sp<IDemux> demux; mFrontendTests.getFrontendIdByType(frontendArray[defaultFrontend].type, feId); + if (frontendArray[DVBT].type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(mFrontendTests.openFrontendById(feId)); ASSERT_TRUE(mFrontendTests.setFrontendCallback()); @@ -408,6 +418,8 @@ TEST_P(TunerDemuxHidlTest, getAvSyncTime) { uint32_t pcrFilterId; uint32_t avSyncHwId; sp<IFilter> mediaFilter; + if (frontendArray[DVBT].type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; mFrontendTests.getFrontendIdByType(frontendArray[defaultFrontend].type, feId); ASSERT_TRUE(feId != INVALID_ID); @@ -531,6 +543,8 @@ TEST_P(TunerDescramblerHidlTest, CreateDescrambler) { uint32_t demuxId; sp<IDemux> demux; mFrontendTests.getFrontendIdByType(frontendArray[defaultFrontend].type, feId); + if (frontendArray[DVBT].type != FrontendType::DVBC) + GTEST_SKIP() << "Skipping this test since not DVBC."; ASSERT_TRUE(feId != INVALID_ID); ASSERT_TRUE(mFrontendTests.openFrontendById(feId)); ASSERT_TRUE(mFrontendTests.setFrontendCallback()); |