diff options
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile')
7 files changed, 205 insertions, 226 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc index 6a0d799ce5..aa199bd112 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/add_command_request_test.cc @@ -48,6 +48,8 @@ #include "application_manager/mock_help_prompt_manager.h" #include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/mock_resume_ctrl.h" +#include "application_manager/resumption/resumption_data_processor.h" #include "application_manager/smart_object_keys.h" #include "smart_objects/smart_object.h" #include "utils/custom_string.h" @@ -220,6 +222,7 @@ class AddCommandRequestTest mock_rpc_service_, ManageMobileCommand(response, am::commands::Command::CommandSource::SOURCE_SDL)); + std::shared_ptr<CommandRequestImpl> base_class_request = static_cast<std::shared_ptr<CommandRequestImpl> >(request_ptr); base_class_request->onTimeOut(); @@ -1093,6 +1096,7 @@ TEST_F(AddCommandRequestTest, EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( response, am::commands::Command::CommandSource::SOURCE_SDL)); + std::shared_ptr<CommandRequestImpl> base_class_request = static_cast<std::shared_ptr<CommandRequestImpl> >( CreateCommand<AddCommandRequest>(msg_)); @@ -1143,6 +1147,7 @@ TEST_F(AddCommandRequestTest, OnTimeOut_AppRemoveCommandCalled) { EXPECT_CALL(mock_rpc_service_, ManageMobileCommand( response, am::commands::Command::CommandSource::SOURCE_SDL)); + std::shared_ptr<CommandRequestImpl> base_class_request = static_cast<std::shared_ptr<CommandRequestImpl> >(request_ptr); base_class_request->onTimeOut(); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc index 2677731e07..80abfec61d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/create_interaction_choice_set_test.cc @@ -44,6 +44,8 @@ #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_message_helper.h" +#include "application_manager/mock_resume_ctrl.h" +#include "application_manager/resumption/resumption_data_processor.h" #include "application_manager/smart_object_keys.h" #include "gtest/gtest.h" #include "smart_objects/smart_object.h" @@ -184,6 +186,11 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeout_GENERIC_ERROR) { ManageMobileCommand(_, am::commands::Command::CommandSource::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); + resumption_test::MockResumeCtrl mock_resume_ctrl; + EXPECT_CALL(app_mngr_, resume_controller()) + .WillOnce(ReturnRef(mock_resume_ctrl)); + EXPECT_CALL(mock_resume_ctrl, HandleOnTimeOut(_, _)); + req_vr->onTimeOut(); EXPECT_EQ( (*vr_command_result)[strings::msg_params][strings::success].asBool(), @@ -704,7 +711,12 @@ TEST_F(CreateInteractionChoiceSetRequestTest, MobileResultCodeIs(mobile_apis::Result::GENERIC_ERROR), am::commands::Command::SOURCE_SDL)); + resumption_test::MockResumeCtrl mock_resume_ctrl; + EXPECT_CALL(app_mngr_, resume_controller()) + .WillOnce(ReturnRef(mock_resume_ctrl)); + EXPECT_CALL(mock_resume_ctrl, HandleOnTimeOut(_, _)); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)); + command_->onTimeOut(); } @@ -748,7 +760,12 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(*mock_app_, RemoveChoiceSet(kChoiceSetId)); EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, _)).Times(0); + resumption_test::MockResumeCtrl mock_resume_ctrl; + EXPECT_CALL(app_mngr_, resume_controller()) + .WillOnce(ReturnRef(mock_resume_ctrl)); + EXPECT_CALL(mock_resume_ctrl, HandleOnTimeOut(_, _)); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)); + command_->onTimeOut(); } @@ -794,6 +811,11 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeOut_InvalidApp_UNSUCCESS) { EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillOnce(Return(invalid_app)); EXPECT_CALL(*mock_app_, RemoveChoiceSet(_)).Times(0); + resumption_test::MockResumeCtrl mock_resume_ctrl; + EXPECT_CALL(app_mngr_, resume_controller()) + .WillOnce(ReturnRef(mock_resume_ctrl)); + EXPECT_CALL(mock_resume_ctrl, HandleOnTimeOut(_, _)); + command_->onTimeOut(); } @@ -833,6 +855,10 @@ TEST_F(CreateInteractionChoiceSetRequestTest, FillMessageFieldsItem2(message_); EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)).Times(0); + resumption_test::MockResumeCtrl mock_resume_ctrl; + EXPECT_CALL(app_mngr_, resume_controller()) + .WillOnce(ReturnRef(mock_resume_ctrl)); + EXPECT_CALL(mock_resume_ctrl, HandleOnTimeOut(_, _)); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)); Event event(hmi_apis::FunctionID::VR_AddCommand); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc index 349ada66a2..7e7b16aa89 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/on_system_capability_updated_notification_test.cc @@ -183,6 +183,10 @@ TEST_F( ON_CALL(mock_hmi_capabilities_, system_display_capabilities()) .WillByDefault(Return(system_display_capabilities)); + application_manager::DisplayCapabilitiesBuilder builder(*mock_app_); + ON_CALL(*mock_app_, display_capabilities_builder()) + .WillByDefault(ReturnRef(builder)); + sdl_rpc_plugin::SDLRPCPlugin sdl_rpc_plugin; std::shared_ptr<sdl_rpc_plugin::SystemCapabilityAppExtension> @@ -197,7 +201,7 @@ TEST_F( DataAccessor<application_manager::ApplicationSet>(apps, apps_lock_)); ON_CALL(app_mngr_, applications()).WillByDefault(Return(apps_data)); - ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey)); + ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kAppId)); ON_CALL(*mock_app_, display_capabilities()).WillByDefault(Return(nullptr)); ON_CALL(*mock_app_, QueryInterface(sdl_rpc_plugin::SystemCapabilityAppExtension:: diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc index 1be3243cc2..33771f6c3d 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc @@ -43,7 +43,9 @@ #include "application_manager/mock_hmi_capabilities.h" #include "application_manager/mock_hmi_interface.h" #include "application_manager/mock_resume_ctrl.h" +#include "application_manager/mock_rpc_plugin_manager.h" #include "application_manager/policies/mock_policy_handler_interface.h" +#include "application_manager/resumption/resumption_data_processor.h" #include "application_manager/smart_object_keys.h" #include "connection_handler/mock_connection_handler.h" #include "gtest/gtest.h" @@ -73,11 +75,13 @@ using ::testing::SetArgPointee; namespace am = ::application_manager; using am::commands::MessageSharedPtr; +using am::plugin_manager::MockRPCPluginManager; using sdl_rpc_plugin::commands::RegisterAppInterfaceRequest; namespace { const uint32_t kConnectionKey = 1u; const uint32_t kConnectionKey2 = 2u; +const uint32_t kDefaultTimeout = 0u; const connection_handler::DeviceHandle kDeviceHandle = 3u; const hmi_apis::Common_Language::eType kHmiLanguage = hmi_apis::Common_Language::EN_US; @@ -109,6 +113,10 @@ class RegisterAppInterfaceRequestTest , mock_application_helper_( application_manager_test::MockApplicationHelper:: application_helper_mock()) + , mock_rpc_plugin_manager_( + std::make_shared<NiceMock<MockRPCPluginManager> >()) + , message_helper_mock_( + *application_manager::MockMessageHelper::message_helper_mock()) , notify_upd_manager_(std::make_shared<utils::CallNothing>()) { InitGetters(); InitLanguage(); @@ -116,10 +124,21 @@ class RegisterAppInterfaceRequestTest void SetUp() OVERRIDE { testing::Mock::VerifyAndClearExpectations(&mock_application_helper_); + testing::Mock::VerifyAndClearExpectations(&message_helper_mock_); + + ON_CALL(app_mngr_, GetPluginManager()) + .WillByDefault(ReturnRef(*mock_rpc_plugin_manager_)); + + ON_CALL(app_mngr_, GetPolicyHandler()) + .WillByDefault(ReturnRef(mock_policy_handler_)); + + ON_CALL(app_mngr_, GetRPCService()) + .WillByDefault(ReturnRef(mock_rpc_service_)); } void TearDown() OVERRIDE { testing::Mock::VerifyAndClearExpectations(&mock_application_helper_); + testing::Mock::VerifyAndClearExpectations(&message_helper_mock_); } void InitBasicMessage() { @@ -152,6 +171,15 @@ class RegisterAppInterfaceRequestTest ON_CALL(*mock_app, policy_app_id()).WillByDefault(Return(kAppId1)); ON_CALL(*mock_app, msg_version()) .WillByDefault(ReturnRef(mock_semantic_version)); + ON_CALL(*mock_app, protocol_version()) + .WillByDefault( + Return(protocol_handler::MajorProtocolVersion::PROTOCOL_VERSION_5)); + + capabilities_builder_ptr_.reset( + new application_manager::DisplayCapabilitiesBuilder(*mock_app)); + ON_CALL(*mock_app, display_capabilities_builder()) + .WillByDefault(ReturnRef(*capabilities_builder_ptr_)); + return mock_app; } @@ -281,6 +309,11 @@ class RegisterAppInterfaceRequestTest HMIResultCodeIs(hmi_apis::FunctionID::VR_ChangeRegistration), _)) .Times(0); + auto notification = std::make_shared<smart_objects::SmartObject>(); + ON_CALL(message_helper_mock_, CreateHMIStatusNotification(_, _)) + .WillByDefault(Return(notification)); + EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(notification, _)); + EXPECT_CALL(app_mngr_, OnApplicationSwitched( std::static_pointer_cast<application_manager::Application>( @@ -345,7 +378,7 @@ class RegisterAppInterfaceRequestTest typedef IsNiceMock<policy_test::MockPolicyHandlerInterface, kMocksAreNice>::Result MockPolicyHandlerInterface; - typedef IsNiceMock<resumprion_test::MockResumeCtrl, kMocksAreNice>::Result + typedef IsNiceMock<resumption_test::MockResumeCtrl, kMocksAreNice>::Result MockResumeCtrl; typedef IsNiceMock<connection_handler_test::MockConnectionHandler, @@ -361,13 +394,23 @@ class RegisterAppInterfaceRequestTest MockConnectionHandler mock_connection_handler_; MockSessionObserver mock_session_observer_; application_manager_test::MockApplicationHelper& mock_application_helper_; + std::shared_ptr<am::plugin_manager::MockRPCPluginManager> + mock_rpc_plugin_manager_; + application_manager::MockMessageHelper& message_helper_mock_; policy::StatusNotifier notify_upd_manager_; + std::unique_ptr<application_manager::DisplayCapabilitiesBuilder> + capabilities_builder_ptr_; }; TEST_F(RegisterAppInterfaceRequestTest, Init_SUCCESS) { EXPECT_TRUE(command_->Init()); } +TEST_F(RegisterAppInterfaceRequestTest, DefaultTimeout_CheckIfZero_SUCCESS) { + command_->Init(); + EXPECT_EQ(command_->default_timeout(), kDefaultTimeout); +} + TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { InitBasicMessage(); (*msg_)[am::strings::msg_params][am::strings::hash_id] = kAppId1; @@ -376,7 +419,6 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { .WillOnce(Return(true)) .WillOnce(Return(false)); ON_CALL(app_mngr_, IsHMICooperating()).WillByDefault(Return(false)); - EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)); EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false)); ON_CALL(mock_connection_handler_, @@ -398,8 +440,8 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { .WillByDefault(Return(DataAccessor<am::AppsWaitRegistrationSet>( pending_app_set_, pending_lock_ptr_))); - EXPECT_CALL(app_mngr_, application(kConnectionKey)) - .WillOnce(Return(mock_app)); + ON_CALL(app_mngr_, application(kConnectionKey)) + .WillByDefault(Return(mock_app)); ON_CALL(mock_policy_handler_, PolicyEnabled()).WillByDefault(Return(true)); ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId1, _, _)) @@ -421,6 +463,11 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { HMIResultCodeIs(hmi_apis::FunctionID::Buttons_OnButtonSubscription), _)) .WillOnce(Return(true)); + + application_manager::DisplayCapabilitiesBuilder builder(*mock_app); + ON_CALL(*mock_app, display_capabilities_builder()) + .WillByDefault(ReturnRef(builder)); + EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); @@ -460,7 +507,6 @@ TEST_F(RegisterAppInterfaceRequestTest, .WillOnce(Return(true)) .WillOnce(Return(false)); ON_CALL(app_mngr_, IsHMICooperating()).WillByDefault(Return(false)); - EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)); EXPECT_CALL(app_mngr_, IsApplicationForbidden(_, _)).WillOnce(Return(false)); ON_CALL(mock_connection_handler_, @@ -475,8 +521,8 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1)) .WillRepeatedly(Return(ApplicationSharedPtr())); - EXPECT_CALL(app_mngr_, application(kConnectionKey)) - .WillOnce(Return(mock_app)); + ON_CALL(app_mngr_, application(kConnectionKey)) + .WillByDefault(Return(mock_app)); MessageSharedPtr expected_message = CreateMessage(smart_objects::SmartType_Map); @@ -559,6 +605,11 @@ TEST_F(RegisterAppInterfaceRequestTest, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration), _)) .WillOnce(Return(true)); + + application_manager::DisplayCapabilitiesBuilder builder(*mock_app); + ON_CALL(*mock_app, display_capabilities_builder()) + .WillByDefault(ReturnRef(builder)); + EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); @@ -604,8 +655,8 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL(mock_application_helper_, RecallApplicationData(_, _)).Times(0); - EXPECT_CALL(app_mngr_, application(kConnectionKey)) - .WillRepeatedly(Return(mock_app)); + ON_CALL(app_mngr_, application(kConnectionKey)) + .WillByDefault(Return(mock_app)); SetCommonExpectionsOnSwitchedApplication(mock_app, mobile_apis::Result::SUCCESS); @@ -651,8 +702,8 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).Times(0); - EXPECT_CALL(app_mngr_, application(kConnectionKey)) - .WillRepeatedly(Return(mock_app)); + ON_CALL(app_mngr_, application(kConnectionKey)) + .WillByDefault(Return(mock_app)); SetCommonExpectionsOnSwitchedApplication(mock_app, mobile_apis::Result::RESUME_FAILED); @@ -687,8 +738,8 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL(app_mngr_, RegisterApplication(msg_)).Times(0); - EXPECT_CALL(app_mngr_, application(kConnectionKey)) - .WillRepeatedly(Return(mock_app)); + ON_CALL(app_mngr_, application(kConnectionKey)) + .WillByDefault(Return(mock_app)); SetCommonExpectionsOnSwitchedApplication(mock_app, mobile_apis::Result::RESUME_FAILED); @@ -760,7 +811,6 @@ TEST_F(RegisterAppInterfaceRequestTest, .WillOnce(Return(true)) .WillOnce(Return(false)); ON_CALL(app_mngr_, IsHMICooperating()).WillByDefault(Return(false)); - EXPECT_CALL(app_mngr_, updateRequestTimeout(kConnectionKey2, _, _)); EXPECT_CALL(app_mngr_, IsApplicationForbidden(kConnectionKey2, kAppId1)) .WillOnce(Return(false)); @@ -781,8 +831,8 @@ TEST_F(RegisterAppInterfaceRequestTest, EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1)) .WillOnce(Return(ApplicationSharedPtr())); - EXPECT_CALL(app_mngr_, application(kConnectionKey2)) - .WillOnce(Return(mock_app2)); + ON_CALL(app_mngr_, application(kConnectionKey2)) + .WillByDefault(Return(mock_app2)); ON_CALL(mock_policy_handler_, PolicyEnabled()).WillByDefault(Return(true)); ON_CALL(mock_policy_handler_, GetInitialAppData(kAppId1, _, _)) @@ -822,6 +872,11 @@ TEST_F(RegisterAppInterfaceRequestTest, ManageHMICommand( HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration), _)) .WillOnce(Return(true)); + + application_manager::DisplayCapabilitiesBuilder builder(*mock_app2); + ON_CALL(*mock_app2, display_capabilities_builder()) + .WillByDefault(ReturnRef(builder)); + EXPECT_CALL(mock_rpc_service_, ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); 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 4b43c302e4..8ca15f39fe 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 @@ -125,157 +125,50 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidApp_UNSUCCESS) { } TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) { - (*msg_)[am::strings::msg_params][am::strings::properties][0] = - mobile_apis::GlobalProperty::HELPPROMPT; - (*msg_)[am::strings::msg_params][am::strings::properties][1] = - mobile_apis::GlobalProperty::TIMEOUTPROMPT; - (*msg_)[am::strings::msg_params][am::strings::properties][2] = - mobile_apis::GlobalProperty::VRHELPTITLE; - (*msg_)[am::strings::msg_params][am::strings::properties][3] = - mobile_apis::GlobalProperty::MENUNAME; - (*msg_)[am::strings::msg_params][am::strings::properties][4] = - mobile_apis::GlobalProperty::MENUICON; - (*msg_)[am::strings::msg_params][am::strings::properties][5] = - mobile_apis::GlobalProperty::KEYBOARDPROPERTIES; - - EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey)); - std::vector<std::string> help_prompt = {"help_prompt"}; - - EXPECT_CALL(app_mngr_settings_, help_prompt()) - .WillOnce(ReturnRef(help_prompt)); - - smart_objects::SmartObject so_help_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Map); - 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] = so_help_prompt; - - EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt)); - - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); - - smart_objects::SmartObject timeout_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Map); - timeout_prompt[am::strings::text] = time_out_prompt[0]; - timeout_prompt[am::strings::type] = - hmi_apis::Common_SpeechCapabilities::SC_TEXT; - - smart_objects::SmartObject so_time_out_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Array); - - so_time_out_prompt[0] = timeout_prompt; - - EXPECT_CALL(*mock_app_, set_timeout_prompt(so_time_out_prompt)); - - std::string vr_help_title("vr_help_title"); - EXPECT_CALL(app_mngr_settings_, vr_help_title()) - .WillOnce(ReturnRef(vr_help_title)); - - smart_objects::SmartObject so_vr_help_title = - smart_objects::SmartObject(smart_objects::SmartType_String); - so_vr_help_title = vr_help_title; - EXPECT_CALL(*mock_app_, set_vr_help_title(so_vr_help_title)); + am::ResetGlobalPropertiesResult result; + result.help_prompt = true; + result.timeout_prompt = true; + result.vr_help_title_items = true; + result.menu_name = true; + result.menu_icon = true; + result.keyboard_properties = true; - EXPECT_CALL(*mock_app_, reset_vr_help_title()); - EXPECT_CALL(*mock_app_, reset_vr_help()); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(smart_objects::SmartObjectSPtr())); - smart_objects::SmartObjectSPtr vr_help; // = NULL; - EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) - .WillOnce(Return(vr_help)); + ON_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillByDefault(Return(std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map))); - EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(0); + EXPECT_CALL(mock_rpc_service_, ManageHMICommand(_, _)).Times(1); command_->Run(); } TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) { - (*msg_)[am::strings::msg_params][am::strings::properties][0] = - mobile_apis::GlobalProperty::HELPPROMPT; - (*msg_)[am::strings::msg_params][am::strings::properties][1] = - mobile_apis::GlobalProperty::TIMEOUTPROMPT; - (*msg_)[am::strings::msg_params][am::strings::properties][2] = - mobile_apis::GlobalProperty::VRHELPTITLE; - (*msg_)[am::strings::msg_params][am::strings::properties][3] = - mobile_apis::GlobalProperty::MENUNAME; - (*msg_)[am::strings::msg_params][am::strings::properties][4] = - mobile_apis::GlobalProperty::MENUICON; - (*msg_)[am::strings::msg_params][am::strings::properties][5] = - mobile_apis::GlobalProperty::KEYBOARDPROPERTIES; - - EXPECT_CALL(app_mngr_, RemoveAppFromTTSGlobalPropertiesList(kConnectionKey)); - - std::vector<std::string> help_prompt = {"help_prompt"}; - - EXPECT_CALL(app_mngr_settings_, help_prompt()) - .WillOnce(ReturnRef(help_prompt)); - - smart_objects::SmartObject so_help_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Map); - 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] = so_help_prompt; - EXPECT_CALL(*mock_app_, set_help_prompt(so_prompt)); - - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); - - smart_objects::SmartObject timeout_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Map); - timeout_prompt[am::strings::text] = time_out_prompt[0]; - timeout_prompt[am::strings::type] = - hmi_apis::Common_SpeechCapabilities::SC_TEXT; - - smart_objects::SmartObject so_time_out_prompt = - smart_objects::SmartObject(smart_objects::SmartType_Array); - - so_time_out_prompt[0] = timeout_prompt; - - EXPECT_CALL(*mock_app_, set_timeout_prompt(so_time_out_prompt)); - - std::string vr_help_title("vr_help_title"); - EXPECT_CALL(app_mngr_settings_, vr_help_title()) - .WillOnce(ReturnRef(vr_help_title)); + am::ResetGlobalPropertiesResult result; + result.help_prompt = true; + result.timeout_prompt = true; + result.vr_help_title_items = true; + result.menu_name = true; + result.menu_icon = true; + result.keyboard_properties = true; + result.vr_has_been_reset = true; - smart_objects::SmartObject so_vr_help_title = - smart_objects::SmartObject(smart_objects::SmartType_String); - 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()); - EXPECT_CALL(*mock_app_, reset_vr_help()); + ON_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillByDefault(Return(result)); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - smart_objects::SmartObjectSPtr vr_help = + smart_objects::SmartObjectSPtr msg_params = std::make_shared<smart_objects::SmartObject>( smart_objects::SmartType_Map); - EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) - .WillOnce(Return(vr_help)); - - smart_objects::SmartObject msg_params = - smart_objects::SmartObject(smart_objects::SmartType_Map); - msg_params[am::hmi_request::menu_title] = ""; - EXPECT_CALL(*mock_app_, - set_menu_title(msg_params[am::hmi_request::menu_title])); - - EXPECT_CALL(*mock_app_, help_prompt()).WillOnce(Return(&so_help_prompt)); - EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(&so_help_prompt)); + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); EXPECT_CALL( mock_rpc_service_, @@ -304,27 +197,18 @@ TEST_F(ResetGlobalPropertiesRequestTest, hmi_apis::Common_Result::SUCCESS; (*msg_)[am::strings::params][am::hmi_response::code] = result_code; - (*msg_)[am::strings::msg_params][am::strings::properties][0] = - mobile_apis::GlobalProperty::VRHELPTITLE; - - std::string vr_help_title("vr_help_title"); - EXPECT_CALL(app_mngr_settings_, vr_help_title()) - .WillOnce(ReturnRef(vr_help_title)); + am::ResetGlobalPropertiesResult result; + result.vr_help_title_items = true; - smart_objects::SmartObject so_vr_help_title = - smart_objects::SmartObject(smart_objects::SmartType_String); - 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()); - EXPECT_CALL(*mock_app_, reset_vr_help()); - EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - smart_objects::SmartObjectSPtr vr_help = + smart_objects::SmartObjectSPtr msg_params = std::make_shared<smart_objects::SmartObject>( smart_objects::SmartType_Map); - EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) - .WillOnce(Return(vr_help)); + + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -353,20 +237,22 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*msg_)[am::strings::msg_params][am::strings::properties][1] = mobile_apis::GlobalProperty::MENUICON; - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); + am::ResetGlobalPropertiesResult result; + result.timeout_prompt = true; + result.menu_icon = true; - EXPECT_CALL(*mock_app_, set_timeout_prompt(_)); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - smart_objects::SmartObjectSPtr prompt = - std::make_shared<smart_objects::SmartObject>(); - *prompt = "prompt"; + EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(prompt.get())); + smart_objects::SmartObjectSPtr msg_params = + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); - EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); MessageSharedPtr ui_msg = CreateMessage(); (*ui_msg)[am::strings::params][am::strings::correlation_id] = kCorrelationId; @@ -412,19 +298,22 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { (*msg_)[am::strings::msg_params][am::strings::properties][0] = mobile_apis::GlobalProperty::VRHELPTITLE; - std::string vr_help_title("vr_help_title"); - EXPECT_CALL(app_mngr_settings_, vr_help_title()) - .WillOnce(ReturnRef(vr_help_title)); + am::ResetGlobalPropertiesResult result; + result.vr_help_title_items = true; - smart_objects::SmartObject so_vr_help_title = - smart_objects::SmartObject(smart_objects::SmartType_String); - 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()); - EXPECT_CALL(*mock_app_, reset_vr_help()); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); + + smart_objects::SmartObjectSPtr msg_params = + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); + + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .Times(0); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL( mock_rpc_service_, ManageHMICommand( @@ -433,8 +322,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { smart_objects::SmartObjectSPtr vr_help = std::make_shared<smart_objects::SmartObject>( smart_objects::SmartType_Map); - EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) - .WillOnce(Return(vr_help)); EXPECT_CALL(*mock_app_, UpdateHash()).Times(0); @@ -461,20 +348,22 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*msg_)[am::strings::msg_params][am::strings::properties][1] = mobile_apis::GlobalProperty::MENUICON; - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); + am::ResetGlobalPropertiesResult result; + result.timeout_prompt = true; + result.menu_icon = true; - EXPECT_CALL(*mock_app_, set_timeout_prompt(_)); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - smart_objects::SmartObjectSPtr prompt = - std::make_shared<smart_objects::SmartObject>(); - *prompt = "prompt"; + EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(prompt.get())); + smart_objects::SmartObjectSPtr msg_params = + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); - EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); EXPECT_CALL( mock_rpc_service_, @@ -528,18 +417,20 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*msg_)[am::strings::msg_params][am::strings::properties][1] = mobile_apis::GlobalProperty::MENUICON; - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); + am::ResetGlobalPropertiesResult result; + result.timeout_prompt = true; + result.menu_icon = true; - EXPECT_CALL(*mock_app_, set_timeout_prompt(_)); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - smart_objects::SmartObjectSPtr prompt = - std::make_shared<smart_objects::SmartObject>(); - *prompt = "prompt"; + smart_objects::SmartObjectSPtr msg_params = + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); - EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(prompt.get())); + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); @@ -594,18 +485,20 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*msg_)[am::strings::msg_params][am::strings::properties][1] = mobile_apis::GlobalProperty::MENUICON; - std::vector<std::string> time_out_prompt; - time_out_prompt.push_back("time_out"); - EXPECT_CALL(app_mngr_settings_, time_out_promt()) - .WillOnce(ReturnRef(time_out_prompt)); + am::ResetGlobalPropertiesResult result; + result.timeout_prompt = true; + result.menu_icon = true; - EXPECT_CALL(*mock_app_, set_timeout_prompt(_)); + EXPECT_CALL(app_mngr_, ResetGlobalProperties(_, _)).WillOnce(Return(result)); - smart_objects::SmartObjectSPtr prompt = - std::make_shared<smart_objects::SmartObject>(); - *prompt = "prompt"; + smart_objects::SmartObjectSPtr msg_params = + std::make_shared<smart_objects::SmartObject>( + smart_objects::SmartType_Map); - EXPECT_CALL(*mock_app_, timeout_prompt()).WillOnce(Return(prompt.get())); + EXPECT_CALL(mock_message_helper_, CreateTTSResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); + EXPECT_CALL(mock_message_helper_, CreateUIResetGlobalPropertiesRequest(_, _)) + .WillOnce(Return(msg_params)); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc index 56e4e05d48..528f8a0700 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/subscribe_way_points_request_test.cc @@ -71,7 +71,7 @@ TEST_F(SubscribeWayPointsRequestTest, Run_SUCCESS) { MockAppPtr app(CreateMockApp()); ON_CALL(app_mngr_, application(_)).WillByDefault(Return(app)); - ON_CALL(app_mngr_, IsAppSubscribedForWayPoints(A<am::ApplicationSharedPtr>())) + ON_CALL(app_mngr_, IsAppSubscribedForWayPoints(Ref(*app))) .WillByDefault(Return(false)); ON_CALL(app_mngr_, IsAnyAppSubscribedForWayPoints()) .WillByDefault(Return(true)); diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc index 3165d57d44..ec4d2420d6 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/unsubscribe_way_points_request_test.cc @@ -100,9 +100,7 @@ TEST_F(UnsubscribeWayPointsRequestTest, EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillOnce(Return(mock_app)); - EXPECT_CALL(app_mngr_, - IsAppSubscribedForWayPoints( - ::testing::Matcher<am::ApplicationSharedPtr>(mock_app))) + EXPECT_CALL(app_mngr_, IsAppSubscribedForWayPoints(Ref(*mock_app))) .WillOnce(Return(false)); EXPECT_CALL( @@ -117,9 +115,7 @@ TEST_F(UnsubscribeWayPointsRequestTest, Run_AppSubscribedForWayPoints_SUCCESS) { EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillOnce(Return(mock_app)); - EXPECT_CALL(app_mngr_, - IsAppSubscribedForWayPoints( - ::testing::Matcher<am::ApplicationSharedPtr>(mock_app))) + EXPECT_CALL(app_mngr_, IsAppSubscribedForWayPoints(Ref(*mock_app))) .WillOnce(Return(true)); const std::set<uint32_t> subscribed_apps{kConnectionKey}; |