Merge "AreaId is not expected for the Vms VehicleProperty" (47d271ff) · Commits · e / os / android_hardware_interfaces

automotive/vehicle/2.0/default/common/src/VmsUtils.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -126,19 +126,18 @@ std::unique_ptr<VehiclePropValue> createDataMessage(const std::string& bytes) {
		return result;
		}

		bool verifyPropertyAndArea(const VehiclePropValue& value) {
		return (value.prop == toInt(VehicleProperty::VEHICLE_MAP_SERVICE) &&
		value.areaId == toInt(VehicleArea::GLOBAL));
		bool isValidVmsProperty(const VehiclePropValue& value) {
		return (value.prop == toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		}

		bool verifyMessageType(const VehiclePropValue& value) {
		bool isValidVmsMessageType(const VehiclePropValue& value) {
		return (value.value.int32Values.size() > 0 &&
		value.value.int32Values[kMessageIndex] >= kFirstMessageType &&
		value.value.int32Values[kMessageIndex] <= kLastMessageType);
		}

		bool isValidVmsMessage(const VehiclePropValue& value) {
		return (verifyPropertyAndArea(value) && verifyMessageType(value));
		return (isValidVmsProperty(value) && isValidVmsMessageType(value));
		}

		VmsMessageType parseMessageType(const VehiclePropValue& value) {

automotive/vehicle/2.0/default/tests/VmsUtils_test.cpp

+0 −7

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ TEST(VmsUtilsTest, subscribeMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x4ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::SUBSCRIBE);

		@@ -51,7 +50,6 @@ TEST(VmsUtilsTest, unsubscribeMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x4ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::UNSUBSCRIBE);

		@@ -67,7 +65,6 @@ TEST(VmsUtilsTest, singleOfferingMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x6ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::OFFERING);

		@@ -91,7 +88,6 @@ TEST(VmsUtilsTest, offeringWithDependencies) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x9ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::OFFERING);

		@@ -117,7 +113,6 @@ TEST(VmsUtilsTest, availabilityMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x1ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::AVAILABILITY_REQUEST);
		}
		@@ -127,7 +122,6 @@ TEST(VmsUtilsTest, subscriptionsMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x1ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::SUBSCRIPTIONS_REQUEST);
		}
		@@ -138,7 +132,6 @@ TEST(VmsUtilsTest, dataMessage) {
		ASSERT_NE(message, nullptr);
		EXPECT_TRUE(isValidVmsMessage(*message));
		EXPECT_EQ(message->prop, toInt(VehicleProperty::VEHICLE_MAP_SERVICE));
		EXPECT_EQ(message->areaId, toInt(VehicleArea::GLOBAL));
		EXPECT_EQ(message->value.int32Values.size(), 0x1ul);
		EXPECT_EQ(parseMessageType(*message), VmsMessageType::DATA);
		EXPECT_EQ(message->value.bytes.size(), bytes.size());