commit 6c1a0a6b9481a3650d691e7bdf8cfe9e7252c4ee
author derek.li <derek.li@realtek.com> Mon Aug 09 17:21:12 2021 +0800
committer derek li <derek.li@realtek.com> Tue Sep 28 02:04:28 2021 +0000
tree b826f102a98f47861cc5d82ea3253adf521e0bbd
parent 6bf77fdf16e6ba6f0bae1ec2ca32cb3f335f1902

Skip test on VtsHalTvTunerV1_0TargetTest if tuner type unsupported

Check tuner type before running VtsHalTvTunerV1_0TargetTest,
skip testcase if test is not design for that type of tuner.

Bug: 194774941
Test: run vts -m VtsHalTvTunerV1_0TargetTest
Change-Id: Iacd1356e9e60e9b69ecbe38f8d1f76f42138efb0

tv/tuner/1.0/vts/functional/FrontendTests.cpp

diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
old mode 100644
new mode 100755
index 45951d2..caa2f55
--- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
@@ -430,6 +430,9 @@
 
 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::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));

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp

diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
old mode 100644
new mode 100755
index 7c7f0f6..8e62c8c
--- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
+++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
@@ -37,6 +37,8 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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 @@
     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());