diff options
| author | Collin <iCollin@users.noreply.github.com> | 2020-05-18 05:31:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-18 08:31:34 -0400 |
| commit | 63e8380e10f072b10790743416b47df16925639b (patch) | |
| tree | 10379494fa716decdcc04668d03ddef2e32b51ab /src/components/include | |
| parent | 401cd47678e0f2754c114d3b59e0fd8cff597230 (diff) | |
| download | sdl_core-63e8380e10f072b10790743416b47df16925639b.tar.gz | |
ResetGlobalProperties doesn't reset HELPPROMPT and VRHELPITEMS to default 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 <vmalkov@luxoft.com>
* fix vr_help_title SO type, rename help_prompt_ in unit tests to so_help_prompt
* fix style
Co-authored-by: v-malko4 <vmalkov@luxoft.com>
Diffstat (limited to 'src/components/include')
| -rw-r--r-- | src/components/include/application_manager/application_manager_settings.h | 2 | ||||
| -rw-r--r-- | src/components/include/test/application_manager/mock_application_manager_settings.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/components/include/application_manager/application_manager_settings.h b/src/components/include/application_manager/application_manager_settings.h index 524feed6e5..5b3dfc26df 100644 --- a/src/components/include/application_manager/application_manager_settings.h +++ b/src/components/include/application_manager/application_manager_settings.h @@ -72,7 +72,9 @@ class ApplicationManagerSettings : public RequestControlerSettings, virtual const std::string& tts_delimiter() const = 0; virtual const uint32_t& put_file_in_none() const = 0; virtual const std::string& sdl_version() const = 0; + virtual const std::string& vr_help_title() const = 0; virtual const std::vector<std::string>& time_out_promt() const = 0; + virtual const std::vector<std::string>& help_prompt() const = 0; virtual const std::string& hmi_capabilities_file_name() const = 0; virtual const std::string& video_server_type() const = 0; virtual const std::string& audio_server_type() const = 0; diff --git a/src/components/include/test/application_manager/mock_application_manager_settings.h b/src/components/include/test/application_manager/mock_application_manager_settings.h index 998ff252fe..1a68d663fe 100644 --- a/src/components/include/test/application_manager/mock_application_manager_settings.h +++ b/src/components/include/test/application_manager/mock_application_manager_settings.h @@ -78,6 +78,8 @@ class MockApplicationManagerSettings MOCK_CONST_METHOD0(tts_delimiter, const std::string&()); MOCK_CONST_METHOD0(put_file_in_none, const uint32_t&()); MOCK_CONST_METHOD0(sdl_version, const std::string&()); + MOCK_CONST_METHOD0(vr_help_title, const std::string&()); + MOCK_CONST_METHOD0(help_prompt, const std::vector<std::string>&()); MOCK_CONST_METHOD0(time_out_promt, const std::vector<std::string>&()); MOCK_CONST_METHOD0(hmi_capabilities_file_name, const std::string&()); MOCK_CONST_METHOD0(video_server_type, const std::string&()); |