diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-03 09:54:59 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-03 09:54:59 +0000 |
commit | b8248e8e66008252dbd2fc71697d377547e555b4 (patch) | |
tree | a8e2b0c9804287c6ad3ae25d7d555e4caeb9b3ad | |
parent | 0a66e07e1b67db70acd10472efd59d664ecf6764 (diff) | |
parent | 3a739200d693a24c7f8b5f2c87ae7f33eaafe396 (diff) | |
download | interfaces-b8248e8e66008252dbd2fc71697d377547e555b4.tar.gz |
Snap for 11047303 from 3a739200d693a24c7f8b5f2c87ae7f33eaafe396 to mainline-healthfitness-release
Change-Id: I6848031c9bc03c0a7135522b583472e555773542
-rw-r--r-- | tv/tuner/aidl/vts/functional/FilterTests.cpp | 7 | ||||
-rw-r--r-- | tv/tuner/aidl/vts/functional/FilterTests.h | 1 | ||||
-rw-r--r-- | tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/tv/tuner/aidl/vts/functional/FilterTests.cpp b/tv/tuner/aidl/vts/functional/FilterTests.cpp index 53afef731a..533d0e6782 100644 --- a/tv/tuner/aidl/vts/functional/FilterTests.cpp +++ b/tv/tuner/aidl/vts/functional/FilterTests.cpp @@ -305,13 +305,18 @@ AssertionResult FilterTests::configureMonitorEvent(int64_t filterId, int32_t mon ndk::ScopedAStatus status; status = mFilters[filterId]->configureMonitorEvent(monitorEventTypes); + return AssertionResult(status.isOk()); +} + +AssertionResult FilterTests::testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes) { + EXPECT_TRUE(mFilterCallbacks[filterId]) << "Test with getNewlyOpenedFilterId first."; if (monitorEventTypes & static_cast<int32_t>(DemuxFilterMonitorEventType::SCRAMBLING_STATUS)) { mFilterCallbacks[filterId]->testFilterScramblingEvent(); } if (monitorEventTypes & static_cast<int32_t>(DemuxFilterMonitorEventType::IP_CID_CHANGE)) { mFilterCallbacks[filterId]->testFilterIpCidEvent(); } - return AssertionResult(status.isOk()); + return AssertionResult(true); } AssertionResult FilterTests::startIdTest(int64_t filterId) { diff --git a/tv/tuner/aidl/vts/functional/FilterTests.h b/tv/tuner/aidl/vts/functional/FilterTests.h index f579441d4f..f57093ebb4 100644 --- a/tv/tuner/aidl/vts/functional/FilterTests.h +++ b/tv/tuner/aidl/vts/functional/FilterTests.h @@ -124,6 +124,7 @@ class FilterTests { AssertionResult configAvFilterStreamType(AvStreamType type, int64_t filterId); AssertionResult configIpFilterCid(int32_t ipCid, int64_t filterId); AssertionResult configureMonitorEvent(int64_t filterId, int32_t monitorEventTypes); + AssertionResult testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes); AssertionResult getFilterMQDescriptor(int64_t filterId, bool getMqDesc); AssertionResult startFilter(int64_t filterId); AssertionResult stopFilter(int64_t filterId); diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp index 9db82c893d..3664b6cfdf 100644 --- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp +++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp @@ -60,6 +60,11 @@ void TunerFilterAidlTest::configSingleFilterInDemuxTest(FilterConfig filterConf, } ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.getMqDesc)); ASSERT_TRUE(mFilterTests.startFilter(filterId)); + ASSERT_TRUE(mFrontendTests.tuneFrontend(frontendConf, true /*testWithDemux*/)); + if (filterConf.monitorEventTypes > 0) { + ASSERT_TRUE(mFilterTests.testMonitorEvent(filterId, filterConf.monitorEventTypes)); + } + ASSERT_TRUE(mFrontendTests.stopTuneFrontend(true /*testWithDemux*/)); ASSERT_TRUE(mFilterTests.stopFilter(filterId)); ASSERT_TRUE(mFilterTests.closeFilter(filterId)); ASSERT_TRUE(mDemuxTests.closeDemux()); |