diff options
author | Iryna Lytvynenko <ilytvynenko@luxoft.com> | 2018-05-24 23:01:04 -0400 |
---|---|---|
committer | Iryna Lytvynenko <ilytvynenko@luxoft.com> | 2018-05-24 23:01:04 -0400 |
commit | 0637cd4cdc159ef60061094cf67ab9598a45d70b (patch) | |
tree | 8f837d6cb9d2d966dfd884a7c2b504845196ce49 /src/components | |
parent | 6d20a0e2f032ea21d1268d3b2acc67c4693a6f0f (diff) | |
download | sdl_core-0637cd4cdc159ef60061094cf67ab9598a45d70b.tar.gz |
Fix code according to review comments
Removed redundant block
Added missed expecation in unit test
Diffstat (limited to 'src/components')
3 files changed, 31 insertions, 59 deletions
diff --git a/src/components/application_manager/test/policy_handler_test.cc b/src/components/application_manager/test/policy_handler_test.cc index 94ed43a465..3cd34bfaaa 100644 --- a/src/components/application_manager/test/policy_handler_test.cc +++ b/src/components/application_manager/test/policy_handler_test.cc @@ -1384,7 +1384,7 @@ TEST_F(PolicyHandlerTest, IsRequestTypeAllowed) { EXPECT_CALL(*mock_policy_manager_, GetAppRequestTypes(kPolicyAppId_)) .WillOnce(Return(std::vector<std::string>({"HTTP"}))); // Act - policy_handler_.IsRequestTypeAllowed(kPolicyAppId_, type); + EXPECT_FALSE(policy_handler_.IsRequestTypeAllowed(kPolicyAppId_, type)); } TEST_F(PolicyHandlerTest, IsRequestSubTypeAllowed) { diff --git a/src/components/policy/policy_external/src/policy_helper.cc b/src/components/policy/policy_external/src/policy_helper.cc index 05c353dff8..90d61320ad 100644 --- a/src/components/policy/policy_external/src/policy_helper.cc +++ b/src/components/policy/policy_external/src/policy_helper.cc @@ -408,41 +408,32 @@ void policy::CheckAppPolicy::SetPendingPermissions( break; case RESULT_REQUEST_TYPE_CHANGED: permissions_diff.requestTypeChanged = true; - { - // Getting Request Types from PTU (not from cache) - for (const auto& request_type : *app_policy.second.RequestType) { - permissions_diff.requestType.push_back( - EnumToJsonString(request_type)); - } - } + // Getting Request Types from PTU (not from cache) + for (const auto& request_type : *app_policy.second.RequestType) { + permissions_diff.requestType.push_back(EnumToJsonString(request_type)); + } break; case RESULT_REQUEST_SUBTYPE_CHANGED: permissions_diff.requestSubTypeChanged = true; - { - // Getting Request SubTypes from PTU (not from cache) - for (const auto& request_subtype : *app_policy.second.RequestSubType) { - permissions_diff.requestSubType.push_back(request_subtype); - } + // Getting Request SubTypes from PTU (not from cache) + for (const auto& request_subtype : *app_policy.second.RequestSubType) { + permissions_diff.requestSubType.push_back(request_subtype); } - break; case RESULT_REQUEST_TYPE_AND_SUBTYPE_CHANGED: permissions_diff.requestTypeChanged = true; permissions_diff.requestSubTypeChanged = true; - { - // Getting Request Types from PTU (not from cache) - for (const auto& request_type : *app_policy.second.RequestType) { - permissions_diff.requestType.push_back( - EnumToJsonString(request_type)); - } - - // Getting Request SubTypes from PTU (not from cache) - for (const auto& request_subtype : *app_policy.second.RequestSubType) { - permissions_diff.requestSubType.push_back(request_subtype); - } + + // Getting Request Types from PTU (not from cache) + for (const auto& request_type : *app_policy.second.RequestType) { + permissions_diff.requestType.push_back(EnumToJsonString(request_type)); } + // Getting Request SubTypes from PTU (not from cache) + for (const auto& request_subtype : *app_policy.second.RequestSubType) { + permissions_diff.requestSubType.push_back(request_subtype); + } break; default: return; diff --git a/src/components/policy/policy_regular/src/policy_helper.cc b/src/components/policy/policy_regular/src/policy_helper.cc index 4cb1746134..c408aa4325 100644 --- a/src/components/policy/policy_regular/src/policy_helper.cc +++ b/src/components/policy/policy_regular/src/policy_helper.cc @@ -426,51 +426,32 @@ void policy::CheckAppPolicy::SetPendingPermissions( permissions_diff.priority.clear(); permissions_diff.requestTypeChanged = true; permissions_diff.requestSubTypeChanged = true; - { - // Getting RequestTypes from PTU (not from cache) - policy_table::RequestTypes::const_iterator it_request_type = - app_policy.second.RequestType->begin(); - for (; app_policy.second.RequestType->end() != it_request_type; - ++it_request_type) { - permissions_diff.requestType.push_back( - EnumToJsonString(*it_request_type)); - } + + // Getting Request Types from PTU (not from cache) + for (const auto& request_type : *app_policy.second.RequestType) { + permissions_diff.requestType.push_back(EnumToJsonString(request_type)); } - { - // Getting RequestSubTypes from PTU (not from cache) - policy_table::RequestSubTypes::const_iterator it_request_subtype = - app_policy.second.RequestSubType->begin(); - for (; app_policy.second.RequestSubType->end() != it_request_subtype; - ++it_request_subtype) { - permissions_diff.requestSubType.push_back(*it_request_subtype); - } + + // Getting Request SubTypes from PTU (not from cache) + for (const auto& request_subtype : *app_policy.second.RequestSubType) { + permissions_diff.requestSubType.push_back(request_subtype); } break; case RESULT_REQUEST_TYPE_CHANGED: permissions_diff.priority.clear(); permissions_diff.requestTypeChanged = true; - { - // Getting RequestTypes from PTU (not from cache) - policy_table::RequestTypes::const_iterator it_request_type = - app_policy.second.RequestType->begin(); - for (; app_policy.second.RequestType->end() != it_request_type; - ++it_request_type) { - permissions_diff.requestType.push_back( - EnumToJsonString(*it_request_type)); - } + + // Getting Request Types from PTU (not from cache) + for (const auto& request_type : *app_policy.second.RequestType) { + permissions_diff.requestType.push_back(EnumToJsonString(request_type)); } break; case RESULT_REQUEST_SUBTYPE_CHANGED: permissions_diff.priority.clear(); permissions_diff.requestSubTypeChanged = true; - { - // Getting RequestSubTypes from PTU (not from cache) - policy_table::RequestSubTypes::const_iterator it_request_subtype = - app_policy.second.RequestSubType->begin(); - for (; app_policy.second.RequestSubType->end() != it_request_subtype; - ++it_request_subtype) { - permissions_diff.requestSubType.push_back(*it_request_subtype); - } + // Getting Request SubTypes from PTU (not from cache) + for (const auto& request_subtype : *app_policy.second.RequestSubType) { + permissions_diff.requestSubType.push_back(request_subtype); } break; default: |