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

Commit e7c89461 authored by Yu Shan's avatar Yu Shan Committed by Automerger Merge Worker
Browse files

Merge "Allow CDD required properties to be absent in VTS." into main am:... 

Merge "Allow CDD required properties to be absent in VTS." into main am: 816e644a am: 46b04797 am: 50c08a0d am: 77dbeecc

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



Change-Id: Ifde4f151fa6b016004a36d0c951bc20007c63a71
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a83e2115 77dbeecc

automotive/vehicle/vts/src/VtsHalAutomotiveVehicle_TargetTest.cpp

+39 −12
Original line number Diff line number Diff line
@@ -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();



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

    }



    auto result = mVhalClient->getPropConfigs(properties);

    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)) {