From d7c0131acbf1af7b8d1d13029c8dadbd4ebe4f63 Mon Sep 17 00:00:00 2001 From: Ira Lytvynenko Date: Fri, 2 Feb 2018 18:49:10 +0200 Subject: RPCHandler implementation Fix tests Fix due to rebase Fix unit tests in mobile commands Fixed unit tests in next commands: - delete_command_request_test.cc - delete_sub_menu_test.cc - perform_audio_pass_thru_test.cc - reset_global_properties_test.cc - send_location_request_test.cc - set_global_properties_test.cc --- .../test/commands/mobile/alert_request_test.cc | 2 +- .../mobile/create_interaction_choice_set_test.cc | 25 ++++++++++ .../commands/mobile/delete_command_request_test.cc | 4 +- .../mobile/delete_interaction_choice_set_test.cc | 54 +++++++++++++--------- .../test/commands/mobile/delete_sub_menu_test.cc | 34 +++++++++++--- .../mobile/on_button_notification_commands_test.cc | 3 +- .../mobile/perform_audio_pass_thru_test.cc | 2 +- .../mobile/register_app_interface_request_test.cc | 13 +++--- .../mobile/reset_global_properties_test.cc | 38 +++++++-------- .../commands/mobile/send_location_request_test.cc | 6 ++- .../commands/mobile/set_global_properties_test.cc | 20 ++++---- .../mobile/simple_response_commands_test.cc | 1 + .../mobile/subscribe_button_request_test.cc | 7 ++- 13 files changed, 135 insertions(+), 74 deletions(-) (limited to 'src/components/application_manager/test/commands/mobile') diff --git a/src/components/application_manager/test/commands/mobile/alert_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_request_test.cc index 518ae39811..58fef38fbc 100644 --- a/src/components/application_manager/test/commands/mobile/alert_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/alert_request_test.cc @@ -244,6 +244,7 @@ TEST_F(AlertRequestTest, OnEvent_UI_HmiSendSuccess_UNSUPPORTED_RESOURCE) { hmi_apis::Common_Result::SUCCESS; Event event_vr(hmi_apis::FunctionID::TTS_Speak); event_vr.set_smart_object(*msg_tts); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command->on_event(event_vr); @@ -251,7 +252,6 @@ TEST_F(AlertRequestTest, OnEvent_UI_HmiSendSuccess_UNSUPPORTED_RESOURCE) { event.set_smart_object(*msg); MessageSharedPtr ui_command_result; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) diff --git a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc index 61f7ef608b..223070b6af 100644 --- a/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc +++ b/src/components/application_manager/test/commands/mobile/create_interaction_choice_set_test.cc @@ -262,6 +262,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_InvalidApp_UNSUCCESS) { MockAppPtr invalid_app; EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(invalid_app)); EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); } @@ -276,6 +277,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_VerifyImageFail_UNSUCCESS) { EXPECT_CALL(mock_message_helper_, VerifyImage(_, _, _)) .WillRepeatedly(Return(mobile_apis::Result::INVALID_DATA)); EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); } @@ -298,6 +300,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_FindChoiceSetFail_UNSUCCESS) { EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId)) .WillOnce(Return(invalid_choice_set_id)); EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); } @@ -331,6 +334,8 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(*mock_app_, FindChoiceSet(kChoiceSetId)) .WillOnce(Return(choice_set_id)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL(app_mngr_, GenerateGrammarID()).Times(0); command_->Run(); } @@ -363,6 +368,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(mock_message_helper_, VerifyImage(_, _, _)) .WillRepeatedly(Return(mobile_apis::Result::SUCCESS)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); if ((*message_)[am::strings::msg_params][am::strings::choice_set][0] .keyExists(am::strings::menu_name)) { @@ -443,6 +449,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, .Times(AtLeast(2)) .WillOnce(Return(kConnectionKey)) .WillOnce(Return(kConnectionKey)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); } @@ -477,6 +484,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, .WillOnce(Return(choice_set_id)); EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); } @@ -526,6 +534,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnEvent_ValidVrNoError_SUCCESS) { EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)); @@ -559,6 +568,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); command_->Run(); EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)).Times(0); @@ -593,6 +603,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(3) + .WillRepeatedly(ReturnRef(rpc_service_)); command_->Run(); FillMessageFieldsItem2(message_); @@ -640,6 +653,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(3) + .WillRepeatedly(ReturnRef(rpc_service_)); command_->Run(); FillMessageFieldsItem2(message_); @@ -682,6 +698,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeOut_InvalidApp_UNSUCCESS) { ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(3) + .WillRepeatedly(ReturnRef(rpc_service_)); command_->Run(); FillMessageFieldsItem2(message_); @@ -726,6 +745,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, .WillOnce(Return(choice_set_id)); EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)); + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(6) + .WillRepeatedly(ReturnRef(rpc_service_)); command_->Run(); FillMessageFieldsItem2(message_); @@ -796,6 +818,9 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_ErrorFromHmiFalse_UNSUCCESS) { EXPECT_CALL(*mock_app_, AddChoiceSet(kChoiceSetId, _)).Times(2); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(3) + .WillRepeatedly(ReturnRef(rpc_service_)); command_->Run(); FillMessageFieldsItem2(message_); diff --git a/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc b/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc index 07f0a01dda..c6daa1c779 100644 --- a/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_command_request_test.cc @@ -129,6 +129,7 @@ class DeleteCommandRequestTest ON_CALL(*mock_app_, app_id()).WillByDefault(Return(kConnectionKey)); ON_CALL(app_mngr_, hmi_interfaces()) .WillByDefault(ReturnRef(hmi_interfaces_)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); } NiceMock hmi_interfaces_; @@ -161,7 +162,6 @@ TEST_F(DeleteCommandRequestTest, ON_CALL(*mock_app_, FindCommand(kCommandId)) .WillByDefault(Return(test_msg.get())); ON_CALL(*mock_app_, get_grammar_id()).WillByDefault(Return(kConnectionKey)); - MessageSharedPtr msg(CreateMessage(smart_objects::SmartType_Map)); (*msg)[am::strings::params][am::hmi_response::code] = hmi_apis::Common_Result::SUCCESS; @@ -184,7 +184,6 @@ TEST_F(DeleteCommandRequestTest, EXPECT_CALL(*mock_app_, UpdateHash()); MessageSharedPtr vr_command_result; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) @@ -221,7 +220,6 @@ TEST_F(DeleteCommandRequestTest, .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE)); ON_CALL(*app, FindCommand(kCommandId)).WillByDefault(Return(test_msg.get())); ON_CALL(*app, get_grammar_id()).WillByDefault(Return(kConnectionKey)); - MessageSharedPtr msg(CreateMessage(smart_objects::SmartType_Map)); (*msg)[am::strings::params][am::hmi_response::code] = hmi_apis::Common_Result::SUCCESS; diff --git a/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc b/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc index 7e7d1f6350..bb1a5c168b 100644 --- a/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_interaction_choice_set_test.cc @@ -194,19 +194,22 @@ TEST_F(DeleteInteractionChoiceSetRequestTest, EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillRepeatedly(Return(app_)); - InSequence seq; + { + InSequence seq; - EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) - .WillOnce(Return(choice_set_id)); - EXPECT_CALL(*app_, is_perform_interaction_active()).WillOnce(Return(false)); - EXPECT_CALL(*app_, performinteraction_choice_set_map()).Times(0); + EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) + .WillOnce(Return(choice_set_id)); + EXPECT_CALL(*app_, is_perform_interaction_active()).WillOnce(Return(false)); + EXPECT_CALL(*app_, performinteraction_choice_set_map()).Times(0); - EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) - .WillOnce(Return(invalid_choice_set_id)); + EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) + .WillOnce(Return(invalid_choice_set_id)); - EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); - EXPECT_CALL(*app_, RemoveChoiceSet(kChoiceSetId)); - EXPECT_CALL(*app_, UpdateHash()); + EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); + EXPECT_CALL(*app_, RemoveChoiceSet(kChoiceSetId)); + EXPECT_CALL(*app_, UpdateHash()); + } + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); DeleteInteractionChoiceSetRequestPtr command = CreateCommand(message_); @@ -229,21 +232,28 @@ TEST_F(DeleteInteractionChoiceSetRequestTest, Run_SendVrDeleteCommand_SUCCESS) { EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillRepeatedly(Return(app_)); - InSequence seq; + { + InSequence seq; - EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) - .WillOnce(Return(choice_set_id)); - EXPECT_CALL(*app_, is_perform_interaction_active()).WillOnce(Return(false)); - EXPECT_CALL(*app_, performinteraction_choice_set_map()).Times(0); + EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) + .WillOnce(Return(choice_set_id)); + EXPECT_CALL(*app_, is_perform_interaction_active()).WillOnce(Return(false)); + EXPECT_CALL(*app_, performinteraction_choice_set_map()).Times(0); - EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) - .WillOnce(Return(choice_set_id)); + EXPECT_CALL(*app_, FindChoiceSet(kChoiceSetId)) + .WillOnce(Return(choice_set_id)); - EXPECT_CALL(*app_, app_id()) - .WillOnce(Return(kConnectionKey)) - .WillOnce(Return(kConnectionKey)); - EXPECT_CALL(*app_, RemoveChoiceSet(kChoiceSetId)); - EXPECT_CALL(*app_, UpdateHash()); + EXPECT_CALL(*app_, app_id()) + .WillOnce(Return(kConnectionKey)) + .WillOnce(Return(kConnectionKey)); + EXPECT_CALL(*app_, RemoveChoiceSet(kChoiceSetId)); + EXPECT_CALL(*app_, UpdateHash()); + } + EXPECT_CALL(app_mngr_, GetRPCService()) + .Times(2) + .WillRepeatedly(ReturnRef(rpc_service_)); + EXPECT_CALL(rpc_service_, ManageHMICommand(_)).WillOnce(Return(true)); + EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)); DeleteInteractionChoiceSetRequestPtr command = CreateCommand(message_); diff --git a/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc b/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc index 353e6e2310..39d54aa442 100644 --- a/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_sub_menu_test.cc @@ -217,7 +217,11 @@ TEST_F(DeleteSubMenuRequestTest, Run_SendHMIRequest_SUCCESS) { EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); EXPECT_CALL(app_mngr_, GetNextHMICorrelationID()) .WillOnce(Return(kCorrelationId)); - + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( + rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_DeleteSubMenu))) + .WillOnce(Return(true)); command_->Run(); } @@ -262,14 +266,26 @@ TEST_F(DeleteSubMenuRequestTest, OnEvent_DeleteSubmenu_SUCCESS) { EXPECT_CALL(*app_, commands_map()).WillOnce(Return(accessor_)); EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); EXPECT_CALL(*app_, get_grammar_id()).WillOnce(Return(kGrammarId)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( + rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::VR_DeleteCommand))) + .WillOnce(Return(true)); EXPECT_CALL(*app_, commands_map()).WillOnce(Return(accessor_)); EXPECT_CALL(*app_, app_id()).WillOnce(Return(kConnectionKey)); EXPECT_CALL(*app_, RemoveCommand(_)).WillOnce(DeleteCommand(&commands_map_)); + EXPECT_CALL( + rpc_service_, + ManageHMICommand(HMIResultCodeIs(hmi_apis::FunctionID::UI_DeleteCommand))) + .WillOnce(Return(true)); EXPECT_CALL(*app_, RemoveSubMenu(_)); + EXPECT_CALL( + rpc_service_, + ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), + am::commands::Command::ORIGIN_SDL)); EXPECT_CALL(*app_, UpdateHash()); - DeleteSubMenuRequestPtr command = CreateCommand(message_); @@ -304,11 +320,14 @@ TEST_F(DeleteSubMenuRequestTest, std::make_pair(0, &((*message_)[am::strings::msg_params]))); EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(app_)); - EXPECT_CALL(app_mngr_, GetRPCService()).Times(0); EXPECT_CALL(rpc_service_, ManageHMICommand(_)).Times(0); EXPECT_CALL(*app_, commands_map()).Times(2).WillRepeatedly(Return(accessor_)); EXPECT_CALL(*app_, RemoveCommand(_)).Times(0); - + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( + rpc_service_, + ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), + am::commands::Command::ORIGIN_SDL)); command_->on_event(event); } @@ -328,11 +347,14 @@ TEST_F(DeleteSubMenuRequestTest, std::make_pair(0, &((*message_)[am::strings::msg_params]))); EXPECT_CALL(app_mngr_, application(_)).WillRepeatedly(Return(app_)); - EXPECT_CALL(app_mngr_, GetRPCService()).Times(0); EXPECT_CALL(rpc_service_, ManageHMICommand(_)).Times(0); EXPECT_CALL(*app_, commands_map()).Times(2).WillRepeatedly(Return(accessor_)); EXPECT_CALL(*app_, RemoveCommand(_)).Times(0); - + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( + rpc_service_, + ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), + am::commands::Command::ORIGIN_SDL)); command_->on_event(event); } diff --git a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc index ace2b0f628..a08a43c97e 100644 --- a/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc +++ b/src/components/application_manager/test/commands/mobile/on_button_notification_commands_test.cc @@ -132,8 +132,7 @@ TYPED_TEST(OnButtonNotificationCommandsTest, SharedPtr command( this->template CreateCommand(notification_msg)); - EXPECT_CALL(this->app_mngr_, GetRPCService()) - .WillOnce(ReturnRef(this->rpc_service_)); + EXPECT_CALL(this->app_mngr_, GetRPCService()).Times(0); EXPECT_CALL(this->rpc_service_, SendMessageToMobile(_, _)).Times(0); command->Run(); diff --git a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc index 3727e03d6b..fab59fbed2 100644 --- a/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc +++ b/src/components/application_manager/test/commands/mobile/perform_audio_pass_thru_test.cc @@ -394,7 +394,7 @@ TEST_F(PerformAudioPassThruRequestTest, .WillByDefault(Return(am::HmiInterfaces::HMI_INTERFACE_TTS)); ON_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE)); - EXPECT_CALL(app_mngr_, GetRPCService()).Times(0); + ON_CALL(app_mngr_, GetRPCService()); EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(0); CallOnEvent on_event_caller(*command_sptr_, event); diff --git a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc index 6f7ab7d149..22c6dd77ab 100644 --- a/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/register_app_interface_request_test.cc @@ -188,6 +188,7 @@ class RegisterAppInterfaceRequestTest mock_hmi_interfaces_, GetInterfaceFromFunction(hmi_apis::FunctionID::UI_ChangeRegistration)) .WillByDefault(Return(am::HmiInterfaces::HMI_INTERFACE_UI)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); } void SetCommonExpectionsOnSwitchedApplication( @@ -195,28 +196,28 @@ class RegisterAppInterfaceRequestTest EXPECT_CALL(mock_policy_handler_, AddApplication(_, _)).Times(0); EXPECT_CALL( - app_mngr_, + rpc_service_, ManageMobileCommand(MobileResultCodeIs(response_result_code), _)); - EXPECT_CALL(app_mngr_, + EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::BasicCommunication_OnAppRegistered))) .Times(0); - EXPECT_CALL(app_mngr_, + EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::Buttons_OnButtonSubscription))) .Times(0); - EXPECT_CALL(app_mngr_, + EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::UI_ChangeRegistration))).Times(0); - EXPECT_CALL(app_mngr_, + EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::TTS_ChangeRegistration))).Times(0); - EXPECT_CALL(app_mngr_, + EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::VR_ChangeRegistration))).Times(0); diff --git a/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc b/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc index 85d8594d7b..d450881af3 100644 --- a/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc +++ b/src/components/application_manager/test/commands/mobile/reset_global_properties_test.cc @@ -95,6 +95,7 @@ class ResetGlobalPropertiesRequestTest .WillByDefault(Return(mock_app_)); ON_CALL(app_mngr_, GetNextHMICorrelationID()) .WillByDefault(Return(kCorrelationId)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); } MessageSharedPtr msg_; @@ -110,7 +111,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidApp_UNSUCCESS) { EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(invalid_app)); MessageSharedPtr command_result; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) @@ -172,7 +172,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidVrHelp_UNSUCCESS) { EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) .WillOnce(Return(vr_help)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(_)).Times(0); command_->Run(); @@ -240,8 +239,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) { EXPECT_CALL(*mock_app_, timeout_prompt()) .WillOnce(Return(so_help_prompt.get())); - EXPECT_CALL(app_mngr_, GetRPCService()) - .WillRepeatedly(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::UI_SetGlobalProperties))) @@ -256,7 +253,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_SUCCESS) { TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidEventId_UNSUCCESS) { Event event(hmi_apis::FunctionID::INVALID_ENUM); - EXPECT_CALL(app_mngr_, GetRPCService()).Times(0); + // EXPECT_CALL(app_mngr_, GetRPCService()).Times(0); EXPECT_CALL(rpc_service_, ManageMobileCommand(_, _)).Times(0); command_->on_event(event); } @@ -280,11 +277,14 @@ TEST_F(ResetGlobalPropertiesRequestTest, smart_objects::SmartType_Map); EXPECT_CALL(mock_message_helper_, CreateAppVrHelp(_)) .WillOnce(Return(vr_help)); + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::UI_SetGlobalProperties))) + .WillOnce(Return(true)); command_->Run(); event.set_smart_object(*msg_); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::eType::SUCCESS), @@ -323,14 +323,20 @@ TEST_F(ResetGlobalPropertiesRequestTest, (*ui_msg)[am::strings::params][am::strings::correlation_id] = kCorrelationId; (*ui_msg)[am::strings::params][am::hmi_response::code] = hmi_apis::Common_Result::eType::SUCCESS; - + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::UI_SetGlobalProperties))) + .WillOnce(Return(true)); + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::TTS_SetGlobalProperties))) + .WillOnce(Return(true)); Event ui_event(hmi_apis::FunctionID::UI_SetGlobalProperties); ui_event.set_smart_object(*ui_msg); command_->Run(); command_->on_event(ui_event); event.set_smart_object(*msg_); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::WARNINGS), @@ -359,7 +365,10 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { EXPECT_CALL(*mock_app_, reset_vr_help()); EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::UI_SetGlobalProperties))) + .WillOnce(Return(true)); smart_objects::SmartObjectSPtr vr_help = ::utils::MakeShared( smart_objects::SmartType_Map); @@ -371,7 +380,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { ResetGlobalPropertiesRequestPtr command = CreateCommand(msg_); command->Run(); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::eType::SUCCESS), @@ -407,12 +415,10 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::UI_SetGlobalProperties))) .WillOnce(Return(true)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::TTS_SetGlobalProperties))) @@ -441,7 +447,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(mock_message_helper_, CreateNegativeResponse(_, _, _, _)) .WillOnce(Return(response)); const std::string info = "TTS component does not respond"; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand( @@ -475,8 +480,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(app_mngr_, GetRPCService()) - .WillRepeatedly(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::UI_SetGlobalProperties))) @@ -507,7 +510,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, .WillOnce(Return(response)); const std::string info = "UI component does not respond"; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand( @@ -542,8 +544,6 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(*mock_app_, set_reset_global_properties_active(true)); - EXPECT_CALL(app_mngr_, GetRPCService()) - .WillRepeatedly(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageHMICommand(HMIResultCodeIs( hmi_apis::FunctionID::UI_SetGlobalProperties))) @@ -562,7 +562,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, mobile_apis::Result::GENERIC_ERROR; EXPECT_CALL(mock_message_helper_, CreateNegativeResponse(_, _, _, _)) .WillOnce(Return(response)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( rpc_service_, ManageMobileCommand( diff --git a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc index 07978a24f2..0cff846f31 100644 --- a/src/components/application_manager/test/commands/mobile/send_location_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/send_location_request_test.cc @@ -355,7 +355,11 @@ TEST_F(SendLocationRequestTest, OnEvent_Success) { MockAppPtr app(CreateMockApp()); EXPECT_CALL(app_mngr_, application(kConnectionKey)) .WillRepeatedly(Return(app)); - + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); + EXPECT_CALL( + rpc_service_, + ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), _)) + .WillOnce(Return(false)); command_->on_event(event); } diff --git a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc index 897ce752c2..90703c8eb0 100644 --- a/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_global_properties_test.cc @@ -183,7 +183,6 @@ class SetGlobalPropertiesRequestTest } void ExpectInvalidData() { - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), @@ -220,6 +219,7 @@ class SetGlobalPropertiesRequestTest ON_CALL(mock_hmi_interfaces_, GetInterfaceState(am::HmiInterfaces::HMI_INTERFACE_UI)) .WillByDefault(Return(am::HmiInterfaces::STATE_AVAILABLE)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); } void ResultCommandExpectations(MessageSharedPtr msg, @@ -292,13 +292,19 @@ TEST_F(SetGlobalPropertiesRequestTest, ON_CALL(mock_message_helper_, VerifyImage(_, _, _)) .WillByDefault(Return(mobile_apis::Result::SUCCESS)); - EXPECT_CALL( mock_message_helper_, VerifyTtsFiles( (*msg_vr)[am::strings::msg_params][am::strings::help_prompt], _, _)) .WillOnce(Return(mobile_apis::Result::SUCCESS)); - + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::UI_SetGlobalProperties))) + .WillOnce(Return(true)); + EXPECT_CALL(rpc_service_, + ManageHMICommand(HMIResultCodeIs( + hmi_apis::FunctionID::TTS_SetGlobalProperties))) + .WillOnce(Return(true)); (*msg_vr)[am::strings::params][am::hmi_response::code] = hmi_apis::Common_Result::SUCCESS; Event event_vr(hmi_apis::FunctionID::TTS_SetGlobalProperties); @@ -308,7 +314,6 @@ TEST_F(SetGlobalPropertiesRequestTest, command->on_event(event_vr); MessageSharedPtr ui_command_result; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) @@ -333,7 +338,6 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_SUCCESS_Expect_MessageNotSend) { MockAppPtr mock_app(CreateMockApp()); ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) @@ -363,7 +367,6 @@ TEST_F(SetGlobalPropertiesRequestTest, .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); MessageSharedPtr response_to_mobile; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) @@ -626,7 +629,6 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_VRCouldNotGenerate_INVALID_DATA) { SharedPtr command( CreateCommand(msg)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), @@ -1081,7 +1083,6 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_UIAndSuccessResultCode_SUCCESS) { EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) .WillOnce(Return(true)); @@ -1114,7 +1115,6 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_UIAndWarningResultCode_SUCCESS) { EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) .WillOnce(Return(true)); @@ -1186,7 +1186,6 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEventTTSSetupHelper(msg, command); EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) .WillOnce(Return(true)); @@ -1222,7 +1221,6 @@ TEST_F(SetGlobalPropertiesRequestTest, .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); MessageSharedPtr ui_command_result; - ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) diff --git a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc index 06dd81e879..c2e776ca1e 100644 --- a/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc +++ b/src/components/application_manager/test/commands/mobile/simple_response_commands_test.cc @@ -192,6 +192,7 @@ TEST_F(ScrollableMessageResponseTest, Run_SUCCESS) { SharedPtr command( CreateCommand(message)); EXPECT_CALL(app_mngr_, application(_)).WillOnce(Return(app)); + ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(*app, UnsubscribeFromSoftButtons(_)); command->Run(); } diff --git a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc index 9b738e0f56..453bcc06a5 100644 --- a/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/subscribe_button_request_test.cc @@ -184,8 +184,11 @@ TEST_F(SubscribeButtonRequestTest, Run_SUCCESS) { EXPECT_CALL(rpc_service_, ManageHMICommand(_)) .WillOnce(DoAll(SaveArg<0>(&hmi_result_msg), Return(true))); - MessageSharedPtr mobile_result_msg( - CatchMobileCommandResult(CallRun(*command))); + MessageSharedPtr mobile_result_msg; + EXPECT_CALL(this->rpc_service_, ManageMobileCommand(_, _)) + .WillOnce(DoAll(SaveArg<0>(&mobile_result_msg), Return(true))); + ASSERT_TRUE(command->Init()); + command->Run(); EXPECT_EQ(hmi_apis::FunctionID::Buttons_OnButtonSubscription, static_cast( -- cgit v1.2.1