From d4c22d8e557f600eb4b4ef3e51cede463da88979 Mon Sep 17 00:00:00 2001 From: "ming.lo" Date: Fri, 5 Nov 2021 16:22:38 +0800 Subject: [PATCH] Add blindScan condition to blindScan test Bug: 203389496 Test: Tested by partners Change-Id: If44df620ab90b5b0247fbee15e2b2a57e27683b5 --- tv/tuner/1.0/vts/functional/FrontendTests.cpp | 3 ++- tv/tuner/1.1/vts/functional/FrontendTests.cpp | 3 ++- tv/tuner/aidl/vts/functional/FrontendTests.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp index ba66595254..4a642a067c 100644 --- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp +++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp @@ -128,7 +128,8 @@ wait: } EXPECT_TRUE(scanMsgLockedReceived) << "Scan message LOCKED not received before END"; - EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; + if (type == FrontendScanType::SCAN_BLIND) + EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; mScanMessageReceived = false; mScanMsgProcessed = true; } diff --git a/tv/tuner/1.1/vts/functional/FrontendTests.cpp b/tv/tuner/1.1/vts/functional/FrontendTests.cpp index bc57821797..a595a93732 100644 --- a/tv/tuner/1.1/vts/functional/FrontendTests.cpp +++ b/tv/tuner/1.1/vts/functional/FrontendTests.cpp @@ -180,7 +180,8 @@ wait: } EXPECT_TRUE(scanMsgLockedReceived) << "Scan message LOCKED not received before END"; - EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; + if (type == FrontendScanType::SCAN_BLIND) + EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; mScanMessageReceived = false; mScanMsgProcessed = true; } diff --git a/tv/tuner/aidl/vts/functional/FrontendTests.cpp b/tv/tuner/aidl/vts/functional/FrontendTests.cpp index f1c3595f06..6204803c15 100644 --- a/tv/tuner/aidl/vts/functional/FrontendTests.cpp +++ b/tv/tuner/aidl/vts/functional/FrontendTests.cpp @@ -171,7 +171,8 @@ wait: } EXPECT_TRUE(scanMsgLockedReceived) << "Scan message LOCKED not received before END"; - EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; + if (type == FrontendScanType::SCAN_BLIND) + EXPECT_TRUE(targetFrequencyReceived) << "frequency not received before LOCKED on blindScan"; mScanMessageReceived = false; mScanMsgProcessed = true; }