ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #2337

ghost · 2018-07-11T17:36:42Z

This PR is ready for review.

Risk

This PR makes no API changes.

Summary

This PR provided bugfixing ResetGlobalProperties request from mobile, when the SDL after restart should send to HMI UI.SetGlobalProperties("vrHelpTitle", "vrHelp") with default values and TTS.SetGlobalProperties with helpPrompt parameter that should be reset to default value from smartDeviceLink.ini file.

CLA

I have signed the CLA

AKalinich-Luxoft

Please check and fix your build with enabled unit tests. As I could see it is failing now

AKalinich-Luxoft · 2018-07-12T07:16:02Z

...on_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc

  smart_objects::SmartObject so_help_prompt =
      smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+  for (uint32_t i = 0; i < help_prompt.size(); ++i) {
+    smart_objects::SmartObject helpPrompt =


@ValeriiMalkov please use our coding style naming. And better to rename this to help_prompt_item

@AKalinich-Luxoft That was fixed at the commit f42464f

AKalinich-Luxoft · 2018-07-12T07:18:51Z

src/components/application_manager/src/message_helper/message_helper.cc

@@ -1291,9 +1291,16 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateAppVrHelp(
    return NULL;
  }
  smart_objects::SmartObject& vr_help = *result;
-  vr_help[strings::vr_help_title] = app->name();
-
+  vr_help[strings::vr_help_title] = 


@ValeriiMalkov please add if condition and check:

Returned from vr_help_title() pointer is not NULL

strings::vr_help_title key exists in returned smart object

@AKalinich-Luxoft That was fixed at the commit f42464f

AKalinich-Luxoft · 2018-07-12T07:19:28Z

src/components/application_manager/src/message_helper/message_helper.cc

  int32_t index = 0;
+
+  smart_objects::SmartObject so_vr_help(smart_objects::SmartType_Map);
+  so_vr_help[strings::position] = index+1;


@ValeriiMalkov please run check_style.sh as I could see some style errors

@AKalinich-Luxoft That was fixed at the commit f42464f

AKalinich-Luxoft · 2018-07-12T10:47:23Z

src/components/application_manager/src/message_helper/message_helper.cc

+  if (app->vr_help_title()) {
+    vr_help[strings::vr_help_title] =
+        (*app->vr_help_title())[strings::vr_help_title].asString();
+  }


@ValeriiMalkov

const smart_objects::SmartObject* vr_help_title = app->vr_help_title(); if (NULL != 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(); }

@AKalinich-Luxoft That was fixed and force updated.
See commit f42464f

AByzhynar · 2018-07-12T12:55:54Z

...on_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc

  smart_objects::SmartObject so_help_prompt =
      smart_objects::SmartObject(smart_objects::SmartType_Array);
+
+  for (uint32_t i = 0; i < help_prompt.size(); ++i) {


@ValeriiMalkov What if size will return 64bit value?

@AByzhynar That's really not correct. I changed it to size_t type which returns method 'size()' from 'std::vector' container. See commit: ad33e6e

AByzhynar · 2018-07-12T12:58:33Z

src/components/application_manager/src/message_helper/message_helper.cc

@@ -1291,9 +1291,20 @@ smart_objects::SmartObjectSPtr MessageHelper::CreateAppVrHelp(
    return NULL;
  }
  smart_objects::SmartObject& vr_help = *result;
-  vr_help[strings::vr_help_title] = app->name();
+  const smart_objects::SmartObject* vr_help_title = app->vr_help_title();
+  if (NULL != vr_help_title &&


@ValeriiMalkov use nullptr instead of NULL or even if(ptr)

@AByzhynar That was fixed at the commit: ad33e6e

Fix bug `ResetGlobalProperties` does't reset `HELPPROMPT` and `VRHELPITEMS` to default values Fix UT's after bugfixing - Fix `ResetGlobalPropertiesRequestTest` - Add mock function into `MockApplicationManagerSettings` Github issue #1306

JenkinsSDLOnCloud · 2018-08-09T15:33:10Z

Can one of the admins verify this patch?

EKuliiev

./test_scripts/Smoke/API/002_ResetGlobalProperties_PositiveCase_SUCCESS.lua failed.

--- Preconditions -----------------------------------------------------------------------------------
  commonSteps:DeletePolicyTable : policy.sqlite is not found  
[15:41:07,250] Clean_environment                                                                     [SUCCESS] (1 ms)
SDL pid 3615
tcp        0      0 127.0.0.1:8087          0.0.0.0:*               LISTEN     
HMI initialized
HMI is ready
Mobile connected
[15:41:08,864] Start_SDL__HMI__connect_Mobile__start_Session                                         [SUCCESS] (624 ms)
[15:41:09,505] RAI                                                                                   [SUCCESS] (218 ms)
[15:41:09,732] Activate_App                                                                          [SUCCESS] (511 ms)
--- Test --------------------------------------------------------------------------------------------
[15:41:10,246] ResetGlobalProperties_Positive_Case                                                   [FAIL] (77 ms)
 HMI call TTS.SetGlobalProperties: ValidIf: 
number of array elements params.helpPrompt: expected 0, actual: 2
 HMI call UI.SetGlobalProperties: ValidIf: 
params.vrHelpTitle: expected: Test Application, actual value: Available Vr Commands List
--- Postconditions ----------------------------------------------------------------------------------
[15:41:10,328] Stop_SDL                                                                              [SUCCESS] (4 ms)
Total executing time is 5s 163ms (summary 5163ms)
==============================
Finish './test_scripts/Smoke/API/002_ResetGlobalProperties_PositiveCase_SUCCESS.lua'

SerhiiMuchychka · 2018-12-12T16:51:57Z

...on_manager/rpc_plugins/sdl_rpc_plugin/src/commands/mobile/reset_global_properties_request.cc

@@ -237,8 +250,16 @@ bool ResetGlobalPropertiesRequest::ResetVrHelpTitleItems(
    SendResponse(false, mobile_apis::Result::APPLICATION_NOT_REGISTERED);
    return false;
  }
+
+  const std::string& vr_help_title =


These changes generate the following log:

"vrHelpTitle" : { "vrHelpTitle" : "Available Vr Commands List" }

…ault values (#3357) * Fix bug `ResetGlobalProperties` (#2337) Fix bug `ResetGlobalProperties` does't reset `HELPPROMPT` and `VRHELPITEMS` to default values Fix UT's after bugfixing - Fix `ResetGlobalPropertiesRequestTest` - Add mock function into `MockApplicationManagerSettings` Github issue #1306 Co-authored-by: v-malko4 <[email protected]> * fix vr_help_title SO type, rename help_prompt_ in unit tests to so_help_prompt * fix style Co-authored-by: v-malko4 <[email protected]>

ghost requested review from AKalinich-Luxoft, AByzhynar, LuxoftAKutsan, LitvinenkoIra and Ypostolov July 11, 2018 17:36

ghost mentioned this pull request Jul 11, 2018

ResetGlobalProperties does't reset HELPPROMPT and VRHELPITEMS to default values #1306

Closed

AKalinich-Luxoft suggested changes Jul 12, 2018

View reviewed changes

AKalinich-Luxoft approved these changes Jul 12, 2018

View reviewed changes

AByzhynar suggested changes Jul 12, 2018

View reviewed changes

AByzhynar approved these changes Jul 13, 2018

View reviewed changes

Fix bug ResetGlobalProperties

1ac156f

Fix bug `ResetGlobalProperties` does't reset `HELPPROMPT` and `VRHELPITEMS` to default values Fix UT's after bugfixing - Fix `ResetGlobalPropertiesRequestTest` - Add mock function into `MockApplicationManagerSettings` Github issue #1306

LuxoftAKutsan approved these changes Jul 19, 2018

View reviewed changes

EKuliiev approved these changes Sep 10, 2018

View reviewed changes

LitvinenkoIra approved these changes Dec 12, 2018

View reviewed changes

EKuliiev suggested changes Dec 12, 2018

View reviewed changes

SerhiiMuchychka reviewed Dec 12, 2018

View reviewed changes

iCollin changed the base branch from develop to fix/resetglobalprops_vrhelp May 11, 2020 14:45

iCollin merged commit 000e14c into smartdevicelink:fix/resetglobalprops_vrhelp May 11, 2020

iCollin mentioned this pull request May 11, 2020

ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #3357

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #2337

ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #2337

ghost commented Jul 11, 2018

AKalinich-Luxoft left a comment

AKalinich-Luxoft Jul 12, 2018

ghost Jul 12, 2018 •

edited by ghost

Loading

AKalinich-Luxoft Jul 12, 2018

ghost Jul 12, 2018 •

edited by ghost

Loading

AKalinich-Luxoft Jul 12, 2018

ghost Jul 12, 2018 •

edited by ghost

Loading

AKalinich-Luxoft Jul 12, 2018

ghost Jul 12, 2018

AByzhynar Jul 12, 2018

ghost Jul 13, 2018 •

edited by ghost

Loading

AByzhynar Jul 12, 2018

ghost Jul 13, 2018 •

edited by ghost

Loading

JenkinsSDLOnCloud commented Aug 9, 2018

EKuliiev left a comment

SerhiiMuchychka Dec 12, 2018

ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #2337

ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default values #2337

Conversation

ghost commented Jul 11, 2018

Risk

Summary

CLA

AKalinich-Luxoft left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 12, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 12, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 12, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 13, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 13, 2018 • edited by ghost Loading

Choose a reason for hiding this comment

JenkinsSDLOnCloud commented Aug 9, 2018

EKuliiev left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ghost Jul 12, 2018 •

edited by ghost

Loading

ghost Jul 12, 2018 •

edited by ghost

Loading

ghost Jul 12, 2018 •

edited by ghost

Loading

ghost Jul 13, 2018 •

edited by ghost

Loading

ghost Jul 13, 2018 •

edited by ghost

Loading