Fix Sensors VTS asserts for sensor type strings

Private sensors are the only sensor types that must define a type
string. For public sensors, a type string can be left empty as it will
be overridden by the sensors frameork.

Bug: 155514483
Test: atest VtsHalSensorsV2_0Target
Change-Id: Ib5f8fd513313670e88c2b973c1ff724658914eb2
This commit is contained in:
Anthony Stange
2020-05-04 13:46:07 -04:00
parent 7b938e3471
commit 908e4479dd

View File

@@ -367,11 +367,13 @@ TEST_P(SensorsHidlTest, SensorListValid) {
<< s.sensorHandle << std::dec << " type=" << static_cast<int>(s.type)
<< " name=" << s.name);
// Test non-empty type string
EXPECT_FALSE(s.typeAsString.empty());
// Test defined type matches defined string type
EXPECT_NO_FATAL_FAILURE(assertTypeMatchStringType(s.type, s.typeAsString));
// Test type string non-empty only for private sensor types.
if (s.type >= SensorTypeVersion::DEVICE_PRIVATE_BASE) {
EXPECT_FALSE(s.typeAsString.empty());
} else if (!s.typeAsString.empty()) {
// Test type string matches framework string if specified for non-private types.
EXPECT_NO_FATAL_FAILURE(assertTypeMatchStringType(s.type, s.typeAsString));
}
// Test if all sensor has name and vendor
EXPECT_FALSE(s.name.empty());