fix vr_help_title SO type, rename help_prompt_ in unit tests to so_help_promptfix/resetglobalprops_vrhelp

3 files changed, 17 insertions, 22 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
index 1d2a4f3d8d..a0e178d0e2 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc
@@ -256,7 +256,7 @@ bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems(
       application_manager_.get_settings().vr_help_title();
   smart_objects::SmartObject so_vr_help_title =
       smart_objects::SmartObject(smart_objects::SmartType_String);
-  so_vr_help_title[strings::vr_help_title] = vr_help_title;
+  so_vr_help_title = vr_help_title;
 
   app->reset_vr_help_title();
   app->reset_vr_help();
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
index 3c3fbba8ca..67525193bd 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/reset_global_properties_test.cc
@@ -144,15 +144,15 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) {
   EXPECT_CALL(app_mngr_settings_, help_prompt())
       .WillOnce(ReturnRef(help_prompt));
 
-  smart_objects::SmartObject help_prompt_ =
+  smart_objects::SmartObject so_help_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
-  help_prompt_[am::strings::text] = help_prompt[0];
-  help_prompt_[am::strings::type] =
+  so_help_prompt[am::strings::text] = help_prompt[0];
+  so_help_prompt[am::strings::type] =
       hmi_apis::Common_SpeechCapabilities::SC_TEXT;
 
   smart_objects::SmartObject so_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
-  so_prompt[0] = help_prompt_;
+  so_prompt[0] = so_help_prompt;
 
   EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt));
 
@@ -180,7 +180,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) {
 
   smart_objects::SmartObject so_vr_help_title =
       smart_objects::SmartObject(smart_objects::SmartType_String);
-  so_vr_help_title[am::strings::vr_help_title] = vr_help_title;
+  so_vr_help_title = vr_help_title;
   EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
 
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
@@ -218,15 +218,15 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
   EXPECT_CALL(app_mngr_settings_, help_prompt())
       .WillOnce(ReturnRef(help_prompt));
 
-  smart_objects::SmartObject help_prompt_ =
+  smart_objects::SmartObject so_help_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Map);
-  help_prompt_[am::strings::text] = help_prompt[0];
-  help_prompt_[am::strings::type] =
+  so_help_prompt[am::strings::text] = help_prompt[0];
+  so_help_prompt[am::strings::type] =
       hmi_apis::Common_SpeechCapabilities::SC_TEXT;
 
   smart_objects::SmartObject so_prompt =
       smart_objects::SmartObject(smart_objects::SmartType_Array);
-  so_prompt[0] = help_prompt_;
+  so_prompt[0] = so_help_prompt;
   EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt));
 
   std::vector<std::string> time_out_prompt;
@@ -253,7 +253,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
 
   smart_objects::SmartObject so_vr_help_title =
       smart_objects::SmartObject(smart_objects::SmartType_String);
-  so_vr_help_title[am::strings::vr_help_title] = vr_help_title;
+  so_vr_help_title = vr_help_title;
   EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
 
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
@@ -274,12 +274,9 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) {
   EXPECT_CALL(*mock_app_,
               set_menu_title(msg_params[am::hmi_request::menu_title]));
 
-  const smart_objects::SmartObjectSPtr so_help_prompt =
-      std::make_shared<smart_objects::SmartObject>(
-          smart_objects::SmartType_Map);
-  EXPECT_CALL(*mock_app_, help_prompt()).WillOnce(Return(so_help_prompt.get()));
+  EXPECT_CALL(*mock_app_, help_prompt()).WillOnce(Return(&so_help_prompt));
   EXPECT_CALL(*mock_app_, timeout_prompt())
-      .WillOnce(Return(so_help_prompt.get()));
+      .WillOnce(Return(&so_help_prompt));
 
   EXPECT_CALL(
       mock_rpc_service_,
@@ -317,7 +314,7 @@ TEST_F(ResetGlobalPropertiesRequestTest,
 
   smart_objects::SmartObject so_vr_help_title =
       smart_objects::SmartObject(smart_objects::SmartType_String);
-  so_vr_help_title[am::strings::vr_help_title] = vr_help_title;
+  so_vr_help_title = vr_help_title;
   EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
 
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
@@ -422,7 +419,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) {
 
   smart_objects::SmartObject so_vr_help_title =
       smart_objects::SmartObject(smart_objects::SmartType_String);
-  so_vr_help_title[am::strings::vr_help_title] = vr_help_title;
+  so_vr_help_title = vr_help_title;
   EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title));
 
   EXPECT_CALL(*mock_app_, reset_vr_help_title());
diff --git a/src/components/application_manager/src/message_helper/message_helper.cc b/src/components/application_manager/src/message_helper/message_helper.cc
index fc5df21d23..9b12eb2889 100644
--- a/src/components/application_manager/src/message_helper/message_helper.cc
+++ b/src/components/application_manager/src/message_helper/message_helper.cc
@@ -1317,10 +1317,8 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateAppVrHelp(
   }
   smart_objects::SmartObject& vr_help = *result;
   const smart_objects::SmartObject* vr_help_title = app->vr_help_title();
-  if (vr_help_title &&
-      vr_help_title->keyExists(strings::vr_help_title)) {
-    vr_help[strings::vr_help_title] =
-        (*vr_help_title)[strings::vr_help_title].asString();
+  if (vr_help_title) {
+    vr_help[strings::vr_help_title] = vr_help_title->asString();
   }
 
   int32_t index = 0;