diff options
Diffstat (limited to 'src/components/application_manager/test/include')
3 files changed, 33 insertions, 32 deletions
diff --git a/src/components/application_manager/test/include/application_manager/mock_application.h b/src/components/application_manager/test/include/application_manager/mock_application.h index ac2a534929..e94ffa5961 100644 --- a/src/components/application_manager/test/include/application_manager/mock_application.h +++ b/src/components/application_manager/test/include/application_manager/mock_application.h @@ -217,12 +217,12 @@ class MockApplication : public ::application_manager::Application { MOCK_CONST_METHOD0(IsVideoApplication, bool()); MOCK_METHOD0(LoadPersistentFiles, void()); // InitialApplicationData methods - MOCK_CONST_METHOD0(app_types, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_synonyms, const smart_objects::SmartObject*()); + MOCK_CONST_METHOD0(app_types, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(vr_synonyms, const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0(policy_app_id, std::string()); - MOCK_CONST_METHOD0(tts_name, const smart_objects::SmartObject*()); + MOCK_CONST_METHOD0(tts_name, const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0(ngn_media_screen_name, - const smart_objects::SmartObject*()); + const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0(language, const mobile_apis::Language::eType&()); MOCK_CONST_METHOD0(ui_language, const mobile_apis::Language::eType&()); MOCK_CONST_METHOD0(msg_version, const utils::SemanticVersion&()); @@ -240,20 +240,20 @@ class MockApplication : public ::application_manager::Application { void(const mobile_apis::Language::eType& ui_language)); MOCK_METHOD1(set_msg_version, void(const utils::SemanticVersion& version)); // DynamicApplicationData methods - MOCK_CONST_METHOD0(help_prompt, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(timeout_prompt, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_help_title, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(vr_help, const smart_objects::SmartObject*()); + MOCK_CONST_METHOD0(help_prompt, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(timeout_prompt, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(vr_help_title, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(vr_help, const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0(tbt_state, const mobile_apis::TBTState::eType&()); - MOCK_CONST_METHOD0(show_command, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(tbt_show_command, const smart_objects::SmartObject*()); + MOCK_CONST_METHOD0(show_command, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(tbt_show_command, const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0( SubscribedButtons, DataAccessor< ::application_manager::ButtonSubscriptions>()); - MOCK_CONST_METHOD0(keyboard_props, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(menu_title, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(menu_icon, const smart_objects::SmartObject*()); - MOCK_CONST_METHOD0(menu_layout, const smart_objects::SmartObject*()); + MOCK_CONST_METHOD0(keyboard_props, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(menu_title, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(menu_icon, const smart_objects::SmartObjectSPtr()); + MOCK_CONST_METHOD0(menu_layout, const smart_objects::SmartObjectSPtr()); MOCK_CONST_METHOD0(day_color_scheme, smart_objects::SmartObject()); MOCK_CONST_METHOD0(night_color_scheme, smart_objects::SmartObject()); MOCK_CONST_METHOD0(display_layout, std::string()); @@ -361,6 +361,8 @@ class MockApplication : public ::application_manager::Application { mobile_apis::LayoutMode::eType()); MOCK_METHOD1(set_reset_global_properties_active, void(bool active)); MOCK_CONST_METHOD0(is_reset_global_properties_active, bool()); + MOCK_METHOD2(set_choice_set_allow_mode, void(std::uint32_t, bool)); + MOCK_CONST_METHOD1(is_choice_set_allowed, bool(std::uint32_t)); MOCK_CONST_METHOD0(app_id, uint32_t()); MOCK_CONST_METHOD0(mac_address, const std::string&()); MOCK_CONST_METHOD0(bundle_id, const std::string&()); diff --git a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h index f0da952d18..3a0bdc0741 100644 --- a/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h +++ b/src/components/application_manager/test/include/application_manager/mock_hmi_capabilities.h @@ -114,6 +114,11 @@ class MockHMICapabilities : public ::application_manager::HMICapabilities { MOCK_METHOD1(set_hmi_zone_capabilities, void(const smart_objects::SmartObject& hmi_zone_capabilities)); + MOCK_CONST_METHOD0(ui_hmi_capabilities, + const smart_objects::SmartObjectSPtr()); + MOCK_METHOD1(set_ui_hmi_capabilities, + void(const smart_objects::SmartObject& ui_hmi_capabilities)); + MOCK_CONST_METHOD0(soft_button_capabilities, const smart_objects::SmartObjectSPtr()); MOCK_METHOD1( diff --git a/src/components/application_manager/test/include/application_manager/resumption_data_test.h b/src/components/application_manager/test/include/application_manager/resumption_data_test.h index 0596b4e500..bea920e44e 100644 --- a/src/components/application_manager/test/include/application_manager/resumption_data_test.h +++ b/src/components/application_manager/test/include/application_manager/resumption_data_test.h @@ -63,15 +63,7 @@ using namespace mobile_apis; class ResumptionDataTest : public ::testing::Test { protected: ResumptionDataTest() - : help_prompt_(NULL) - , timeout_prompt_(NULL) - , vr_help_(NULL) - , vr_help_title_(NULL) - , vr_synonyms_(NULL) - , keyboard_props_(NULL) - , menu_title_(NULL) - , menu_icon_(NULL) - , kCountOfCommands_(5u) + : kCountOfCommands_(5u) , kCountOfChoice_(2u) , kCountOfChoiceSets_(4u) , kCountOfSubmenues_(3u) @@ -106,14 +98,15 @@ class ResumptionDataTest : public ::testing::Test { bool is_audio_; const connection_handler::DeviceHandle device_handle_ = 10; - sm::SmartObject* help_prompt_; - sm::SmartObject* timeout_prompt_; - sm::SmartObject* vr_help_; - sm::SmartObject* vr_help_title_; - sm::SmartObject* vr_synonyms_; - sm::SmartObject* keyboard_props_; - sm::SmartObject* menu_title_; - sm::SmartObject* menu_icon_; + sm::SmartObjectSPtr help_prompt_; + sm::SmartObjectSPtr timeout_prompt_; + sm::SmartObjectSPtr vr_help_; + sm::SmartObjectSPtr vr_help_title_; + sm::SmartObjectSPtr vr_synonyms_; + sm::SmartObjectSPtr keyboard_props_; + sm::SmartObjectSPtr menu_title_; + sm::SmartObjectSPtr menu_icon_; + sm::SmartObjectSPtr menu_layout_; void SetCommands(); void SetSubmenues(); @@ -121,7 +114,7 @@ class ResumptionDataTest : public ::testing::Test { void SetAppFiles(); void SetGlobalProporties(); void SetKeyboardProperties(); - void SetMenuTitleAndIcon(); + void SetMenuParams(); void SetHelpAndTimeoutPrompt(); void SetVRHelpTitle(); void SetSubscriptions(); @@ -137,6 +130,7 @@ class ResumptionDataTest : public ::testing::Test { void CheckKeyboardProperties(sm::SmartObject& res_list); void CheckMenuTitle(sm::SmartObject& res_list); void CheckMenuIcon(sm::SmartObject& res_list); + void CheckMenuLayout(sm::SmartObject& res_list); void CheckHelpPrompt(sm::SmartObject& res_list); void CheckTimeoutPrompt(sm::SmartObject& res_list); void CheckVRHelp( |