diff options
Diffstat (limited to 'src/components/application_manager/test/commands/mobile')
26 files changed, 70 insertions, 70 deletions
diff --git a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc index 6319464e81..800df613e0 100644 --- a/src/components/application_manager/test/commands/mobile/add_command_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/add_command_request_test.cc @@ -214,7 +214,7 @@ class AddCommandRequestTest EXPECT_CALL( rpc_service_, ManageMobileCommand(response, - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); utils::SharedPtr<CommandRequestImpl> base_class_request = static_cast<utils::SharedPtr<CommandRequestImpl> >(request_ptr); base_class_request->onTimeOut(); @@ -1060,7 +1060,7 @@ TEST_F(AddCommandRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( - response, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + response, am::commands::Command::CommandOrigin::SOURCE_SDL)); utils::SharedPtr<CommandRequestImpl> base_class_request = static_cast<utils::SharedPtr<CommandRequestImpl> >( CreateCommand<AddCommandRequest>(msg_)); @@ -1112,7 +1112,7 @@ TEST_F(AddCommandRequestTest, OnTimeOut_AppRemoveCommandCalled) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( - response, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + response, am::commands::Command::CommandOrigin::SOURCE_SDL)); utils::SharedPtr<CommandRequestImpl> base_class_request = static_cast<utils::SharedPtr<CommandRequestImpl> >(request_ptr); base_class_request->onTimeOut(); diff --git a/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc b/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc index 86584d0ea9..9ed5e1dc4c 100644 --- a/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/add_sub_menu_request_test.cc @@ -94,7 +94,7 @@ TEST_F(AddSubMenuRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->Init(); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc index 6ccdf855c1..f018def19c 100644 --- a/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/alert_maneuver_request_test.cc @@ -93,7 +93,7 @@ class AlertManeuverRequestTest ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( - _, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + _, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event); 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 58fef38fbc..753f9906a2 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 @@ -167,7 +167,7 @@ class AlertRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(code), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); } void ExpectManageHmiCommandTTSAndUI() { @@ -208,7 +208,7 @@ TEST_F(AlertRequestTest, OnTimeout_GENERIC_ERROR) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->onTimeOut(); @@ -254,7 +254,7 @@ TEST_F(AlertRequestTest, OnEvent_UI_HmiSendSuccess_UNSUPPORTED_RESOURCE) { MessageSharedPtr ui_command_result; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/change_registration_test.cc b/src/components/application_manager/test/commands/mobile/change_registration_test.cc index fcc070625f..1058ff6888 100644 --- a/src/components/application_manager/test/commands/mobile/change_registration_test.cc +++ b/src/components/application_manager/test/commands/mobile/change_registration_test.cc @@ -194,7 +194,7 @@ class ChangeRegistrationRequestTest ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( - _, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + _, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_ui); @@ -356,7 +356,7 @@ TEST_F(ChangeRegistrationRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_ui); @@ -405,7 +405,7 @@ TEST_F(ChangeRegistrationRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->Run(); @@ -549,7 +549,7 @@ TEST_F(ChangeRegistrationRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_vr); 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 223070b6af..1cc3d9f055 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 @@ -183,7 +183,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnTimeout_GENERIC_ERROR) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); req_vr->onTimeOut(); @@ -240,7 +240,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, OnEvent_VR_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); req_vr->on_event(event); @@ -623,7 +623,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::GENERIC_ERROR), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)); command_->onTimeOut(); @@ -828,7 +828,7 @@ TEST_F(CreateInteractionChoiceSetRequestTest, Run_ErrorFromHmiFalse_UNSUCCESS) { EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::GENERIC_ERROR), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); EXPECT_CALL(app_mngr_, updateRequestTimeout(_, _, _)).Times(0); EXPECT_CALL(app_mngr_, TerminateRequest(_, _, _)); event.set_smart_object(*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 c6daa1c779..80b099e77e 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 @@ -186,7 +186,7 @@ TEST_F(DeleteCommandRequestTest, MessageSharedPtr vr_command_result; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); command->on_event(event_vr); diff --git a/src/components/application_manager/test/commands/mobile/delete_file_test.cc b/src/components/application_manager/test/commands/mobile/delete_file_test.cc index b263bb9718..b25264f191 100644 --- a/src/components/application_manager/test/commands/mobile/delete_file_test.cc +++ b/src/components/application_manager/test/commands/mobile/delete_file_test.cc @@ -122,7 +122,7 @@ TEST_F(DeleteFileRequestTest, Run_InvalidApp_UNSUCCESS) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)); EXPECT_CALL(app_mngr_, get_settings()).Times(0); command_->Run(); @@ -147,7 +147,7 @@ TEST_F(DeleteFileRequestTest, Run_HMILevelNone_UNSUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(CheckMessageResultCode(mobile_apis::Result::REJECTED), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); command_->Run(); } @@ -181,7 +181,7 @@ TEST_F(DeleteFileRequestTest, Run_ValidFileName_SUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(CheckMessageResultCode(mobile_apis::Result::SUCCESS), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); command_->Run(); } @@ -203,7 +203,7 @@ TEST_F(DeleteFileRequestTest, Run_InvalidFile_UNSUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::REJECTED), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); command_->Run(); } 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 bb1a5c168b..ee70f32155 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 @@ -126,7 +126,7 @@ TEST_F(DeleteInteractionChoiceSetRequestTest, Run_InvalidApp_UNSUCCESS) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)); EXPECT_CALL(*app_, FindChoiceSet(_)).Times(0); command_->Run(); } @@ -145,7 +145,7 @@ TEST_F(DeleteInteractionChoiceSetRequestTest, Run_FindChoiceSetFail_UNSUCCESS) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)); command_->Run(); } @@ -175,7 +175,7 @@ TEST_F(DeleteInteractionChoiceSetRequestTest, Run_ChoiceSetInUse_SUCCESS) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)); + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)); command_->Run(); } 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 39d54aa442..098d6c980c 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 @@ -153,7 +153,7 @@ TEST_F(DeleteSubMenuRequestTest, DISABLED_OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); @@ -182,7 +182,7 @@ TEST_F(DeleteSubMenuRequestTest, Run_InvalidApp_UNSUCCESS) { rpc_service_, ManageMobileCommand(CheckMessageResultCode( mobile_apis::Result::APPLICATION_NOT_REGISTERED), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); EXPECT_CALL(*app_, FindSubMenu(_)).Times(0); command_->Run(); } @@ -199,7 +199,7 @@ TEST_F(DeleteSubMenuRequestTest, Run_FindSubMenuFalse_UNSUCCESS) { EXPECT_CALL(rpc_service_, ManageMobileCommand( CheckMessageResultCode(mobile_apis::Result::INVALID_ID), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); EXPECT_CALL(*app_, app_id()).Times(0); command_->Run(); } @@ -284,7 +284,7 @@ TEST_F(DeleteSubMenuRequestTest, OnEvent_DeleteSubmenu_SUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); EXPECT_CALL(*app_, UpdateHash()); DeleteSubMenuRequestPtr command = CreateCommand<DeleteSubMenuRequest>(message_); @@ -327,7 +327,7 @@ TEST_F(DeleteSubMenuRequestTest, EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->on_event(event); } @@ -354,7 +354,7 @@ TEST_F(DeleteSubMenuRequestTest, EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->on_event(event); } diff --git a/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc b/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc index c2fe310d9a..8c8689affd 100644 --- a/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/end_audio_pass_thru_request_test.cc @@ -90,7 +90,7 @@ TEST_F(EndAudioPassThruRequestTest, OnEvent_UI_UNSUPPORTED_RESOUCRE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); MockAppPtr app(CreateMockApp()); 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 fab59fbed2..ef7a4f8be4 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 @@ -182,7 +182,7 @@ TEST_F(PerformAudioPassThruRequestTest, OnTimeout_GENERIC_ERROR) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); command->onTimeOut(); @@ -246,7 +246,7 @@ TEST_F(PerformAudioPassThruRequestTest, EXPECT_CALL(rpc_service_, ManageHMICommand(_)).WillRepeatedly(Return(true)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); EXPECT_CALL(mock_message_helper_, @@ -823,7 +823,7 @@ TEST_F(PerformAudioPassThruRequestTest, // For setting current_state_ -> kCompleted ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)); + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)); command_sptr_->SendResponse(true, am::mobile_api::Result::SUCCESS); EXPECT_CALL( diff --git a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc index cc54b5b509..840649c549 100644 --- a/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc +++ b/src/components/application_manager/test/commands/mobile/perform_interaction_test.cc @@ -137,7 +137,7 @@ TEST_F(PerformInteractionRequestTest, OnTimeout_VR_GENERIC_ERROR) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); command->onTimeOut(); @@ -193,7 +193,7 @@ TEST_F(PerformInteractionRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_vr); @@ -242,7 +242,7 @@ TEST_F(PerformInteractionRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_vr); diff --git a/src/components/application_manager/test/commands/mobile/put_file_test.cc b/src/components/application_manager/test/commands/mobile/put_file_test.cc index 2406d094c0..c1f9df80ba 100644 --- a/src/components/application_manager/test/commands/mobile/put_file_test.cc +++ b/src/components/application_manager/test/commands/mobile/put_file_test.cc @@ -118,7 +118,7 @@ class PutFileRequestTest EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(code), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); } MessageSharedPtr msg_; 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 22c6dd77ab..e31f29202e 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 @@ -300,7 +300,7 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) { hmi_apis::FunctionID::Buttons_OnButtonSubscription))) .WillOnce(Return(true)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); command_->Run(); } @@ -413,7 +413,7 @@ TEST_F(RegisterAppInterfaceRequestTest, HMIResultCodeIs(hmi_apis::FunctionID::UI_ChangeRegistration))) .WillOnce(Return(true)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .Times(2); command_->Run(); 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 d450881af3..78f081464f 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 @@ -113,7 +113,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, Run_InvalidApp_UNSUCCESS) { MessageSharedPtr command_result; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&command_result), Return(true))); command_->Run(); @@ -288,7 +288,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::eType::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->on_event(event); } @@ -340,7 +340,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::WARNINGS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->on_event(event); } @@ -383,7 +383,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, OnEvent_InvalidApp_NoHashUpdate) { EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::eType::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); Event event(hmi_apis::FunctionID::UI_SetGlobalProperties); event.set_smart_object(*msg_); @@ -451,7 +451,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, rpc_service_, ManageMobileCommand( MobileResponseIs(mobile_apis::Result::GENERIC_ERROR, info, false), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command->onTimeOut(); } @@ -514,7 +514,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, rpc_service_, ManageMobileCommand( MobileResponseIs(mobile_apis::Result::GENERIC_ERROR, info, false), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->onTimeOut(); } @@ -567,7 +567,7 @@ TEST_F(ResetGlobalPropertiesRequestTest, rpc_service_, ManageMobileCommand( MobileResponseIs(mobile_apis::Result::GENERIC_ERROR, info, false), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command_->onTimeOut(); } diff --git a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc index 73f251d22f..e15054dbfb 100644 --- a/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc +++ b/src/components/application_manager/test/commands/mobile/scrollable_message_test.cc @@ -154,7 +154,7 @@ TEST_F(ScrollableMessageRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc b/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc index 599952f27d..933cfa18a8 100644 --- a/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc +++ b/src/components/application_manager/test/commands/mobile/send_haptic_data_test.cc @@ -132,7 +132,7 @@ TEST_F(SendHapticDataRequestTest, OnEvent_SUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::SUCCESS), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); (*msg_)[am::strings::msg_params] = 0; (*msg_)[am::strings::params][am::hmi_response::code] = diff --git a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc index 5ed7834238..5ff01d0b74 100644 --- a/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_app_icon_test.cc @@ -147,7 +147,7 @@ TEST_F(SetAppIconRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); req_vr->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc index 997ffba269..67f35e4d1e 100644 --- a/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_display_layout_test.cc @@ -159,7 +159,7 @@ TEST_F(SetDisplayLayoutRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); @@ -179,7 +179,7 @@ TEST_F(SetDisplayLayoutRequestTest, Run_InvalidApp_UNSUCCESS) { EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_result::APPLICATION_NOT_REGISTERED), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); command->Run(); } @@ -245,7 +245,7 @@ TEST_F(SetDisplayLayoutRequestTest, OnEvent_SUCCESS) { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_result::SUCCESS), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); CommandPtr command(CreateCommand<SetDisplayLayoutRequest>(msg)); 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 90703c8eb0..57d3ec09de 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 @@ -186,7 +186,7 @@ class SetGlobalPropertiesRequestTest EXPECT_CALL(rpc_service_, ManageMobileCommand( MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); } void ExpectVerifyImageVrHelpSuccess(SmartObject& smart_obj) { @@ -316,7 +316,7 @@ TEST_F(SetGlobalPropertiesRequestTest, MessageSharedPtr ui_command_result; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); @@ -340,7 +340,7 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_SUCCESS_Expect_MessageNotSend) { ON_CALL(app_mngr_, application(_)).WillByDefault(Return(mock_app)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .Times(0); command->on_event(event); } @@ -369,7 +369,7 @@ TEST_F(SetGlobalPropertiesRequestTest, MessageSharedPtr response_to_mobile; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->Run(); @@ -632,7 +632,7 @@ TEST_F(SetGlobalPropertiesRequestTest, Run_VRCouldNotGenerate_INVALID_DATA) { EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(mobile_apis::Result::INVALID_DATA), - am::commands::Command::ORIGIN_SDL)); + am::commands::Command::SOURCE_SDL)); command->Run(); } @@ -1084,7 +1084,7 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_UIAndSuccessResultCode_SUCCESS) { EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .WillOnce(Return(true)); command->on_event(event); @@ -1116,7 +1116,7 @@ TEST_F(SetGlobalPropertiesRequestTest, OnEvent_UIAndWarningResultCode_SUCCESS) { EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .WillOnce(Return(true)); command->on_event(event); @@ -1187,7 +1187,7 @@ TEST_F(SetGlobalPropertiesRequestTest, EXPECT_CALL(mock_hmi_interfaces_, GetInterfaceState(_)) .WillRepeatedly(Return(am::HmiInterfaces::STATE_NOT_AVAILABLE)); EXPECT_CALL(rpc_service_, - ManageMobileCommand(_, am::commands::Command::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::SOURCE_SDL)) .WillOnce(Return(true)); EXPECT_CALL(app_mngr_, application(kConnectionKey)) @@ -1223,7 +1223,7 @@ TEST_F(SetGlobalPropertiesRequestTest, MessageSharedPtr ui_command_result; EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); EXPECT_CALL(app_mngr_, application(kConnectionKey)) diff --git a/src/components/application_manager/test/commands/mobile/set_media_clock_timer_test.cc b/src/components/application_manager/test/commands/mobile/set_media_clock_timer_test.cc index 49060d2624..2c54ce938b 100644 --- a/src/components/application_manager/test/commands/mobile/set_media_clock_timer_test.cc +++ b/src/components/application_manager/test/commands/mobile/set_media_clock_timer_test.cc @@ -137,7 +137,7 @@ TEST_F(SetMediaClockRequestTest, ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/show_test.cc b/src/components/application_manager/test/commands/mobile/show_test.cc index 7dcca02c42..29bf33c85d 100644 --- a/src/components/application_manager/test/commands/mobile/show_test.cc +++ b/src/components/application_manager/test/commands/mobile/show_test.cc @@ -233,7 +233,7 @@ TEST_F(ShowRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&vr_command_result), Return(true))); command->on_event(event); @@ -706,7 +706,7 @@ TEST_F(ShowRequestTest, Run_MainField1_MetadataTagWithNoFieldData) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/slider_test.cc b/src/components/application_manager/test/commands/mobile/slider_test.cc index 8f0dd36436..40cf3fc5f1 100644 --- a/src/components/application_manager/test/commands/mobile/slider_test.cc +++ b/src/components/application_manager/test/commands/mobile/slider_test.cc @@ -127,7 +127,7 @@ class SliderRequestTest EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(code), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); } sync_primitives::Lock lock_; @@ -162,7 +162,7 @@ TEST_F(SliderRequestTest, OnEvent_UI_UNSUPPORTED_RESOURCE) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&ui_command_result), Return(true))); command->on_event(event); diff --git a/src/components/application_manager/test/commands/mobile/speak_request_test.cc b/src/components/application_manager/test/commands/mobile/speak_request_test.cc index fc110b6fb3..ef053d0a67 100644 --- a/src/components/application_manager/test/commands/mobile/speak_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/speak_request_test.cc @@ -110,7 +110,7 @@ class SpeakRequestTest : public CommandRequestTest<CommandsTestMocks::kIsNice> { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL(rpc_service_, ManageMobileCommand( - _, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + _, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_tts); @@ -146,7 +146,7 @@ TEST_F(SpeakRequestTest, OnEvent_SUCCESS_Expect_true) { ON_CALL(app_mngr_, GetRPCService()).WillByDefault(ReturnRef(rpc_service_)); EXPECT_CALL( rpc_service_, - ManageMobileCommand(_, am::commands::Command::CommandOrigin::ORIGIN_SDL)) + ManageMobileCommand(_, am::commands::Command::CommandOrigin::SOURCE_SDL)) .WillOnce(DoAll(SaveArg<0>(&response_to_mobile), Return(true))); command->on_event(event_tts); diff --git a/src/components/application_manager/test/commands/mobile/system_request_test.cc b/src/components/application_manager/test/commands/mobile/system_request_test.cc index 87726526d1..aa332ab37a 100644 --- a/src/components/application_manager/test/commands/mobile/system_request_test.cc +++ b/src/components/application_manager/test/commands/mobile/system_request_test.cc @@ -117,7 +117,7 @@ class SystemRequestTest EXPECT_CALL( rpc_service_, ManageMobileCommand(MobileResultCodeIs(code), - am::commands::Command::CommandOrigin::ORIGIN_SDL)); + am::commands::Command::CommandOrigin::SOURCE_SDL)); } MockAppPtr mock_app_; |