Skip to content

Commit

Permalink
Fix function name
Browse files Browse the repository at this point in the history
  • Loading branch information
LitvinenkoIra committed Aug 27, 2019
1 parent f422417 commit aead258
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit aead258

Please sign in to comment.