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

Commit e3fc6e07 authored by asafro's avatar asafro
Browse files

Rename the VMDS property to VMS which is how it is called now. 

Test: Fixed HAL tests with the new property name
Bug:34682582

Change-Id: Ibed6a7d82de070087409da04e5a42e30f5cf3252
parent b2a560a1

vehicle/2.0/default/tests/VehicleHalManager_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public: 
                    pValue = getValuePool()->obtainFloat(42.42);

                }

                break;

            case VehicleProperty::VEHICLE_MAPS_DATA_SERVICE:

            case VehicleProperty::VEHICLE_MAP_SERVICE:

                pValue = getValuePool()->obtainComplex();

                pValue->value.int32Values = hidl_vec<int32_t> { 10, 20 };

                pValue->value.int64Values = hidl_vec<int64_t> { 30, 40 };
@@ -317,10 +317,10 @@ TEST_F(VehicleHalManagerTest, subscribe_WriteOnly) { 
}



TEST_F(VehicleHalManagerTest, get_Complex) {

    invokeGet(VehicleProperty::VEHICLE_MAPS_DATA_SERVICE, 0);

    invokeGet(VehicleProperty::VEHICLE_MAP_SERVICE, 0);



    ASSERT_EQ(StatusCode::OK, actualStatusCode);

    ASSERT_EQ(VehicleProperty::VEHICLE_MAPS_DATA_SERVICE, actualValue.prop);

    ASSERT_EQ(VehicleProperty::VEHICLE_MAP_SERVICE, actualValue.prop);



    ASSERT_EQ(3, actualValue.value.bytes.size());

    ASSERT_EQ(1, actualValue.value.bytes[0]);

vehicle/2.0/default/tests/VehicleHalTestUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ const VehiclePropConfig kVehicleProperties[] = { 


    // Complex data type.

    {

        .prop = VehicleProperty::VEHICLE_MAPS_DATA_SERVICE,

        .prop = VehicleProperty::VEHICLE_MAP_SERVICE,

        .access = VehiclePropertyAccess::READ_WRITE,

        .changeMode = VehiclePropertyChangeMode::ON_CHANGE

    }

vehicle/2.0/types.hal

+1 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ enum VehicleProperty: int32_t { 
     * @change_mode VehiclePropertyChangeMode:ON_CHANGE

     * @access VehiclePropertyAccess:READ_WRITE

     */

    VEHICLE_MAPS_DATA_SERVICE = (

    VEHICLE_MAP_SERVICE = (

        0x0C00

        | VehiclePropertyGroup:SYSTEM

        | VehiclePropertyType:COMPLEX

vehicle/2.0/vts/types.vts

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ attribute: { 
        scalar_value: {

            int32_t: 287312836

        }

        enumerator: "VEHICLE_MAPS_DATA_SERVICE"

        enumerator: "VEHICLE_MAP_SERVICE"

        scalar_value: {

            int32_t: 299895808

        }