tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow CDD required properties to be absent in VTS." into main am: 816e644a44 am: 46b04797a2 am: 50c08a0d29

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2779279

Change-Id: Ibc16bb7653707d8a67ab022c80e66c6ad2400509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yu Shan 2023-10-11 21:40:54 +00:00 committed by Automerger Merge Worker
commit 77dbeecc42
1 changed files with 39 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
automotive/vehicle/vts/src/VtsHalAutomotiveVehicle_TargetTest.cpp
View file

@ -115,6 +115,9 @@ class VtsVehicleCallback final : public ISubscriptionCallback {
};
class VtsHalAutomotiveVehicleTargetTest : public testing::TestWithParam<ServiceDescriptor> {
protected:
bool checkIsSupported(int32_t propertyId);
public:
void verifyProperty(VehicleProperty propId, VehiclePropertyAccess access,
VehiclePropertyChangeMode changeMode, VehiclePropertyGroup group,
@ -155,7 +158,7 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, useHidlBackend) {
}
}
// Test getAllPropConfig() returns at least 4 property configs.
// Test getAllPropConfigs() returns at least 1 property configs.
TEST_P(VtsHalAutomotiveVehicleTargetTest, getAllPropConfigs) {
ALOGD("VtsHalAutomotiveVehicleTargetTest::getAllPropConfigs");
@ -163,25 +166,31 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, getAllPropConfigs) {
ASSERT_TRUE(result.ok()) << "Failed to get all property configs, error: "
<< result.error().message();
ASSERT_GE(result.value().size(), 4u) << StringPrintf(
"Expect to get at least 4 property configs, got %zu", result.value().size());
ASSERT_GE(result.value().size(), 1u)
<< StringPrintf("Expect to get at least 1 property config, got %zu",
result.value().size());
}
// Test getPropConfigs() can query all properties listed in CDD.
TEST_P(VtsHalAutomotiveVehicleTargetTest, getRequiredPropConfigs) {
// Test getPropConfigs() can query properties returned by getAllPropConfigs.
TEST_P(VtsHalAutomotiveVehicleTargetTest, getPropConfigsWithValidProps) {
ALOGD("VtsHalAutomotiveVehicleTargetTest::getRequiredPropConfigs");
// Check the properties listed in CDD
std::vector<int32_t> properties = {
toInt(VehicleProperty::GEAR_SELECTION), toInt(VehicleProperty::NIGHT_MODE),
toInt(VehicleProperty::PARKING_BRAKE_ON), toInt(VehicleProperty::PERF_VEHICLE_SPEED)};
std::vector<int32_t> properties;
auto result = mVhalClient->getAllPropConfigs();
auto result = mVhalClient->getPropConfigs(properties);
ASSERT_TRUE(result.ok()) << "Failed to get all property configs, error: "
<< result.error().message();
for (const auto& cfgPtr : result.value()) {
properties.push_back(cfgPtr->getPropId());
}
result = mVhalClient->getPropConfigs(properties);
ASSERT_TRUE(result.ok()) << "Failed to get required property config, error: "
<< result.error().message();
ASSERT_EQ(result.value().size(), 4u)
<< StringPrintf("Expect to get exactly 4 configs, got %zu", result.value().size());
ASSERT_EQ(result.value().size(), properties.size())
<< StringPrintf("Expect to get exactly %zu configs, got %zu",
properties.size(), result.value().size());
}
// Test getPropConfig() with an invalid propertyId returns an error code.
@ -200,6 +209,9 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, get) {
ALOGD("VtsHalAutomotiveVehicleTargetTest::get");
int32_t propId = toInt(VehicleProperty::PERF_VEHICLE_SPEED);
if (!checkIsSupported(propId)) {
GTEST_SKIP() << "Property: " << propId << " is not supported, skip the test";
}
auto result = mVhalClient->getValueSync(*mVhalClient->createHalPropValue(propId));
ASSERT_TRUE(result.ok()) << StringPrintf("Failed to get value for property: %" PRId32
@ -285,6 +297,10 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, setNotWritableProp) {
ALOGD("VtsHalAutomotiveVehicleTargetTest::setNotWritableProp");
int32_t propId = toInt(VehicleProperty::PERF_VEHICLE_SPEED);
if (!checkIsSupported(propId)) {
GTEST_SKIP() << "Property: " << propId << " is not supported, skip the test";
}
auto getValueResult = mVhalClient->getValueSync(*mVhalClient->createHalPropValue(propId));
ASSERT_TRUE(getValueResult.ok())
<< StringPrintf("Failed to get value for property: %" PRId32 ", error: %s", propId,
@ -325,6 +341,9 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, subscribeAndUnsubscribe) {
ALOGD("VtsHalAutomotiveVehicleTargetTest::subscribeAndUnsubscribe");
int32_t propId = toInt(VehicleProperty::PERF_VEHICLE_SPEED);
if (!checkIsSupported(propId)) {
GTEST_SKIP() << "Property: " << propId << " is not supported, skip the test";
}
auto propConfigsResult = mVhalClient->getPropConfigs({propId});
@ -414,6 +433,9 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, testGetValuesTimestampAIDL) {
}
int32_t propId = toInt(VehicleProperty::PARKING_BRAKE_ON);
if (!checkIsSupported(propId)) {
GTEST_SKIP() << "Property: " << propId << " is not supported, skip the test";
}
auto prop = mVhalClient->createHalPropValue(propId);
auto result = mVhalClient->getValueSync(*prop);
@ -865,6 +887,11 @@ TEST_P(VtsHalAutomotiveVehicleTargetTest, verifyLaneCenteringAssistStateConfig)
VehicleArea::GLOBAL, VehiclePropertyType::INT32);
}
bool VtsHalAutomotiveVehicleTargetTest::checkIsSupported(int32_t propertyId) {
auto result = mVhalClient->getPropConfigs({propertyId});
return result.ok();
}
std::vector<ServiceDescriptor> getDescriptors() {
std::vector<ServiceDescriptor> descriptors;
for (std::string name : getAidlHalInstanceNames(IVehicle::descriptor)) {