diff options
author | JackLivio <jack@livio.io> | 2020-02-17 13:05:54 -0500 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2020-02-17 13:05:54 -0500 |
commit | 86dea8793023f986c7c10d7f9e5b7a932d89a49a (patch) | |
tree | bf44b0d5b6bf6b6c78dd2d0602b67f05ebe2a17c /src/components/application_manager/test/message_helper/message_helper_test.cc | |
parent | 4310b2dfd5e1078df0df53138a73d49d000c9c62 (diff) | |
parent | ece258838a44a5461d718c5eeae380ad11a3769b (diff) | |
download | sdl_core-86dea8793023f986c7c10d7f9e5b7a932d89a49a.tar.gz |
Merge remote-tracking branch 'origin/develop' into fix/3rd_party_build_issuesfix/3rd_party_build_issues
Diffstat (limited to 'src/components/application_manager/test/message_helper/message_helper_test.cc')
-rw-r--r-- | src/components/application_manager/test/message_helper/message_helper_test.cc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/components/application_manager/test/message_helper/message_helper_test.cc b/src/components/application_manager/test/message_helper/message_helper_test.cc index a174d74d5d..f85c569bdb 100644 --- a/src/components/application_manager/test/message_helper/message_helper_test.cc +++ b/src/components/application_manager/test/message_helper/message_helper_test.cc @@ -279,14 +279,21 @@ TEST(MessageHelperTestCreate, smart_objects::SmartObject& object = *smartObjectPtr; + const uint32_t app_id = 1u; + const std::string cmd_icon_value = "10"; + const uint32_t cmd_id = 5u; + const uint32_t internal_id = 1u; + object[strings::menu_params] = 1; object[strings::cmd_icon] = 1; - object[strings::cmd_icon][strings::value] = "10"; + object[strings::cmd_icon][strings::value] = cmd_icon_value; + object[strings::cmd_id] = cmd_id; - vis.insert(std::pair<uint32_t, smart_objects::SmartObject*>(5, &object)); + vis.insert( + std::pair<uint32_t, smart_objects::SmartObject*>(internal_id, &object)); EXPECT_CALL(*appSharedMock, commands_map()).WillOnce(Return(data_accessor)); - EXPECT_CALL(*appSharedMock, app_id()).WillOnce(Return(1u)); + EXPECT_CALL(*appSharedMock, app_id()).WillOnce(Return(app_id)); application_manager_test::MockApplicationManager mock_application_manager; smart_objects::SmartObjectList ptr = MessageHelper::CreateAddCommandRequestToHMI(appSharedMock, @@ -299,14 +306,14 @@ TEST(MessageHelperTestCreate, int function_id = static_cast<int>(hmi_apis::FunctionID::UI_AddCommand); EXPECT_EQ(function_id, obj[strings::params][strings::function_id].asInt()); - EXPECT_EQ(1u, obj[strings::msg_params][strings::app_id].asUInt()); - EXPECT_EQ(5, obj[strings::msg_params][strings::cmd_id].asInt()); + EXPECT_EQ(app_id, obj[strings::msg_params][strings::app_id].asUInt()); + EXPECT_EQ(cmd_id, obj[strings::msg_params][strings::cmd_id].asUInt()); EXPECT_EQ(object[strings::menu_params], obj[strings::msg_params][strings::menu_params]); EXPECT_EQ(object[strings::cmd_icon], obj[strings::msg_params][strings::cmd_icon]); EXPECT_EQ( - "10", + cmd_icon_value, obj[strings::msg_params][strings::cmd_icon][strings::value].asString()); } |