Skip to content

Commit

Permalink
Fix more clang-tidy errors
Browse files Browse the repository at this point in the history 
Signed-off-by: Alex Konradi <[email protected]>
  • Loading branch information
@akonradi
akonradi committed Jul 17, 2020
1 parent ca98d73 commit bbed574
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 26 deletions.
22 changes: 11 additions & 11 deletions test/common/http/header_map_impl_speed_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ static void addDummyHeaders(HeaderMap& headers, size_t num_headers) {
static void headerMapImplCreate(benchmark::State& state) {
// Make sure first time construction is not counted.
Http::ResponseHeaderMapImpl::create();
for (auto _ : state) {
for (auto _ : state) { // NOLINT
auto headers = Http::ResponseHeaderMapImpl::create();
benchmark::DoNotOptimize(headers->size());
}
Expand All @@ -39,7 +39,7 @@ static void headerMapImplSetReference(benchmark::State& state) {
const std::string value("01234567890123456789");
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->setReference(key, value);
}
benchmark::DoNotOptimize(headers->size());
Expand All @@ -61,7 +61,7 @@ static void headerMapImplGet(benchmark::State& state) {
addDummyHeaders(*headers, state.range(0));
headers->setReference(key, value);
size_t successes = 0;
for (auto _ : state) {
for (auto _ : state) { // NOLINT
successes += (headers->get(key) != nullptr);
}
benchmark::DoNotOptimize(successes);
Expand All @@ -78,7 +78,7 @@ static void headerMapImplGetInline(benchmark::State& state) {
addDummyHeaders(*headers, state.range(0));
headers->setReferenceConnection(value);
size_t size = 0;
for (auto _ : state) {
for (auto _ : state) { // NOLINT
size += headers->Connection()->value().size();
}
benchmark::DoNotOptimize(size);
Expand All @@ -93,7 +93,7 @@ static void headerMapImplSetInlineMacro(benchmark::State& state) {
const std::string value("01234567890123456789");
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->setReferenceConnection(value);
}
benchmark::DoNotOptimize(headers->size());
Expand All @@ -108,7 +108,7 @@ static void headerMapImplSetInlineInteger(benchmark::State& state) {
uint64_t value = 12345;
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->setConnection(value);
}
benchmark::DoNotOptimize(headers->size());
Expand All @@ -120,7 +120,7 @@ static void headerMapImplGetByteSize(benchmark::State& state) {
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
uint64_t size = 0;
for (auto _ : state) {
for (auto _ : state) { // NOLINT
size += headers->byteSize();
}
benchmark::DoNotOptimize(size);
Expand All @@ -136,7 +136,7 @@ static void headerMapImplIterate(benchmark::State& state) {
num_callbacks++;
return HeaderMap::Iterate::Continue;
};
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->iterate(counting_callback);
}
benchmark::DoNotOptimize(num_callbacks);
Expand All @@ -153,7 +153,7 @@ static void headerMapImplRemove(benchmark::State& state) {
const std::string value("01234567890123456789");
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->addReference(key, value);
headers->remove(key);
}
Expand All @@ -172,7 +172,7 @@ static void headerMapImplRemoveInline(benchmark::State& state) {
const std::string value("01234567890123456789");
auto headers = Http::ResponseHeaderMapImpl::create();
addDummyHeaders(*headers, state.range(0));
for (auto _ : state) {
for (auto _ : state) { // NOLINT
headers->addReference(key, value);
headers->remove(key);
}
Expand All @@ -197,7 +197,7 @@ static void headerMapImplPopulate(benchmark::State& state) {
{LowerCaseString("set-cookie"), "_cookie1=12345678; path = /; secure"},
{LowerCaseString("set-cookie"), "_cookie2=12345678; path = /; secure"},
};
for (auto _ : state) {
for (auto _ : state) { // NOLINT
auto headers = Http::ResponseHeaderMapImpl::create();
for (const auto& key_value : headers_to_add) {
headers->addReference(key_value.first, key_value.second);
Expand Down
20 changes: 10 additions & 10 deletions test/extensions/grpc_credentials/aws_iam/aws_iam_grpc_credentials_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,17 @@ class GrpcAwsIamClientIntegrationTest : public GrpcSslClientIntegrationTest {

std::string config_yaml;
switch (region_location_) {
case RegionLocation::kInEnvironment:
case RegionLocation::InEnvironment:
TestEnvironment::setEnvVar("AWS_REGION", region_name_, 1);
ABSL_FALLTHROUGH_INTENDED;
case RegionLocation::kNotProvided:
case RegionLocation::NotProvided:
config_yaml = fmt::format(R"EOF(
"@type": type.googleapis.com/envoy.config.grpc_credential.v2alpha.AwsIamConfig
service_name: {}
)EOF",
service_name_);
break;
case RegionLocation::kInConfig:
case RegionLocation::InConfig:
config_yaml = fmt::format(R"EOF(
"@type": type.googleapis.com/envoy.config.grpc_credential.v2alpha.AwsIamConfig
service_name: {}
Expand All @@ -86,12 +86,12 @@ region: {}
}

enum class RegionLocation {
kNotProvided,
kInEnvironment,
kInConfig,
NotProvided,
InEnvironment,
InConfig,
};

RegionLocation region_location_ = RegionLocation::kNotProvided;
RegionLocation region_location_ = RegionLocation::NotProvided;
std::string service_name_{};
std::string region_name_{};
std::string credentials_factory_name_{};
Expand All @@ -104,7 +104,7 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_ConfigRegion) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
service_name_ = "test_service";
region_name_ = "test_region_static";
region_location_ = RegionLocation::kInConfig;
region_location_ = RegionLocation::InConfig;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
initialize();
auto request = createRequest(empty_metadata_);
Expand All @@ -116,7 +116,7 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_EnvRegion) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
service_name_ = "test_service";
region_name_ = "test_region_env";
region_location_ = RegionLocation::kInEnvironment;
region_location_ = RegionLocation::InEnvironment;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
initialize();
auto request = createRequest(empty_metadata_);
Expand All @@ -128,7 +128,7 @@ TEST_P(GrpcAwsIamClientIntegrationTest, AwsIamGrpcAuth_NoRegion) {
SKIP_IF_GRPC_CLIENT(ClientType::EnvoyGrpc);
service_name_ = "test_service";
region_name_ = "test_region_env";
region_location_ = RegionLocation::kNotProvided;
region_location_ = RegionLocation::NotProvided;
credentials_factory_name_ = Extensions::GrpcCredentials::GrpcCredentialsNames::get().AwsIam;
EXPECT_THROW_WITH_REGEX(initialize();, EnvoyException, "AWS region");
}
Expand Down
13 changes: 8 additions & 5 deletions test/mocks/http/mocks.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ class HeaderValueOfMatcherImpl : public testing::MatcherInterface<HeaderMapT> {
testing::Matcher<absl::string_view> matcher)
: key_(std::move(key)), matcher_(std::move(matcher)) {}

// NOLINTNEXTLINE(readability-identifier-naming)
bool MatchAndExplain(HeaderMapT headers, testing::MatchResultListener* listener) const override {
// Get all headers with matching keys.
std::vector<absl::string_view> values;
Expand Down Expand Up @@ -503,7 +504,7 @@ MATCHER_P(HttpStatusIs, expected_code, "") {
}

inline HeaderMap::ConstIterateCb
SaveHeaders(std::vector<std::pair<absl::string_view, absl::string_view>>* output) {
saveHeaders(std::vector<std::pair<absl::string_view, absl::string_view>>* output) {
return [output](const HeaderEntry& header) {
output->push_back(std::make_pair(header.key().getStringView(), header.value().getStringView()));
return HeaderMap::Iterate::Continue;
Expand All @@ -522,13 +523,14 @@ class IsSubsetOfHeadersMatcherImpl : public testing::MatcherInterface<HeaderMapT
IsSubsetOfHeadersMatcherImpl(const IsSubsetOfHeadersMatcherImpl& other)
: expected_headers_(other.expected_headers_) {}

// NOLINTNEXTLINE(readability-identifier-naming)
bool MatchAndExplain(HeaderMapT headers, testing::MatchResultListener* listener) const override {
// Collect header maps into vectors, to use for IsSubsetOf.
std::vector<std::pair<absl::string_view, absl::string_view>> arg_headers_vec;
headers.iterate(SaveHeaders(&arg_headers_vec));
headers.iterate(saveHeaders(&arg_headers_vec));

std::vector<std::pair<absl::string_view, absl::string_view>> expected_headers_vec;
expected_headers_.iterate(SaveHeaders(&expected_headers_vec));
expected_headers_.iterate(saveHeaders(&expected_headers_vec));

return ExplainMatchResult(testing::IsSubsetOf(expected_headers_vec), arg_headers_vec, listener);
}
Expand Down Expand Up @@ -573,13 +575,14 @@ class IsSupersetOfHeadersMatcherImpl : public testing::MatcherInterface<HeaderMa
IsSupersetOfHeadersMatcherImpl(const IsSupersetOfHeadersMatcherImpl& other)
: expected_headers_(other.expected_headers_) {}

// NOLINTNEXTLINE(readability-identifier-naming)
bool MatchAndExplain(HeaderMapT headers, testing::MatchResultListener* listener) const override {
// Collect header maps into vectors, to use for IsSupersetOf.
std::vector<std::pair<absl::string_view, absl::string_view>> arg_headers_vec;
headers.iterate(SaveHeaders(&arg_headers_vec));
headers.iterate(saveHeaders(&arg_headers_vec));

std::vector<std::pair<absl::string_view, absl::string_view>> expected_headers_vec;
expected_headers_.iterate(SaveHeaders(&expected_headers_vec));
expected_headers_.iterate(saveHeaders(&expected_headers_vec));

return ExplainMatchResult(testing::IsSupersetOf(expected_headers_vec), arg_headers_vec,
listener);
Expand Down
1 change: 1 addition & 0 deletions test/test_common/printers.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

namespace Envoy {
namespace Http {
// NOLINTNEXTLINE(readability-identifier-naming)
void PrintTo(const HeaderMapImpl& headers, std::ostream* os) {
headers.iterate([os](const HeaderEntry& header) -> HeaderMap::Iterate {
*os << "{'" << header.key().getStringView() << "','" << header.value().getStringView() << "'}";
Expand Down

0 comments on commit bbed574

Please sign in to comment.