Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908e4479 authored by Anthony Stange's avatar Anthony Stange
Browse files

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
parent 7b938e34

sensors/common/vts/2_X/VtsHalSensorsV2_XTargetTest.h

+7 −5
Original line number Diff line number Diff line
@@ -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

            // Test type string non-empty only for private sensor types.

            if (s.type >= SensorTypeVersion::DEVICE_PRIVATE_BASE) {

                EXPECT_FALSE(s.typeAsString.empty());



            // Test defined type matches defined string type

            } 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());