From aead25866b0e74b4023dee2e2073d910e3b41639 Mon Sep 17 00:00:00 2001 From: LitvinenkoIra Date: Tue, 27 Aug 2019 16:18:34 +0300 Subject: [PATCH] Fix function name --- .../include/rc_rpc_plugin/rc_capabilities_manager_impl.h | 2 +- .../rc_rpc_plugin/src/commands/mobile/button_press_request.cc | 2 +- .../mobile/get_interior_vehicle_data_consent_request.cc | 2 +- .../src/commands/mobile/get_interior_vehicle_data_request.cc | 2 +- .../mobile/release_interior_vehicle_data_module_request.cc | 2 +- .../src/commands/mobile/set_interior_vehicle_data_request.cc | 2 +- .../rc_rpc_plugin/src/rc_capabilities_manager_impl.cc | 2 +- .../rc_rpc_plugin/test/commands/button_press_request_test.cc | 2 +- .../commands/get_interior_vehicle_data_consent_request_test.cc | 2 +- .../test/commands/get_interior_vehicle_data_request_test.cc | 2 +- .../test/commands/rc_get_interior_vehicle_data_consent_test.cc | 2 +- .../test/commands/set_interior_vehicle_data_request_test.cc | 2 +- .../include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h index e165f92c7b0..464245129a5 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/include/rc_rpc_plugin/rc_capabilities_manager_impl.h @@ -47,7 +47,7 @@ class RCCapabilitiesManagerImpl : public RCCapabilitiesManager { bool CheckButtonName(const std::string& module_type, const std::string& button_name) const FINAL; - bool CheckIfModuleExistInCapabilities(const ModuleUid& module) const FINAL; + bool CheckIfModuleExistsInCapabilities(const ModuleUid& module) const FINAL; ModuleTypeCapability GetModuleDataCapabilities( const smart_objects::SmartObject& module_data, diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc index 31bf1764050..01705741b0a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/button_press_request.cc @@ -87,7 +87,7 @@ void ButtonPressRequest::Execute() { const std::string module_id = ModuleId(); const ModuleUid module(module_type, module_id); const bool is_module_exists = - rc_capabilities_manager_.CheckIfModuleExistInCapabilities(module); + rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module); const bool button_valid_by_caps = is_module_exists && diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc index 7f1603f4699..dc0d86011c4 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_consent_request.cc @@ -79,7 +79,7 @@ void GetInteriorVehicleDataConsentRequest::Execute() { for (const auto module_id : *(msg_params[message_params::kModuleIds].asArray())) { const ModuleUid module(module_type, module_id.asString()); - if (!rc_capabilities_manager_.CheckIfModuleExistInCapabilities(module)) { + if (!rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) { LOG4CXX_WARN(logger_, "Accessing not supported module: " << module_type << " " << module_id.asString()); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc index 156d251eac9..10f6303ac98 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/get_interior_vehicle_data_request.cc @@ -61,7 +61,7 @@ bool GetInteriorVehicleDataRequest::ProcessCapabilities() { const std::string module_id = ModuleId(); const ModuleUid module(module_type, module_id); if (rc_capabilities && - !rc_capabilities_manager_.CheckIfModuleExistInCapabilities(module)) { + !rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) { LOG4CXX_WARN( logger_, "Accessing not supported module: " << module_type << " " << module_id); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc index 452b9910a53..465e2777009 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/release_interior_vehicle_data_module_request.cc @@ -98,7 +98,7 @@ bool ReleaseInteriorVehicleDataModuleRequest::ProcessCapabilities() { const std::string module_id = ModuleId(); const ModuleUid module(module_type, module_id); if (rc_capabilities && - !rc_capabilities_manager_.CheckIfModuleExistInCapabilities(module)) { + !rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) { LOG4CXX_WARN( logger_, "Accessing not supported module: " << module_type << " " << module_id); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc index 68be36b7dd1..0598102335a 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/commands/mobile/set_interior_vehicle_data_request.cc @@ -117,7 +117,7 @@ void SetInteriorVehicleDataRequest::Execute() { if (ClearUnrelatedModuleData(module_type, module_data)) { const std::string module_id = ModuleId(); const ModuleUid module(module_type, module_id); - if (!rc_capabilities_manager_.CheckIfModuleExistInCapabilities(module)) { + if (!rc_capabilities_manager_.CheckIfModuleExistsInCapabilities(module)) { LOG4CXX_WARN(logger_, "Accessing not supported module: " << module_type << " " << module_id); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc index fd77eafca96..899d69df267 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/rc_capabilities_manager_impl.cc @@ -162,7 +162,7 @@ const bool RCCapabilitiesManagerImpl::CheckModuleIdWithCapabilities( rc_capabilities[mapping(module.first)], module.second); } -bool RCCapabilitiesManagerImpl::CheckIfModuleExistInCapabilities( +bool RCCapabilitiesManagerImpl::CheckIfModuleExistsInCapabilities( const ModuleUid& module) const { LOG4CXX_AUTO_TRACE(logger_); auto rc_capabilities = *(hmi_capabilities_.rc_capability()); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc index 4eebe23f849..fb8de0bb9c0 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/button_press_request_test.cc @@ -106,7 +106,7 @@ class ButtonPressRequestTest .WillByDefault(Return(true)); ON_CALL(mock_rc_capabilities_manager_, CheckButtonName(_, _)) .WillByDefault(Return(true)); - ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistInCapabilities(_)) + ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_)) .WillByDefault(Return(true)); ON_CALL(mock_rc_capabilities_manager_, CheckIfButtonExistInRCCaps(_)) .WillByDefault(Return(true)); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc index ae30a4cec0d..b7b3537882f 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_consent_request_test.cc @@ -95,7 +95,7 @@ class GetInteriorVehicleDataConsentRequestTest void TestPrecondition() { message_ = CreateBasicMessage(); - ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistInCapabilities(_)) + ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_)) .WillByDefault(Return(true)); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc index e097cc34282..b7ca8e34419 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/get_interior_vehicle_data_request_test.cc @@ -160,7 +160,7 @@ class GetInteriorVehicleDataRequestTest .WillByDefault(Return(true)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); - ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistInCapabilities(_)) + ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_)) .WillByDefault(Return(true)); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc index 6b586bd148c..aa2d77acd5b 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/rc_get_interior_vehicle_data_consent_test.cc @@ -152,7 +152,7 @@ class RCGetInteriorVehicleDataConsentTest .WillByDefault(Return(true)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); - ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistInCapabilities(_)) + ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_)) .WillByDefault(Return(true)); } diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc index 77e8aaff65e..5a822a2fe49 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/commands/set_interior_vehicle_data_request_test.cc @@ -105,7 +105,7 @@ class SetInteriorVehicleDataRequestTest .WillByDefault(Return(&rc_capabilities_)); ON_CALL(mock_allocation_manager_, is_rc_enabled()) .WillByDefault(Return(true)); - ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistInCapabilities(_)) + ON_CALL(mock_rc_capabilities_manager_, CheckIfModuleExistsInCapabilities(_)) .WillByDefault(Return(true)); ON_CALL(mock_rc_capabilities_manager_, GetModuleDataCapabilities(_, _)) .WillByDefault(Return(std::make_pair("", capabilitiesStatus::success))); diff --git a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h index bec469b7c96..6f1593dcbb3 100644 --- a/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h +++ b/src/components/application_manager/rpc_plugins/rc_rpc_plugin/test/include/rc_rpc_plugin/mock/mock_rc_capabilities_manager.h @@ -42,7 +42,7 @@ class MockRCCapabilitiesManager : public rc_rpc_plugin::RCCapabilitiesManager { bool(const std::string& module_type, const std::string& button_name)); - MOCK_CONST_METHOD1(CheckIfModuleExistInCapabilities, + MOCK_CONST_METHOD1(CheckIfModuleExistsInCapabilities, bool(const rc_rpc_plugin::ModuleUid& module_type)); MOCK_CONST_METHOD2(GetModuleDataCapabilities,