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

Commit 4ce4be5c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I4c49f255,I26c4260b into udc-dev 

* changes:
  HVAC dependent properties should return NOT_AVAILABLE_DISABLED
  Print out content of VehiclePropValue when test fails
parents 662839cf 5df458d2

automotive/vehicle/aidl/impl/fake_impl/hardware/src/FakeVehicleHardware.cpp

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ FakeVehicleHardware::ValueResultType FakeVehicleHardware::maybeGetSpecialValue( 


    if (isHvacPropAndHvacNotAvailable(propId, value.areaId)) {

        *isSpecialValue = true;

        return StatusError(StatusCode::NOT_AVAILABLE) << "hvac not available";

        return StatusError(StatusCode::NOT_AVAILABLE_DISABLED) << "hvac not available";

    }



    switch (propId) {
@@ -562,7 +562,7 @@ VhalResult<void> FakeVehicleHardware::maybeSetSpecialValue(const VehiclePropValu 


    if (isHvacPropAndHvacNotAvailable(propId, value.areaId)) {

        *isSpecialValue = true;

        return StatusError(StatusCode::NOT_AVAILABLE) << "hvac not available";

        return StatusError(StatusCode::NOT_AVAILABLE_DISABLED) << "hvac not available";

    }



    switch (propId) {

automotive/vehicle/aidl/impl/fake_impl/hardware/test/FakeVehicleHardwareTest.cpp

+74 −64
Original line number Diff line number Diff line
@@ -37,6 +37,22 @@ 
#include <unordered_set>

#include <vector>



namespace aidl {

namespace android {

namespace hardware {

namespace automotive {

namespace vehicle {



void PrintTo(const VehiclePropValue& value, std::ostream* os) {

    *os << "\n( " << value.toString() << " )\n";

}



}  // namespace vehicle

}  // namespace automotive

}  // namespace hardware

}  // namespace android

}  // namespace aidl



namespace android {

namespace hardware {

namespace automotive {
@@ -1079,11 +1095,12 @@ TEST_F(FakeVehicleHardwareTest, testSetWaitForVhalAfterCarServiceCrash) { 
    ASSERT_EQ(events.size(), 1u);

    // Erase the timestamp for comparison.

    events[0].timestamp = 0;

    ASSERT_EQ(events[0], (VehiclePropValue{

    auto expectedValue = VehiclePropValue{

            .prop = toInt(VehicleProperty::AP_POWER_STATE_REQ),

            .status = VehiclePropertyStatus::AVAILABLE,

            .value.int32Values = {toInt(VehicleApPowerStateReq::ON), 0},

                         }));

    };

    ASSERT_EQ(events[0], expectedValue);

}



TEST_F(FakeVehicleHardwareTest, testGetObd2FreezeFrame) {
@@ -1166,7 +1183,7 @@ TEST_F(FakeVehicleHardwareTest, testGetHvacPropNotAvailable) { 


                if (areaId == powerDependentAreaId) {

                    EXPECT_FALSE(getValueResult.ok());

                    EXPECT_EQ(getValueResult.error(), StatusCode::NOT_AVAILABLE);

                    EXPECT_EQ(getValueResult.error(), StatusCode::NOT_AVAILABLE_DISABLED);

                } else {

                    EXPECT_TRUE(getValueResult.ok());

                }
@@ -1199,7 +1216,7 @@ TEST_F(FakeVehicleHardwareTest, testSetHvacPropNotAvailable) { 
                                                              .value.int32Values = {1}});



                if (areaId == powerDependentAreaId) {

                    EXPECT_EQ(status, StatusCode::NOT_AVAILABLE);

                    EXPECT_EQ(status, StatusCode::NOT_AVAILABLE_DISABLED);

                } else {

                    EXPECT_EQ(status, StatusCode::OK);

                }
@@ -1340,7 +1357,7 @@ TEST_F(FakeVehicleHardwareTest, testSwitchUser) { 
    events = getChangedProperties();

    ASSERT_EQ(events.size(), static_cast<size_t>(1));

    events[0].timestamp = 0;

    ASSERT_EQ(events[0], (VehiclePropValue{

    auto expectedValue = VehiclePropValue{

            .areaId = 0,

            .prop = toInt(VehicleProperty::SWITCH_USER),

            .value.int32Values =
@@ -1352,7 +1369,8 @@ TEST_F(FakeVehicleHardwareTest, testSwitchUser) { 
                            // SUCCESS

                            1,

                    },

                         }));

    };

    ASSERT_EQ(events[0], expectedValue);

}



TEST_F(FakeVehicleHardwareTest, testCreateUser) {
@@ -1396,7 +1414,7 @@ TEST_F(FakeVehicleHardwareTest, testCreateUser) { 
    events = getChangedProperties();

    ASSERT_EQ(events.size(), static_cast<size_t>(1));

    events[0].timestamp = 0;

    ASSERT_EQ(events[0], (VehiclePropValue{

    auto expectedValue = VehiclePropValue{

            .areaId = 0,

            .prop = toInt(VehicleProperty::CREATE_USER),

            .value.int32Values =
@@ -1406,7 +1424,8 @@ TEST_F(FakeVehicleHardwareTest, testCreateUser) { 
                            // SUCCESS

                            1,

                    },

                         }));

    };

    ASSERT_EQ(events[0], expectedValue);

}



TEST_F(FakeVehicleHardwareTest, testInitialUserInfo) {
@@ -1438,11 +1457,12 @@ TEST_F(FakeVehicleHardwareTest, testInitialUserInfo) { 
    auto events = getChangedProperties();

    ASSERT_EQ(events.size(), static_cast<size_t>(1));

    events[0].timestamp = 0;

    EXPECT_EQ(events[0], (VehiclePropValue{

    auto expectedValue = VehiclePropValue{

            .areaId = 0,

            .prop = toInt(VehicleProperty::INITIAL_USER_INFO),

            .value.int32Values = {3, 1, 11},

                         }));

    };

    EXPECT_EQ(events[0], expectedValue);



    // Try to get create_user again, should return default value.

    clearChangedProperties();
@@ -1452,7 +1472,7 @@ TEST_F(FakeVehicleHardwareTest, testInitialUserInfo) { 
    events = getChangedProperties();

    ASSERT_EQ(events.size(), static_cast<size_t>(1));

    events[0].timestamp = 0;

    EXPECT_EQ(events[0], (VehiclePropValue{

    expectedValue = VehiclePropValue{

            .areaId = 0,

            .prop = toInt(VehicleProperty::INITIAL_USER_INFO),

            .value.int32Values =
@@ -1467,7 +1487,8 @@ TEST_F(FakeVehicleHardwareTest, testInitialUserInfo) { 
                            0,

                    },

            .value.stringValue = "||",

                         }));

    };

    EXPECT_EQ(events[0], expectedValue);

}



TEST_F(FakeVehicleHardwareTest, testDumpAllProperties) {
@@ -2580,18 +2601,7 @@ TEST_F(FakeVehicleHardwareTest, testSetHvacTemperatureValueSuggestion) { 
        EXPECT_EQ(events.size(), static_cast<size_t>(1));

        events[0].timestamp = 0;



        EXPECT_EQ(events[0], (tc.expectedValuesToGet[0]))

                << "Failed Test: " << tc.name << "\n"

                << "Received - prop: " << events[0].prop << ", areaId: " << events[0].areaId

                << ", floatValues: {" << events[0].value.floatValues[0] << ", "

                << events[0].value.floatValues[1] << ", " << events[0].value.floatValues[2] << ", "

                << events[0].value.floatValues[3] << "}\n"

                << "Expected - prop: " << tc.expectedValuesToGet[0].prop

                << ", areaId: " << tc.expectedValuesToGet[0].areaId << ", floatValues: {"

                << tc.expectedValuesToGet[0].value.floatValues[0] << ", "

                << tc.expectedValuesToGet[0].value.floatValues[1] << ", "

                << tc.expectedValuesToGet[0].value.floatValues[2] << ", "

                << tc.expectedValuesToGet[0].value.floatValues[3] << "}\n";

        EXPECT_EQ(events[0], tc.expectedValuesToGet[0]);

        clearChangedProperties();

    }

}