diff --git a/.circleci/config.yml b/.circleci/config.yml index 64cc32f9c25..f2045b98bef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ references: envoy-build-image: &envoy-build-image - envoyproxy/envoy-build:1ef23d481a4701ad4a414d1ef98036bd2ed322e7 + envoyproxy/envoy-build:e994c1c0b1cdc9a9470cff728311ff7c995685e6 version: 2 jobs: diff --git a/bazel/README.md b/bazel/README.md index 2c0c278a360..1decc793774 100644 --- a/bazel/README.md +++ b/bazel/README.md @@ -33,7 +33,7 @@ On Ubuntu, run the following commands: apt-get install libtool apt-get install cmake apt-get install realpath - apt-get install clang-format-5.0 + apt-get install clang-format-6.0 apt-get install automake apt-get install ninja-build apt-get install curl @@ -231,7 +231,7 @@ bazel test -c dbg --config=asan //test/... The ASAN failure stack traces include line numbers as a result of running ASAN with a `dbg` build above. -If you have clang-5.0, additional checks are provided with: +If you have clang-5.0 or newer, additional checks are provided with: ``` bazel test -c dbg --config=clang-asan //test/... diff --git a/ci/README.md b/ci/README.md index 4bc941cf962..49135af40a0 100644 --- a/ci/README.md +++ b/ci/README.md @@ -26,7 +26,7 @@ Currently there are three build images: * `envoyproxy/envoy-build-ubuntu` — based on Ubuntu 16.04 (Xenial) which uses the GCC 5.4 compiler. * `envoyproxy/envoy-build-centos` — based on CentOS 7 which uses the GCC 5.3.1 compiler (devtoolset-4). -We also install and use the clang-5.0 compiler for some sanitizing runs. +We also install and use the clang-6.0 compiler for some sanitizing runs. # Building and running tests as a developer @@ -77,8 +77,8 @@ The build artifact can be found in `/tmp/envoy-docker-build/envoy/source/exe/env The `./ci/run_envoy_docker.sh './ci/do_ci.sh '` targets are: -* `bazel.api` — build and run API tests under `-c fastbuild` with clang-5.0. -* `bazel.asan` — build and run tests under `-c dbg --config=clang-asan` with clang-5.0. +* `bazel.api` — build and run API tests under `-c fastbuild` with clang-6.0. +* `bazel.asan` — build and run tests under `-c dbg --config=clang-asan` with clang-6.0. * `bazel.debug` — build Envoy static binary and run tests under `-c dbg`. * `bazel.debug.server_only` — build Envoy static binary under `-c dbg`. * `bazel.dev` — build Envoy static binary and run tests under `-c fastbuild` with gcc. @@ -87,9 +87,9 @@ The `./ci/run_envoy_docker.sh './ci/do_ci.sh '` targets are: * `bazel.release.server_only` — build Envoy static binary under `-c opt` with gcc. * `bazel.coverage` — build and run tests under `-c dbg` with gcc, generating coverage information in `$ENVOY_DOCKER_BUILD_DIR/envoy/generated/coverage/coverage.html`. * `bazel.coverity` — build Envoy static binary and run Coverity Scan static analysis. -* `bazel.tsan` — build and run tests under `-c dbg --config=clang-tsan` with clang-5.0. -* `check_format`— run `clang-format` 5.0 and `buildifier` on entire source tree. -* `fix_format`— run and enforce `clang-format` 5.0 and `buildifier` on entire source tree. +* `bazel.tsan` — build and run tests under `-c dbg --config=clang-tsan` with clang-6.0. +* `check_format`— run `clang-format-6.0` and `buildifier` on entire source tree. +* `fix_format`— run and enforce `clang-format-6.0` and `buildifier` on entire source tree. * `docs`— build documentation tree in `generated/docs`. # Testing changes to the build image as a developer diff --git a/ci/build_setup.sh b/ci/build_setup.sh index dba93c0dd78..327448e5137 100755 --- a/ci/build_setup.sh +++ b/ci/build_setup.sh @@ -17,9 +17,9 @@ function setup_gcc_toolchain() { } function setup_clang_toolchain() { - export CC=clang-5.0 - export CXX=clang++-5.0 - export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-5.0/bin/llvm-symbolizer + export CC=clang-6.0 + export CXX=clang++-6.0 + export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-6.0/bin/llvm-symbolizer echo "$CC/$CXX toolchain configured" } diff --git a/include/envoy/common/pure.h b/include/envoy/common/pure.h index 70a748253c9..ecc74586618 100644 --- a/include/envoy/common/pure.h +++ b/include/envoy/common/pure.h @@ -5,4 +5,4 @@ namespace Envoy { * Friendly name for a pure virtual routine. */ #define PURE = 0 -} // Envoy +} // namespace Envoy diff --git a/include/envoy/stats/stats_macros.h b/include/envoy/stats/stats_macros.h index 0520b31a845..eb1c89557c6 100644 --- a/include/envoy/stats/stats_macros.h +++ b/include/envoy/stats/stats_macros.h @@ -40,4 +40,4 @@ namespace Envoy { #define POOL_COUNTER(POOL) POOL_COUNTER_PREFIX(POOL, "") #define POOL_GAUGE(POOL) POOL_GAUGE_PREFIX(POOL, "") #define POOL_HISTOGRAM(POOL) POOL_HISTOGRAM_PREFIX(POOL, "") -} // Envoy +} // namespace Envoy diff --git a/include/envoy/upstream/host_description.h b/include/envoy/upstream/host_description.h index 9f5eb67f7ba..3cac6809d37 100644 --- a/include/envoy/upstream/host_description.h +++ b/include/envoy/upstream/host_description.h @@ -112,5 +112,5 @@ class HostDescription { typedef std::shared_ptr HostDescriptionConstSharedPtr; -} // Upstream +} // namespace Upstream } // namespace Envoy diff --git a/source/common/common/assert.h b/source/common/common/assert.h index 3654a160df2..d19270e2729 100644 --- a/source/common/common/assert.h +++ b/source/common/common/assert.h @@ -66,4 +66,4 @@ namespace Envoy { // after a switch (some_enum) with all enum values included in the cases. The macro name includes // "GCOVR_EXCL_LINE" to exclude the macro's usage from code coverage reports. #define NOT_REACHED_GCOVR_EXCL_LINE PANIC("not reached") -} // Envoy +} // namespace Envoy diff --git a/source/common/common/compiler_requirements.h b/source/common/common/compiler_requirements.h index 5048737cdde..377b0286a5a 100644 --- a/source/common/common/compiler_requirements.h +++ b/source/common/common/compiler_requirements.h @@ -17,4 +17,4 @@ namespace Envoy { "ENVOY_IGNORE_GLIBCXX_USE_CXX11_ABI_ERROR=1 in your build." #endif -} // Envoy +} // namespace Envoy diff --git a/source/common/common/logger.cc b/source/common/common/logger.cc index 2acb67335d5..080c7fb92c5 100644 --- a/source/common/common/logger.cc +++ b/source/common/common/logger.cc @@ -88,5 +88,5 @@ void Registry::setLogFormat(const std::string& log_format) { } } -} // Logger +} // namespace Logger } // namespace Envoy diff --git a/source/common/common/logger.h b/source/common/common/logger.h index f83063cc08c..3746377a8b1 100644 --- a/source/common/common/logger.h +++ b/source/common/common/logger.h @@ -240,7 +240,7 @@ template class Loggable { } }; -} // Logger +} // namespace Logger // Convert the line macro to a string literal for concatenation in log macros. #define DO_STRINGIZE(x) STRINGIZE(x) diff --git a/source/common/common/macros.h b/source/common/common/macros.h index 8a16a19a3c1..60955adc772 100644 --- a/source/common/common/macros.h +++ b/source/common/common/macros.h @@ -44,4 +44,4 @@ namespace Envoy { #define FALLTHRU #endif -} // Envoy +} // namespace Envoy diff --git a/source/common/config/filter_json.cc b/source/common/config/filter_json.cc index b411262c4a6..f37279fc234 100644 --- a/source/common/config/filter_json.cc +++ b/source/common/config/filter_json.cc @@ -161,8 +161,9 @@ void FilterJson::translateHttpConnectionManager( json_filter->getString("name"))); JSON_UTIL_SET_STRING(*json_filter, *filter->mutable_deprecated_v1(), type); - const std::string deprecated_config = "{\"deprecated_v1\": true, \"value\": " + - json_filter->getObject("config")->asJsonString() + "}"; + const std::string deprecated_config = + "{\"deprecated_v1\": true, \"value\": " + json_filter->getObject("config")->asJsonString() + + "}"; const auto status = Protobuf::util::JsonStringToMessage(deprecated_config, filter->mutable_config()); diff --git a/source/common/config/lds_json.cc b/source/common/config/lds_json.cc index 45daf88a91c..9a0e6ab2cf4 100644 --- a/source/common/config/lds_json.cc +++ b/source/common/config/lds_json.cc @@ -41,8 +41,9 @@ void LdsJson::translateListener(const Json::Object& json_listener, json_filter->getString("name"))); JSON_UTIL_SET_STRING(*json_filter, *filter->mutable_deprecated_v1(), type); - const std::string json_config = "{\"deprecated_v1\": true, \"value\": " + - json_filter->getObject("config")->asJsonString() + "}"; + const std::string json_config = + "{\"deprecated_v1\": true, \"value\": " + json_filter->getObject("config")->asJsonString() + + "}"; const auto status = Protobuf::util::JsonStringToMessage(json_config, filter->mutable_config()); // JSON schema has already validated that this is a valid JSON object. diff --git a/source/common/filesystem/filesystem_impl.h b/source/common/filesystem/filesystem_impl.h index 7f50a89a6d0..2ce5d9090d8 100644 --- a/source/common/filesystem/filesystem_impl.h +++ b/source/common/filesystem/filesystem_impl.h @@ -132,10 +132,10 @@ class FileImpl : public File { Thread::CondVar flush_event_; std::atomic flush_thread_exit_{}; std::atomic reopen_file_{}; - Buffer::OwnedImpl flush_buffer_ - GUARDED_BY(write_lock_); // This buffer is used by multiple threads. It gets filled and - // then flushed either when max size is reached or when a timer - // fires. + Buffer::OwnedImpl + flush_buffer_ GUARDED_BY(write_lock_); // This buffer is used by multiple threads. It gets + // filled and then flushed either when max size is + // reached or when a timer fires. // TODO(jmarantz): this should be GUARDED_BY(flush_lock_) but the analysis cannot poke through // the std::make_unique assignment. I do not believe it's possible to annotate this properly now // due to limitations in the clang thread annotation analysis. @@ -153,4 +153,4 @@ class FileImpl : public File { }; } // namespace Filesystem -} // Envoy +} // namespace Envoy diff --git a/source/common/http/conn_manager_config.h b/source/common/http/conn_manager_config.h index a38a9035f46..a1dae7a55e2 100644 --- a/source/common/http/conn_manager_config.h +++ b/source/common/http/conn_manager_config.h @@ -293,5 +293,5 @@ class ConnectionManagerConfig { */ virtual const Http::Http1Settings& http1Settings() const PURE; }; -} +} // namespace Http } // namespace Envoy diff --git a/source/common/http/header_map_impl.h b/source/common/http/header_map_impl.h index ae507866d2a..fd2ae9570e7 100644 --- a/source/common/http/header_map_impl.h +++ b/source/common/http/header_map_impl.h @@ -209,5 +209,5 @@ class HeaderMapImpl : public HeaderMap, NonCopyable { typedef std::unique_ptr HeaderMapImplPtr; -} // Http +} // namespace Http } // namespace Envoy diff --git a/source/common/http/http2/codec_impl.cc b/source/common/http/http2/codec_impl.cc index 200c3344199..c9f623a4344 100644 --- a/source/common/http/http2/codec_impl.cc +++ b/source/common/http/http2/codec_impl.cc @@ -673,7 +673,6 @@ ConnectionImpl::Http2Callbacks::Http2Callbacks() { callbacks_, [](nghttp2_session*, const nghttp2_frame* frame, const uint8_t* raw_name, size_t name_length, const uint8_t* raw_value, size_t value_length, uint8_t, void* user_data) -> int { - // TODO PERF: Can reference count here to avoid copies. HeaderString name; name.setCopy(reinterpret_cast(raw_name), name_length); diff --git a/source/common/http/user_agent.h b/source/common/http/user_agent.h index d63ff8126a5..257be50ad8e 100644 --- a/source/common/http/user_agent.h +++ b/source/common/http/user_agent.h @@ -68,4 +68,4 @@ class UserAgent { }; } // namespace Http -} // Envoy +} // namespace Envoy diff --git a/source/common/router/router.cc b/source/common/router/router.cc index 838d937454c..544cda92b8f 100644 --- a/source/common/router/router.cc +++ b/source/common/router/router.cc @@ -222,14 +222,14 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::HeaderMap& headers, bool e direct_response->rewritePathHeader(headers, !config_.suppress_envoy_headers_); callbacks_->sendLocalReply( direct_response->responseCode(), direct_response->responseBody(), - [ this, direct_response, &request_headers = headers ](Http::HeaderMap & response_headers) - ->void { - const auto new_path = direct_response->newPath(request_headers); - if (!new_path.empty()) { - response_headers.addReferenceKey(Http::Headers::get().Location, new_path); - } - direct_response->finalizeResponseHeaders(response_headers, callbacks_->requestInfo()); - }); + [this, direct_response, + &request_headers = headers](Http::HeaderMap& response_headers) -> void { + const auto new_path = direct_response->newPath(request_headers); + if (!new_path.empty()) { + response_headers.addReferenceKey(Http::Headers::get().Location, new_path); + } + direct_response->finalizeResponseHeaders(response_headers, callbacks_->requestInfo()); + }); return Http::FilterHeadersStatus::StopIteration; } diff --git a/source/common/runtime/runtime_impl.cc b/source/common/runtime/runtime_impl.cc index 99bd48a4f6e..8f417828219 100644 --- a/source/common/runtime/runtime_impl.cc +++ b/source/common/runtime/runtime_impl.cc @@ -315,7 +315,7 @@ std::unique_ptr LoaderImpl::createNewSnapshot() { void LoaderImpl::loadNewSnapshot() { ThreadLocal::ThreadLocalObjectSharedPtr ptr = createNewSnapshot(); - tls_->set([ptr = std::move(ptr)](Event::Dispatcher&)->ThreadLocal::ThreadLocalObjectSharedPtr { + tls_->set([ptr = std::move(ptr)](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr { return ptr; }); } diff --git a/source/common/stats/thread_local_store.cc b/source/common/stats/thread_local_store.cc index de98b3aaff3..c7f71308ae3 100644 --- a/source/common/stats/thread_local_store.cc +++ b/source/common/stats/thread_local_store.cc @@ -144,7 +144,7 @@ void ThreadLocalStoreImpl::releaseScopeCrossThread(ScopeImpl* scope) { // cache flush operation. if (!shutting_down_ && main_thread_dispatcher_) { main_thread_dispatcher_->post( - [ this, scope_id = scope->scope_id_ ]()->void { clearScopeFromCaches(scope_id); }); + [this, scope_id = scope->scope_id_]() -> void { clearScopeFromCaches(scope_id); }); } } diff --git a/source/common/tcp_proxy/tcp_proxy.cc b/source/common/tcp_proxy/tcp_proxy.cc index 45e6ca76a4d..071fd93200c 100644 --- a/source/common/tcp_proxy/tcp_proxy.cc +++ b/source/common/tcp_proxy/tcp_proxy.cc @@ -466,17 +466,14 @@ void Filter::onUpstreamEvent(Network::ConnectionEvent event) { // The idle_timer_ can be moved to a Drainer, so related callbacks call into // the UpstreamCallbacks, which has the same lifetime as the timer, and can dispatch // the call to either TcpProxy or to Drainer, depending on the current state. - idle_timer_ = - read_callbacks_->connection().dispatcher().createTimer([upstream_callbacks = - upstream_callbacks_]() { - upstream_callbacks->onIdleTimeout(); - }); + idle_timer_ = read_callbacks_->connection().dispatcher().createTimer( + [upstream_callbacks = upstream_callbacks_]() { upstream_callbacks->onIdleTimeout(); }); resetIdleTimer(); read_callbacks_->connection().addBytesSentCallback([this](uint64_t) { resetIdleTimer(); }); - upstream_conn_data_->connection().addBytesSentCallback([upstream_callbacks = - upstream_callbacks_](uint64_t) { - upstream_callbacks->onBytesSent(); - }); + upstream_conn_data_->connection().addBytesSentCallback( + [upstream_callbacks = upstream_callbacks_](uint64_t) { + upstream_callbacks->onBytesSent(); + }); } } } diff --git a/source/common/upstream/cluster_manager_impl.cc b/source/common/upstream/cluster_manager_impl.cc index f17f8d60538..91bdb9b21b5 100644 --- a/source/common/upstream/cluster_manager_impl.cc +++ b/source/common/upstream/cluster_manager_impl.cc @@ -521,28 +521,24 @@ bool ClusterManagerImpl::addOrUpdateCluster(const envoy::api::v2::Cluster& clust } void ClusterManagerImpl::createOrUpdateThreadLocalCluster(ClusterData& cluster) { - tls_->runOnAllThreads( - [ - this, new_cluster = cluster.cluster_->info(), - thread_aware_lb_factory = cluster.loadBalancerFactory() - ]() - ->void { - ThreadLocalClusterManagerImpl& cluster_manager = - tls_->getTyped(); - - if (cluster_manager.thread_local_clusters_.count(new_cluster->name()) > 0) { - ENVOY_LOG(debug, "updating TLS cluster {}", new_cluster->name()); - } else { - ENVOY_LOG(debug, "adding TLS cluster {}", new_cluster->name()); - } - - auto thread_local_cluster = new ThreadLocalClusterManagerImpl::ClusterEntry( - cluster_manager, new_cluster, thread_aware_lb_factory); - cluster_manager.thread_local_clusters_[new_cluster->name()].reset(thread_local_cluster); - for (auto& cb : cluster_manager.update_callbacks_) { - cb->onClusterAddOrUpdate(*thread_local_cluster); - } - }); + tls_->runOnAllThreads([this, new_cluster = cluster.cluster_->info(), + thread_aware_lb_factory = cluster.loadBalancerFactory()]() -> void { + ThreadLocalClusterManagerImpl& cluster_manager = + tls_->getTyped(); + + if (cluster_manager.thread_local_clusters_.count(new_cluster->name()) > 0) { + ENVOY_LOG(debug, "updating TLS cluster {}", new_cluster->name()); + } else { + ENVOY_LOG(debug, "adding TLS cluster {}", new_cluster->name()); + } + + auto thread_local_cluster = new ThreadLocalClusterManagerImpl::ClusterEntry( + cluster_manager, new_cluster, thread_aware_lb_factory); + cluster_manager.thread_local_clusters_[new_cluster->name()].reset(thread_local_cluster); + for (auto& cb : cluster_manager.update_callbacks_) { + cb->onClusterAddOrUpdate(*thread_local_cluster); + } + }); } bool ClusterManagerImpl::removeCluster(const std::string& cluster_name) { @@ -693,15 +689,14 @@ void ClusterManagerImpl::postThreadLocalClusterUpdate(const Cluster& cluster, ui HostsPerLocalityConstSharedPtr healthy_hosts_per_locality_copy = host_set->healthyHostsPerLocality().clone(); - tls_->runOnAllThreads([ - this, name = cluster.info()->name(), priority, hosts_copy, healthy_hosts_copy, - hosts_per_locality_copy, healthy_hosts_per_locality_copy, - locality_weights = host_set->localityWeights(), hosts_added, hosts_removed - ]() { - ThreadLocalClusterManagerImpl::updateClusterMembership( - name, priority, hosts_copy, healthy_hosts_copy, hosts_per_locality_copy, - healthy_hosts_per_locality_copy, locality_weights, hosts_added, hosts_removed, *tls_); - }); + tls_->runOnAllThreads( + [this, name = cluster.info()->name(), priority, hosts_copy, healthy_hosts_copy, + hosts_per_locality_copy, healthy_hosts_per_locality_copy, + locality_weights = host_set->localityWeights(), hosts_added, hosts_removed]() { + ThreadLocalClusterManagerImpl::updateClusterMembership( + name, priority, hosts_copy, healthy_hosts_copy, hosts_per_locality_copy, + healthy_hosts_per_locality_copy, locality_weights, hosts_added, hosts_removed, *tls_); + }); } void ClusterManagerImpl::postThreadLocalHealthFailure(const HostSharedPtr& host) { diff --git a/source/extensions/access_loggers/http_grpc/config.cc b/source/extensions/access_loggers/http_grpc/config.cc index 4953c2bd3d5..6de86a264b0 100644 --- a/source/extensions/access_loggers/http_grpc/config.cc +++ b/source/extensions/access_loggers/http_grpc/config.cc @@ -29,7 +29,7 @@ HttpGrpcAccessLogFactory::createAccessLogInstance(const Protobuf::Message& confi std::shared_ptr grpc_access_log_streamer = context.singletonManager().getTyped( SINGLETON_MANAGER_REGISTERED_NAME(grpc_access_log_streamer), - [&context, grpc_service = proto_config.common_config().grpc_service() ] { + [&context, grpc_service = proto_config.common_config().grpc_service()] { return std::make_shared( context.clusterManager().grpcAsyncClientManager().factoryForGrpcService( grpc_service, context.scope(), false), diff --git a/source/extensions/filters/common/lua/lua.h b/source/extensions/filters/common/lua/lua.h index 9f2ee603283..a12ba7132b9 100644 --- a/source/extensions/filters/common/lua/lua.h +++ b/source/extensions/filters/common/lua/lua.h @@ -402,7 +402,7 @@ class LuaException : public EnvoyException { public: using EnvoyException::EnvoyException; }; -} +} // namespace Lua } // namespace Common } // namespace Filters } // namespace Extensions diff --git a/source/extensions/filters/http/ext_authz/config.cc b/source/extensions/filters/http/ext_authz/config.cc index 5556aef4d81..b2c8c655e1a 100644 --- a/source/extensions/filters/http/ext_authz/config.cc +++ b/source/extensions/filters/http/ext_authz/config.cc @@ -28,10 +28,10 @@ Http::FilterFactoryCb ExtAuthzFilterConfig::createFilterFactoryFromProtoTyped( if (proto_config.has_http_service()) { const uint32_t timeout_ms = PROTOBUF_GET_MS_OR_DEFAULT(proto_config.http_service().server_uri(), timeout, DefaultTimeout); - return [ - filter_config, timeout_ms, cluster_name = proto_config.http_service().server_uri().cluster(), - path_prefix = proto_config.http_service().path_prefix() - ](Http::FilterChainFactoryCallbacks & callbacks) { + return [filter_config, timeout_ms, + cluster_name = proto_config.http_service().server_uri().cluster(), + path_prefix = proto_config.http_service().path_prefix()]( + Http::FilterChainFactoryCallbacks& callbacks) { auto client = std::make_unique( cluster_name, filter_config->cm(), std::chrono::milliseconds(timeout_ms), path_prefix, filter_config->allowedAuthorizationHeaders(), filter_config->allowedRequestHeaders()); @@ -43,8 +43,8 @@ Http::FilterFactoryCb ExtAuthzFilterConfig::createFilterFactoryFromProtoTyped( const uint32_t timeout_ms = PROTOBUF_GET_MS_OR_DEFAULT(proto_config.grpc_service(), timeout, DefaultTimeout); - return [ grpc_service = proto_config.grpc_service(), &context, filter_config, - timeout_ms ](Http::FilterChainFactoryCallbacks & callbacks) { + return [grpc_service = proto_config.grpc_service(), &context, filter_config, + timeout_ms](Http::FilterChainFactoryCallbacks& callbacks) { const auto async_client_factory = context.clusterManager().grpcAsyncClientManager().factoryForGrpcService( grpc_service, context.scope(), true); diff --git a/source/extensions/filters/http/ext_authz/ext_authz.cc b/source/extensions/filters/http/ext_authz/ext_authz.cc index 20846dd34d2..40404656ddf 100644 --- a/source/extensions/filters/http/ext_authz/ext_authz.cc +++ b/source/extensions/filters/http/ext_authz/ext_authz.cc @@ -104,16 +104,15 @@ void Filter::onComplete(Filters::Common::ExtAuthz::ResponsePtr&& response) { ENVOY_STREAM_LOG(debug, "Ext_authz rejected the request", *callbacks_); ENVOY_STREAM_LOG(trace, "Ext_authz downstream header(s):", *callbacks_); callbacks_->sendLocalReply(response->status_code, response->body, - [& headers = response->headers_to_add, - &callbacks = *callbacks_ ](Http::HeaderMap & response_headers) - ->void { - for (const auto& header : headers) { - response_headers.remove(header.first); - response_headers.addCopy(header.first, header.second); - ENVOY_STREAM_LOG(trace, " '{}':'{}'", callbacks, - header.first.get(), header.second); - } - }); + [& headers = response->headers_to_add, &callbacks = *callbacks_]( + Http::HeaderMap& response_headers) -> void { + for (const auto& header : headers) { + response_headers.remove(header.first); + response_headers.addCopy(header.first, header.second); + ENVOY_STREAM_LOG(trace, " '{}':'{}'", callbacks, + header.first.get(), header.second); + } + }); callbacks_->requestInfo().setResponseFlag( RequestInfo::ResponseFlag::UnauthorizedExternalService); } else { diff --git a/source/extensions/filters/http/health_check/config.cc b/source/extensions/filters/http/health_check/config.cc index 56b682dafa3..aa2b594a6f4 100644 --- a/source/extensions/filters/http/health_check/config.cc +++ b/source/extensions/filters/http/health_check/config.cc @@ -52,7 +52,6 @@ Http::FilterFactoryCb HealthCheckFilterConfig::createFilterFactoryFromProtoTyped callbacks.addStreamFilter(std::make_shared(context, pass_through_mode, cache_manager, header_match_data, cluster_min_healthy_percentages)); - }; } diff --git a/source/extensions/filters/http/jwt_authn/extractor.cc b/source/extensions/filters/http/jwt_authn/extractor.cc index 6560a1a58a8..452232b6742 100644 --- a/source/extensions/filters/http/jwt_authn/extractor.cc +++ b/source/extensions/filters/http/jwt_authn/extractor.cc @@ -5,8 +5,8 @@ #include "common/http/utility.h" #include "common/singleton/const_singleton.h" -using ::Envoy::Http::LowerCaseString; using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication; +using ::Envoy::Http::LowerCaseString; namespace Envoy { namespace Extensions { diff --git a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h index be90fa5758e..b6e183bd0ba 100644 --- a/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h +++ b/source/extensions/filters/network/client_ssl_auth/client_ssl_auth.h @@ -128,7 +128,7 @@ class ClientSslAuthFilter : public Network::ReadFilter, public Network::Connecti Network::ReadFilterCallbacks* read_callbacks_{}; }; -} // ClientSsl +} // namespace ClientSslAuth } // namespace NetworkFilters } // namespace Extensions } // namespace Envoy diff --git a/source/extensions/filters/network/ext_authz/config.cc b/source/extensions/filters/network/ext_authz/config.cc index 54e5de374a3..cab5ea49c1c 100644 --- a/source/extensions/filters/network/ext_authz/config.cc +++ b/source/extensions/filters/network/ext_authz/config.cc @@ -24,10 +24,8 @@ Network::FilterFactoryCb ExtAuthzConfigFactory::createFilterFactoryFromProtoType ConfigSharedPtr ext_authz_config(new Config(proto_config, context.scope())); const uint32_t timeout_ms = PROTOBUF_GET_MS_OR_DEFAULT(proto_config.grpc_service(), timeout, 200); - return [ grpc_service = proto_config.grpc_service(), &context, ext_authz_config, - timeout_ms ](Network::FilterManager & filter_manager) - ->void { - + return [grpc_service = proto_config.grpc_service(), &context, ext_authz_config, + timeout_ms](Network::FilterManager& filter_manager) -> void { auto async_client_factory = context.clusterManager().grpcAsyncClientManager().factoryForGrpcService( grpc_service, context.scope(), true); diff --git a/source/extensions/filters/network/ext_authz/ext_authz.h b/source/extensions/filters/network/ext_authz/ext_authz.h index 65df54414fe..c685a9a3e72 100644 --- a/source/extensions/filters/network/ext_authz/ext_authz.h +++ b/source/extensions/filters/network/ext_authz/ext_authz.h @@ -113,7 +113,7 @@ class Filter : public Network::ReadFilter, bool calling_check_{}; envoy::service::auth::v2alpha::CheckRequest check_request_{}; }; -} +} // namespace ExtAuthz } // namespace NetworkFilters } // namespace Extensions } // namespace Envoy diff --git a/source/extensions/tracers/common/ot/opentracing_driver_impl.h b/source/extensions/tracers/common/ot/opentracing_driver_impl.h index faeaf51b551..54c5e57528e 100644 --- a/source/extensions/tracers/common/ot/opentracing_driver_impl.h +++ b/source/extensions/tracers/common/ot/opentracing_driver_impl.h @@ -76,7 +76,7 @@ class OpenTracingDriver : public Tracing::Driver, protected Logger::Loggable options_; const PropagationMode propagation_mode_; }; -} +} // namespace Lightstep } // namespace Tracers } // namespace Extensions } // namespace Envoy diff --git a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h index 32590b2afda..7c7ecc4a432 100644 --- a/source/extensions/tracers/zipkin/zipkin_tracer_impl.h +++ b/source/extensions/tracers/zipkin/zipkin_tracer_impl.h @@ -204,7 +204,7 @@ class ReporterImpl : public Reporter, Http::AsyncClient::Callbacks { SpanBuffer span_buffer_; const std::string collector_endpoint_; }; -} +} // namespace Zipkin } // namespace Tracers } // namespace Extensions } // namespace Envoy diff --git a/source/server/backtrace.h b/source/server/backtrace.h index 7fb2c6a9648..24eb010436a 100644 --- a/source/server/backtrace.h +++ b/source/server/backtrace.h @@ -129,4 +129,4 @@ class BackwardsTrace : Logger::Loggable { static const int MAX_STACK_DEPTH = 64; backward::StackTrace stack_trace_; }; -} // Envoy +} // namespace Envoy diff --git a/source/server/connection_handler_impl.h b/source/server/connection_handler_impl.h index 9a2f4c19243..c841ee0bc55 100644 --- a/source/server/connection_handler_impl.h +++ b/source/server/connection_handler_impl.h @@ -168,5 +168,5 @@ class ConnectionHandlerImpl : public Network::ConnectionHandler, NonCopyable { std::atomic num_connections_{}; }; -} // Server +} // namespace Server } // namespace Envoy diff --git a/test/common/access_log/access_log_formatter_test.cc b/test/common/access_log/access_log_formatter_test.cc index 44c0ddf9eda..a620486df7f 100644 --- a/test/common/access_log/access_log_formatter_test.cc +++ b/test/common/access_log/access_log_formatter_test.cc @@ -16,10 +16,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace AccessLog { diff --git a/test/common/access_log/access_log_impl_test.cc b/test/common/access_log/access_log_impl_test.cc index cf9b939d825..f7d0ded0074 100644 --- a/test/common/access_log/access_log_impl_test.cc +++ b/test/common/access_log/access_log_impl_test.cc @@ -25,10 +25,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::SaveArg; -using testing::_; namespace Envoy { namespace AccessLog { diff --git a/test/common/access_log/access_log_manager_impl_test.cc b/test/common/access_log/access_log_manager_impl_test.cc index 02e358dbb2f..d4b644ad6db 100644 --- a/test/common/access_log/access_log_manager_impl_test.cc +++ b/test/common/access_log/access_log_manager_impl_test.cc @@ -11,8 +11,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Return; using testing::_; +using testing::Return; namespace Envoy { namespace AccessLog { diff --git a/test/common/buffer/owned_impl_test.cc b/test/common/buffer/owned_impl_test.cc index 0cbbd7f97d7..227f9328466 100644 --- a/test/common/buffer/owned_impl_test.cc +++ b/test/common/buffer/owned_impl_test.cc @@ -8,8 +8,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Return; using testing::_; +using testing::Return; namespace Envoy { namespace Buffer { diff --git a/test/common/common/token_bucket_impl_test.cc b/test/common/common/token_bucket_impl_test.cc index 397d77718a6..e31717892be 100644 --- a/test/common/common/token_bucket_impl_test.cc +++ b/test/common/common/token_bucket_impl_test.cc @@ -8,8 +8,8 @@ #include "gtest/gtest.h" using ::testing::Mock; -using ::testing::Return; using testing::NiceMock; +using ::testing::Return; namespace Envoy { diff --git a/test/common/config/filesystem_subscription_test_harness.h b/test/common/config/filesystem_subscription_test_harness.h index 16a42f05438..3ad7886969d 100644 --- a/test/common/config/filesystem_subscription_test_harness.h +++ b/test/common/config/filesystem_subscription_test_harness.h @@ -14,9 +14,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Config { diff --git a/test/common/config/grpc_mux_impl_test.cc b/test/common/config/grpc_mux_impl_test.cc index d0a1be52d76..7eba78672f3 100644 --- a/test/common/config/grpc_mux_impl_test.cc +++ b/test/common/config/grpc_mux_impl_test.cc @@ -17,13 +17,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AtLeast; using testing::InSequence; using testing::Invoke; using testing::IsSubstring; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Config { diff --git a/test/common/config/grpc_subscription_test_harness.h b/test/common/config/grpc_subscription_test_harness.h index 06e22e0ef28..515888ccb82 100644 --- a/test/common/config/grpc_subscription_test_harness.h +++ b/test/common/config/grpc_subscription_test_harness.h @@ -16,11 +16,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Mock; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Config { diff --git a/test/common/config/http_subscription_test_harness.h b/test/common/config/http_subscription_test_harness.h index 180b7647bf1..2efa3b0ce7a 100644 --- a/test/common/config/http_subscription_test_harness.h +++ b/test/common/config/http_subscription_test_harness.h @@ -17,9 +17,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; -using testing::_; namespace Envoy { namespace Config { diff --git a/test/common/config/subscription_factory_test.cc b/test/common/config/subscription_factory_test.cc index 6a2384a35eb..136a60a36a8 100644 --- a/test/common/config/subscription_factory_test.cc +++ b/test/common/config/subscription_factory_test.cc @@ -16,9 +16,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using ::testing::_; using ::testing::Invoke; using ::testing::Return; -using ::testing::_; namespace Envoy { namespace Config { diff --git a/test/common/config/utility_test.cc b/test/common/config/utility_test.cc index d71ab74e2ac..631b1cdc778 100644 --- a/test/common/config/utility_test.cc +++ b/test/common/config/utility_test.cc @@ -19,11 +19,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AtLeast; using testing::Ref; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Config { diff --git a/test/common/filesystem/filesystem_impl_test.cc b/test/common/filesystem/filesystem_impl_test.cc index cd32ec5f0fe..e4a8f5cf354 100644 --- a/test/common/filesystem/filesystem_impl_test.cc +++ b/test/common/filesystem/filesystem_impl_test.cc @@ -17,6 +17,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; @@ -24,7 +25,6 @@ using testing::Return; using testing::SaveArg; using testing::Sequence; using testing::Throw; -using testing::_; namespace Envoy { diff --git a/test/common/grpc/async_client_impl_test.cc b/test/common/grpc/async_client_impl_test.cc index fcc1c475f59..c0f89abc080 100644 --- a/test/common/grpc/async_client_impl_test.cc +++ b/test/common/grpc/async_client_impl_test.cc @@ -8,11 +8,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnRef; using testing::Throw; -using testing::_; namespace Envoy { namespace Grpc { diff --git a/test/common/grpc/google_async_client_impl_test.cc b/test/common/grpc/google_async_client_impl_test.cc index 01a03a21850..9dc85bca0b0 100644 --- a/test/common/grpc/google_async_client_impl_test.cc +++ b/test/common/grpc/google_async_client_impl_test.cc @@ -11,8 +11,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Return; using testing::_; +using testing::Return; namespace Envoy { namespace Grpc { diff --git a/test/common/grpc/grpc_client_integration_test_harness.h b/test/common/grpc/grpc_client_integration_test_harness.h index 2c3dfcf8902..c82740d6685 100644 --- a/test/common/grpc/grpc_client_integration_test_harness.h +++ b/test/common/grpc/grpc_client_integration_test_harness.h @@ -19,12 +19,12 @@ #include "test/proto/helloworld.pb.h" #include "test/test_common/environment.h" +using testing::_; using testing::Invoke; using testing::InvokeWithoutArgs; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Grpc { diff --git a/test/common/http/async_client_impl_test.cc b/test/common/http/async_client_impl_test.cc index fc3b36990ba..7ade4bbefba 100644 --- a/test/common/http/async_client_impl_test.cc +++ b/test/common/http/async_client_impl_test.cc @@ -21,12 +21,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Ref; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/codec_client_test.cc b/test/common/http/codec_client_test.cc index e902232c770..5cc31cb0ef8 100644 --- a/test/common/http/codec_client_test.cc +++ b/test/common/http/codec_client_test.cc @@ -23,6 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AtMost; using testing::Invoke; using testing::InvokeWithoutArgs; @@ -32,7 +33,6 @@ using testing::Ref; using testing::Return; using testing::SaveArg; using testing::Throw; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/codes_test.cc b/test/common/http/codes_test.cc index 55d2795be3b..a9127ee1d2d 100644 --- a/test/common/http/codes_test.cc +++ b/test/common/http/codes_test.cc @@ -16,8 +16,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Property; using testing::_; +using testing::Property; namespace Envoy { namespace Http { diff --git a/test/common/http/conn_manager_impl_test.cc b/test/common/http/conn_manager_impl_test.cc index 013385aab62..9e23e99d74b 100644 --- a/test/common/http/conn_manager_impl_test.cc +++ b/test/common/http/conn_manager_impl_test.cc @@ -42,6 +42,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::AtLeast; using testing::DoAll; @@ -54,7 +55,6 @@ using testing::Return; using testing::ReturnRef; using testing::Sequence; using testing::Test; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc index 411d0f483a3..00bc9ac8a52 100644 --- a/test/common/http/conn_manager_utility_test.cc +++ b/test/common/http/conn_manager_utility_test.cc @@ -18,11 +18,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc index 2427f9c4f4a..0755246b623 100644 --- a/test/common/http/http1/codec_impl_test.cc +++ b/test/common/http/http1/codec_impl_test.cc @@ -16,12 +16,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/http1/conn_pool_test.cc b/test/common/http/http1/conn_pool_test.cc index 0c396d8818f..e2706d83e4b 100644 --- a/test/common/http/http1/conn_pool_test.cc +++ b/test/common/http/http1/conn_pool_test.cc @@ -22,6 +22,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -30,7 +31,6 @@ using testing::Property; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/http2/codec_impl_fuzz_test.cc b/test/common/http/http2/codec_impl_fuzz_test.cc index 209846de9f2..0e0b6f9952d 100644 --- a/test/common/http/http2/codec_impl_fuzz_test.cc +++ b/test/common/http/http2/codec_impl_fuzz_test.cc @@ -22,9 +22,9 @@ #include "gmock/gmock.h" +using testing::_; using testing::Invoke; using testing::InvokeWithoutArgs; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/http2/codec_impl_test.cc b/test/common/http/http2/codec_impl_test.cc index f9bb1f0a4c3..186bb097f9f 100644 --- a/test/common/http/http2/codec_impl_test.cc +++ b/test/common/http/http2/codec_impl_test.cc @@ -17,6 +17,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::AtLeast; using testing::InSequence; @@ -24,7 +25,6 @@ using testing::Invoke; using testing::InvokeWithoutArgs; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/http2/conn_pool_test.cc b/test/common/http/http2/conn_pool_test.cc index 659676f8b8b..67e37b7bb31 100644 --- a/test/common/http/http2/conn_pool_test.cc +++ b/test/common/http/http2/conn_pool_test.cc @@ -19,6 +19,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -27,7 +28,6 @@ using testing::Property; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/user_agent_test.cc b/test/common/http/user_agent_test.cc index a479a7cde22..db581d3fb9e 100644 --- a/test/common/http/user_agent_test.cc +++ b/test/common/http/user_agent_test.cc @@ -7,9 +7,9 @@ #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Property; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index c50be78887a..2a3473d8016 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -14,9 +14,9 @@ #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::InvokeWithoutArgs; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/common/network/connection_impl_test.cc b/test/common/network/connection_impl_test.cc index abb352e02f0..fd4f98ba85b 100644 --- a/test/common/network/connection_impl_test.cc +++ b/test/common/network/connection_impl_test.cc @@ -25,6 +25,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::DoAll; using testing::InSequence; @@ -35,7 +36,6 @@ using testing::SaveArg; using testing::Sequence; using testing::StrictMock; using testing::Test; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/common/network/dns_impl_test.cc b/test/common/network/dns_impl_test.cc index 026cfa58bc9..b718ed21a80 100644 --- a/test/common/network/dns_impl_test.cc +++ b/test/common/network/dns_impl_test.cc @@ -31,11 +31,11 @@ #include "ares_dns.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Mock; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc index 7da939a2413..06837dfbd45 100644 --- a/test/common/network/filter_manager_impl_test.cc +++ b/test/common/network/filter_manager_impl_test.cc @@ -23,12 +23,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/common/network/listen_socket_impl_test.cc b/test/common/network/listen_socket_impl_test.cc index f723398fbc2..3a42ebf6ba2 100644 --- a/test/common/network/listen_socket_impl_test.cc +++ b/test/common/network/listen_socket_impl_test.cc @@ -10,8 +10,8 @@ #include "gtest/gtest.h" -using testing::Return; using testing::_; +using testing::Return; namespace Envoy { namespace Network { diff --git a/test/common/network/listener_impl_test.cc b/test/common/network/listener_impl_test.cc index 76b4bfc1345..dcf6c7bb8e4 100644 --- a/test/common/network/listener_impl_test.cc +++ b/test/common/network/listener_impl_test.cc @@ -11,9 +11,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/common/network/socket_option_test.h b/test/common/network/socket_option_test.h index 4ba3f83f907..0f21917c767 100644 --- a/test/common/network/socket_option_test.h +++ b/test/common/network/socket_option_test.h @@ -8,10 +8,10 @@ #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/common/ratelimit/ratelimit_impl_test.cc b/test/common/ratelimit/ratelimit_impl_test.cc index 02e09fb4fcc..7c2fe8e9d7b 100644 --- a/test/common/ratelimit/ratelimit_impl_test.cc +++ b/test/common/ratelimit/ratelimit_impl_test.cc @@ -17,12 +17,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AtLeast; using testing::Invoke; using testing::Ref; using testing::Return; using testing::WithArg; -using testing::_; namespace Envoy { namespace RateLimit { diff --git a/test/common/request_info/utility_test.cc b/test/common/request_info/utility_test.cc index e9058a1f1ed..d2e677d2d32 100644 --- a/test/common/request_info/utility_test.cc +++ b/test/common/request_info/utility_test.cc @@ -6,9 +6,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace RequestInfo { diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 16874a5224e..5fe3ff01862 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -29,6 +29,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ContainerEq; using testing::ElementsAreArray; using testing::MockFunction; @@ -36,7 +37,6 @@ using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::StrNe; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/rds_impl_test.cc b/test/common/router/rds_impl_test.cc index f68a73851c6..a0657aa985a 100644 --- a/test/common/router/rds_impl_test.cc +++ b/test/common/router/rds_impl_test.cc @@ -24,12 +24,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/retry_state_impl_test.cc b/test/common/router/retry_state_impl_test.cc index 99899fb3a6a..92d8b6b7045 100644 --- a/test/common/router/retry_state_impl_test.cc +++ b/test/common/router/retry_state_impl_test.cc @@ -13,9 +13,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc index 5142ae43d6f..e302f382c85 100644 --- a/test/common/router/router_ratelimit_test.cc +++ b/test/common/router/router_ratelimit_test.cc @@ -19,9 +19,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index 0903639555f..467b2fa68aa 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -27,6 +27,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AssertionFailure; using testing::AssertionResult; using testing::AssertionSuccess; @@ -39,7 +40,6 @@ using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/router_upstream_log_test.cc b/test/common/router/router_upstream_log_test.cc index d65e77eccec..f10fd7f6701 100644 --- a/test/common/router/router_upstream_log_test.cc +++ b/test/common/router/router_upstream_log_test.cc @@ -22,11 +22,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc index 1f1b9c480cc..53f979e8826 100644 --- a/test/common/router/shadow_writer_impl_test.cc +++ b/test/common/router/shadow_writer_impl_test.cc @@ -10,8 +10,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Router { diff --git a/test/common/runtime/runtime_impl_test.cc b/test/common/runtime/runtime_impl_test.cc index 6606e2b57ba..85ec22b011f 100644 --- a/test/common/runtime/runtime_impl_test.cc +++ b/test/common/runtime/runtime_impl_test.cc @@ -14,11 +14,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnNew; -using testing::_; namespace Envoy { namespace Runtime { diff --git a/test/common/ssl/ssl_socket_test.cc b/test/common/ssl/ssl_socket_test.cc index 190d8047184..f0a1df4d2f5 100644 --- a/test/common/ssl/ssl_socket_test.cc +++ b/test/common/ssl/ssl_socket_test.cc @@ -31,12 +31,12 @@ #include "gtest/gtest.h" #include "openssl/ssl.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::StrictMock; -using testing::_; namespace Envoy { namespace Ssl { diff --git a/test/common/stats/thread_local_store_test.cc b/test/common/stats/thread_local_store_test.cc index a32cc1bd4bb..ce27b93452f 100644 --- a/test/common/stats/thread_local_store_test.cc +++ b/test/common/stats/thread_local_store_test.cc @@ -17,12 +17,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Ref; using testing::Return; -using testing::_; namespace Envoy { namespace Stats { diff --git a/test/common/tcp/conn_pool_test.cc b/test/common/tcp/conn_pool_test.cc index 1e0f9218f7e..a3ba30df633 100644 --- a/test/common/tcp/conn_pool_test.cc +++ b/test/common/tcp/conn_pool_test.cc @@ -17,6 +17,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -25,7 +26,6 @@ using testing::Property; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Tcp { diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc index 73568c61de7..3d810c8e9e5 100644 --- a/test/common/tcp_proxy/tcp_proxy_test.cc +++ b/test/common/tcp_proxy/tcp_proxy_test.cc @@ -26,6 +26,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::MatchesRegex; using testing::NiceMock; @@ -33,7 +34,6 @@ using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace TcpProxy { diff --git a/test/common/thread_local/thread_local_impl_test.cc b/test/common/thread_local/thread_local_impl_test.cc index 5726f416589..0eb123a9ca5 100644 --- a/test/common/thread_local/thread_local_impl_test.cc +++ b/test/common/thread_local/thread_local_impl_test.cc @@ -5,10 +5,10 @@ #include "gmock/gmock.h" +using testing::_; using testing::InSequence; using testing::Ref; using testing::ReturnPointee; -using testing::_; namespace Envoy { namespace ThreadLocal { diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index 1b6e2e61c67..6a9561bf971 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -23,13 +23,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::Test; -using testing::_; namespace Envoy { namespace Tracing { diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index 574935c6ef2..6b3309c4f9e 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -16,11 +16,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index a3700d53a10..d2aca58d3fe 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -30,6 +30,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::Mock; @@ -39,7 +40,6 @@ using testing::Return; using testing::ReturnNew; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc index 8af7cd508cf..7300a9eb828 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -18,9 +18,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index 1b419f63339..4c3332b2727 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -14,11 +14,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; using ::testing::AtLeast; diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index 111d2ac1f99..1975164850b 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -26,6 +26,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -36,7 +37,6 @@ using testing::Return; using testing::ReturnRef; using testing::SaveArg; using testing::WithArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc index 36be333d5b1..9e2eada4835 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -11,11 +11,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; // The tests in this file provide just coverage over some corner cases in error handling. The test // for the happy path for LoadStatsReporter is provided in //test/integration:load_stats_reporter. diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc index ca84b1a5de3..7ae43186c52 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -24,9 +24,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc index d3816097ea5..da1d163776f 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -25,12 +25,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index 6538c98da35..38b2e6dd957 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -20,11 +20,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc index b8c3e6cdc82..c26d1b307de 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -15,9 +15,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/sds_test.cc b/test/common/upstream/sds_test.cc index af944aaa86b..6226c2b7e12 100644 --- a/test/common/upstream/sds_test.cc +++ b/test/common/upstream/sds_test.cc @@ -28,6 +28,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -36,7 +37,6 @@ using testing::Return; using testing::ReturnRef; using testing::SaveArg; using testing::WithArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index cdcf31bea3c..b17de82617d 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -22,11 +22,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::EndsWith; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index cbf04dbed54..921b3276646 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -31,11 +31,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ContainerEq; using testing::Invoke; using testing::NiceMock; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index 98a0576b957..22c84839c10 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -18,11 +18,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace ConfigTest { diff --git a/test/exe/signals_test.cc b/test/exe/signals_test.cc index 4eaa3e150f3..b4bd02158e5 100644 --- a/test/exe/signals_test.cc +++ b/test/exe/signals_test.cc @@ -124,4 +124,4 @@ TEST(Signals, HandlerTest) { SignalAction::sigHandler(SIGURG, &fake_si, nullptr); } -} // Envoy +} // namespace Envoy diff --git a/test/extensions/access_loggers/http_grpc/config_test.cc b/test/extensions/access_loggers/http_grpc/config_test.cc index b0aba3ba434..b337fe4cf9d 100644 --- a/test/extensions/access_loggers/http_grpc/config_test.cc +++ b/test/extensions/access_loggers/http_grpc/config_test.cc @@ -10,9 +10,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/access_loggers/http_grpc/grpc_access_log_impl_test.cc b/test/extensions/access_loggers/http_grpc/grpc_access_log_impl_test.cc index bfbb62bc7ee..95cffa3e29a 100644 --- a/test/extensions/access_loggers/http_grpc/grpc_access_log_impl_test.cc +++ b/test/extensions/access_loggers/http_grpc/grpc_access_log_impl_test.cc @@ -9,11 +9,11 @@ #include "test/mocks/thread_local/mocks.h" using namespace std::chrono_literals; +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc index 6b6c5f82573..de17b137797 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_grpc_impl_test.cc @@ -13,6 +13,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Ref; using testing::Return; @@ -20,7 +21,6 @@ using testing::ReturnPointee; using testing::ReturnRef; using testing::WhenDynamicCastTo; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc index 93b6c12d3a6..bd021ca5771 100644 --- a/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc +++ b/test/extensions/filters/common/ext_authz/ext_authz_http_impl_test.cc @@ -14,6 +14,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Ref; using testing::Return; @@ -21,7 +22,6 @@ using testing::ReturnPointee; using testing::ReturnRef; using testing::WhenDynamicCastTo; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/common/lua/lua_test.cc b/test/extensions/filters/common/lua/lua_test.cc index df87cfec01f..e3a83796707 100644 --- a/test/extensions/filters/common/lua/lua_test.cc +++ b/test/extensions/filters/common/lua/lua_test.cc @@ -6,9 +6,9 @@ #include "gmock/gmock.h" +using testing::_; using testing::InSequence; using testing::NiceMock; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/common/rbac/engine_impl_test.cc b/test/extensions/filters/common/rbac/engine_impl_test.cc index cf848847728..5f86e767851 100644 --- a/test/extensions/filters/common/rbac/engine_impl_test.cc +++ b/test/extensions/filters/common/rbac/engine_impl_test.cc @@ -8,10 +8,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Const; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/common/rbac/matchers_test.cc b/test/extensions/filters/common/rbac/matchers_test.cc index dae4eb73e07..8aeae16c80f 100644 --- a/test/extensions/filters/common/rbac/matchers_test.cc +++ b/test/extensions/filters/common/rbac/matchers_test.cc @@ -8,10 +8,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Const; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/buffer/buffer_filter_test.cc b/test/extensions/filters/http/buffer/buffer_filter_test.cc index c7479303c51..38eb0a70ee9 100644 --- a/test/extensions/filters/http/buffer/buffer_filter_test.cc +++ b/test/extensions/filters/http/buffer/buffer_filter_test.cc @@ -16,12 +16,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::NiceMock; using testing::Return; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/buffer/config_test.cc b/test/extensions/filters/http/buffer/config_test.cc index 11842bc197e..0616524dc51 100644 --- a/test/extensions/filters/http/buffer/config_test.cc +++ b/test/extensions/filters/http/buffer/config_test.cc @@ -8,8 +8,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::NiceMock; using testing::_; +using testing::NiceMock; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/cors/cors_filter_test.cc b/test/extensions/filters/http/cors/cors_filter_test.cc index 885f8830051..246986831df 100644 --- a/test/extensions/filters/http/cors/cors_filter_test.cc +++ b/test/extensions/filters/http/cors/cors_filter_test.cc @@ -9,6 +9,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::Invoke; @@ -16,7 +17,6 @@ using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc index 5215f814eee..f41e5a8eb9d 100644 --- a/test/extensions/filters/http/dynamo/dynamo_filter_test.cc +++ b/test/extensions/filters/http/dynamo/dynamo_filter_test.cc @@ -15,11 +15,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Property; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/dynamo/dynamo_utility_test.cc b/test/extensions/filters/http/dynamo/dynamo_utility_test.cc index f987bee21b8..83014009e7d 100644 --- a/test/extensions/filters/http/dynamo/dynamo_utility_test.cc +++ b/test/extensions/filters/http/dynamo/dynamo_utility_test.cc @@ -7,9 +7,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/ext_authz/config_test.cc b/test/extensions/filters/http/ext_authz/config_test.cc index 4305e1ba335..1adbf4a11e0 100644 --- a/test/extensions/filters/http/ext_authz/config_test.cc +++ b/test/extensions/filters/http/ext_authz/config_test.cc @@ -8,8 +8,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/ext_authz/ext_authz_test.cc b/test/extensions/filters/http/ext_authz/ext_authz_test.cc index 89fc15cacbf..7926855e97a 100644 --- a/test/extensions/filters/http/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/http/ext_authz/ext_authz_test.cc @@ -28,6 +28,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; @@ -36,7 +37,6 @@ using testing::ReturnRef; using testing::TestWithParam; using testing::Values; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/fault/config_test.cc b/test/extensions/filters/http/fault/config_test.cc index 34b9c608313..55ff3fd376e 100644 --- a/test/extensions/filters/http/fault/config_test.cc +++ b/test/extensions/filters/http/fault/config_test.cc @@ -7,8 +7,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/fault/fault_filter_test.cc b/test/extensions/filters/http/fault/fault_filter_test.cc index ec3e4066974..127d38b3269 100644 --- a/test/extensions/filters/http/fault/fault_filter_test.cc +++ b/test/extensions/filters/http/fault/fault_filter_test.cc @@ -23,13 +23,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc index 5b96b1a9b09..13a14036a43 100644 --- a/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc +++ b/test/extensions/filters/http/grpc_http1_bridge/http1_bridge_filter_test.cc @@ -11,11 +11,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc index a4bc68362c2..9eb136c6b72 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/grpc_json_transcoder_integration_test.cc @@ -164,7 +164,8 @@ TEST_P(GrpcJsonTranscoderIntegrationTest, UnaryGet) { testTranscoding( Http::TestHeaderMapImpl{{":method", "GET"}, {":path", "/shelves"}, {":authority", "host"}}, "", {""}, {R"(shelves { id: 20 theme: "Children" } - shelves { id: 1 theme: "Foo" } )"}, Status(), + shelves { id: 1 theme: "Foo" } )"}, + Status(), Http::TestHeaderMapImpl{{":status", "200"}, {"content-type", "application/json"}, {"content-length", "69"}, diff --git a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc index f388588a085..6e8edc96cf9 100644 --- a/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc +++ b/test/extensions/filters/http/grpc_json_transcoder/json_transcoder_filter_test.cc @@ -21,12 +21,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; using Envoy::Protobuf::MethodDescriptor; diff --git a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc index c36eb271448..b7e355d215e 100644 --- a/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc +++ b/test/extensions/filters/http/grpc_web/grpc_web_filter_test.cc @@ -17,12 +17,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Combine; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::Values; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc index 308cae7cd35..715a2d45cc4 100644 --- a/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc +++ b/test/extensions/filters/http/header_to_metadata/header_to_metadata_filter_test.cc @@ -9,8 +9,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::NiceMock; using testing::_; +using testing::NiceMock; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/health_check/config_test.cc b/test/extensions/filters/http/health_check/config_test.cc index a966cae896c..b2b7b339356 100644 --- a/test/extensions/filters/http/health_check/config_test.cc +++ b/test/extensions/filters/http/health_check/config_test.cc @@ -6,8 +6,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/health_check/health_check_test.cc b/test/extensions/filters/http/health_check/health_check_test.cc index aef501a25b0..cc6fdc5d5b4 100644 --- a/test/extensions/filters/http/health_check/health_check_test.cc +++ b/test/extensions/filters/http/health_check/health_check_test.cc @@ -15,13 +15,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::DoAll; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc index 2c2a95c7fa4..a349db9a1ef 100644 --- a/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc +++ b/test/extensions/filters/http/ip_tagging/ip_tagging_filter_test.cc @@ -14,9 +14,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/jwt_authn/authenticator_test.cc b/test/extensions/filters/http/jwt_authn/authenticator_test.cc index db411c32603..02abd237488 100644 --- a/test/extensions/filters/http/jwt_authn/authenticator_test.cc +++ b/test/extensions/filters/http/jwt_authn/authenticator_test.cc @@ -13,9 +13,9 @@ using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication; using ::google::jwt_verify::Status; +using ::testing::_; using ::testing::Invoke; using ::testing::NiceMock; -using ::testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/jwt_authn/extractor_test.cc b/test/extensions/filters/http/jwt_authn/extractor_test.cc index d58acd3542d..fe1937f3b71 100644 --- a/test/extensions/filters/http/jwt_authn/extractor_test.cc +++ b/test/extensions/filters/http/jwt_authn/extractor_test.cc @@ -4,12 +4,12 @@ #include "test/test_common/utility.h" -using ::Envoy::Http::TestHeaderMapImpl; using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication; +using ::Envoy::Http::TestHeaderMapImpl; +using ::testing::_; using ::testing::Invoke; using ::testing::NiceMock; -using ::testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc index de5071941e7..dfb2c94ff58 100644 --- a/test/extensions/filters/http/jwt_authn/filter_factory_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_factory_test.cc @@ -10,8 +10,8 @@ using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication; using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtProvider; -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/jwt_authn/filter_test.cc b/test/extensions/filters/http/jwt_authn/filter_test.cc index 8d9c6a2c776..80bbe941fb6 100644 --- a/test/extensions/filters/http/jwt_authn/filter_test.cc +++ b/test/extensions/filters/http/jwt_authn/filter_test.cc @@ -9,8 +9,8 @@ using ::envoy::config::filter::http::jwt_authn::v2alpha::JwtAuthentication; using ::google::jwt_verify::Status; -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/lua/lua_filter_test.cc b/test/extensions/filters/http/lua/lua_filter_test.cc index 0283baa92e3..5894fef3f66 100644 --- a/test/extensions/filters/http/lua/lua_filter_test.cc +++ b/test/extensions/filters/http/lua/lua_filter_test.cc @@ -14,6 +14,7 @@ #include "gmock/gmock.h" +using testing::_; using testing::AtLeast; using testing::InSequence; using testing::Invoke; @@ -21,7 +22,6 @@ using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::StrEq; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/ratelimit/ratelimit_test.cc b/test/extensions/filters/http/ratelimit/ratelimit_test.cc index ba3ffd6e16f..8d49e933ac4 100644 --- a/test/extensions/filters/http/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/http/ratelimit/ratelimit_test.cc @@ -21,6 +21,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; @@ -28,7 +29,6 @@ using testing::Return; using testing::ReturnRef; using testing::SetArgReferee; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/rbac/config_test.cc b/test/extensions/filters/http/rbac/config_test.cc index 4fd404a237b..6085958c107 100644 --- a/test/extensions/filters/http/rbac/config_test.cc +++ b/test/extensions/filters/http/rbac/config_test.cc @@ -6,8 +6,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::NiceMock; using testing::_; +using testing::NiceMock; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/rbac/rbac_filter_test.cc b/test/extensions/filters/http/rbac/rbac_filter_test.cc index 1b597ea7afb..0fbf392bec6 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_test.cc @@ -10,10 +10,10 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/http/squash/squash_filter_test.cc b/test/extensions/filters/http/squash/squash_filter_test.cc index 49cf2269f9b..1144d46a2d8 100644 --- a/test/extensions/filters/http/squash/squash_filter_test.cc +++ b/test/extensions/filters/http/squash/squash_filter_test.cc @@ -16,10 +16,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; using Envoy::Protobuf::util::MessageDifferencer; diff --git a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc index 57916b0bb49..fa0cd1ebd2b 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -28,13 +28,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::AtLeast; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc index c4d23873317..7abba121729 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_benchmark.cc @@ -14,6 +14,7 @@ #include "openssl/ssl.h" #include "testing/base/public/benchmark.h" +using testing::_; using testing::AtLeast; using testing::Invoke; using testing::NiceMock; @@ -21,7 +22,6 @@ using testing::Return; using testing::ReturnNew; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc index 0833711f39f..67840cf2a84 100644 --- a/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc +++ b/test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc @@ -9,6 +9,7 @@ #include "gtest/gtest.h" #include "openssl/ssl.h" +using testing::_; using testing::AtLeast; using testing::Eq; using testing::InSequence; @@ -19,7 +20,6 @@ using testing::Return; using testing::ReturnNew; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc index 88bcb8f9133..516fb499885 100644 --- a/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc +++ b/test/extensions/filters/network/client_ssl_auth/client_ssl_auth_test.cc @@ -21,13 +21,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::Return; using testing::ReturnNew; using testing::ReturnRef; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/ext_authz/config_test.cc b/test/extensions/filters/network/ext_authz/config_test.cc index 453219de4de..2d955119a1a 100644 --- a/test/extensions/filters/network/ext_authz/config_test.cc +++ b/test/extensions/filters/network/ext_authz/config_test.cc @@ -8,8 +8,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/ext_authz/ext_authz_test.cc b/test/extensions/filters/network/ext_authz/ext_authz_test.cc index 633c875d8fe..db8599cd0f0 100644 --- a/test/extensions/filters/network/ext_authz/ext_authz_test.cc +++ b/test/extensions/filters/network/ext_authz/ext_authz_test.cc @@ -22,13 +22,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/http_connection_manager/config_test.cc b/test/extensions/filters/network/http_connection_manager/config_test.cc index 1fc646bdba6..37e720e18f2 100644 --- a/test/extensions/filters/network/http_connection_manager/config_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_test.cc @@ -15,9 +15,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ContainerEq; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/mongo_proxy/proxy_test.cc b/test/extensions/filters/network/mongo_proxy/proxy_test.cc index a74144e2637..86bd5552c04 100644 --- a/test/extensions/filters/network/mongo_proxy/proxy_test.cc +++ b/test/extensions/filters/network/mongo_proxy/proxy_test.cc @@ -20,13 +20,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::AtLeast; using testing::Invoke; using testing::NiceMock; using testing::Property; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { @@ -221,7 +221,6 @@ TEST_F(MongoProxyFilterTest, Stats) { message->cursorId(1); message->documents().push_back(Bson::DocumentImpl::create()->addString("hello", "world")); filter_->callbacks_->decodeReply(std::move(message)); - })); filter_->onWrite(fake_data_, false); @@ -378,7 +377,6 @@ TEST_F(MongoProxyFilterTest, CallingFunctionStats) { message->cursorId(1); message->documents().push_back(Bson::DocumentImpl::create()->addString("hello", "world")); filter_->callbacks_->decodeReply(std::move(message)); - })); filter_->onWrite(fake_data_, false); } diff --git a/test/extensions/filters/network/ratelimit/ratelimit_test.cc b/test/extensions/filters/network/ratelimit/ratelimit_test.cc index dfd3a306b8b..ec8aa55408e 100644 --- a/test/extensions/filters/network/ratelimit/ratelimit_test.cc +++ b/test/extensions/filters/network/ratelimit/ratelimit_test.cc @@ -19,12 +19,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::WithArgs; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/rbac/config_test.cc b/test/extensions/filters/network/rbac/config_test.cc index b573dbf9f62..e7ebabd2adf 100644 --- a/test/extensions/filters/network/rbac/config_test.cc +++ b/test/extensions/filters/network/rbac/config_test.cc @@ -8,8 +8,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::NiceMock; using testing::_; +using testing::NiceMock; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc index f9a401ac325..85788f756be 100644 --- a/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/command_splitter_impl_test.cc @@ -16,6 +16,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ByRef; using testing::DoAll; using testing::Eq; @@ -23,7 +24,6 @@ using testing::InSequence; using testing::Ref; using testing::Return; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc index 2e91f821ddc..432b4ca3861 100644 --- a/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc +++ b/test/extensions/filters/network/redis_proxy/conn_pool_impl_test.cc @@ -15,6 +15,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Eq; using testing::InSequence; using testing::Invoke; @@ -22,7 +23,6 @@ using testing::Ref; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/redis_proxy/mocks.cc b/test/extensions/filters/network/redis_proxy/mocks.cc index 5cc170a3240..c3283870c80 100644 --- a/test/extensions/filters/network/redis_proxy/mocks.cc +++ b/test/extensions/filters/network/redis_proxy/mocks.cc @@ -7,8 +7,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc index 64dfd517144..e2ffcd6b8d7 100644 --- a/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc +++ b/test/extensions/filters/network/redis_proxy/proxy_filter_test.cc @@ -15,6 +15,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ByRef; using testing::DoAll; using testing::Eq; @@ -24,7 +25,6 @@ using testing::NiceMock; using testing::Ref; using testing::Return; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc index 989dfb779ac..04993579634 100644 --- a/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc +++ b/test/extensions/filters/network/thrift_proxy/conn_manager_test.cc @@ -16,11 +16,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/thrift_proxy/decoder_test.cc b/test/extensions/filters/network/thrift_proxy/decoder_test.cc index 2f13f731225..40a7f318cbb 100644 --- a/test/extensions/filters/network/thrift_proxy/decoder_test.cc +++ b/test/extensions/filters/network/thrift_proxy/decoder_test.cc @@ -12,6 +12,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::Combine; using testing::DoAll; @@ -29,7 +30,6 @@ using testing::Test; using testing::TestParamInfo; using testing::TestWithParam; using testing::Values; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/thrift_proxy/mocks.cc b/test/extensions/filters/network/thrift_proxy/mocks.cc index 85cdd7377a3..aae1a41e992 100644 --- a/test/extensions/filters/network/thrift_proxy/mocks.cc +++ b/test/extensions/filters/network/thrift_proxy/mocks.cc @@ -2,10 +2,10 @@ #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/filters/network/thrift_proxy/router_test.cc b/test/extensions/filters/network/thrift_proxy/router_test.cc index d1a83977fe8..1822f6d9bb3 100644 --- a/test/extensions/filters/network/thrift_proxy/router_test.cc +++ b/test/extensions/filters/network/thrift_proxy/router_test.cc @@ -19,6 +19,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ContainsRegex; using testing::Invoke; using testing::NiceMock; @@ -28,7 +29,6 @@ using testing::ReturnRef; using testing::Test; using testing::TestWithParam; using testing::Values; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/health_checkers/redis/redis_test.cc b/test/extensions/health_checkers/redis/redis_test.cc index 015a7c08c9b..a8759d4c90a 100644 --- a/test/extensions/health_checkers/redis/redis_test.cc +++ b/test/extensions/health_checkers/redis/redis_test.cc @@ -7,6 +7,7 @@ #include "test/mocks/runtime/mocks.h" #include "test/mocks/upstream/mocks.h" +using testing::_; using testing::DoAll; using testing::InSequence; using testing::NiceMock; @@ -15,7 +16,6 @@ using testing::Return; using testing::ReturnRef; using testing::SaveArg; using testing::WithArg; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/common/statsd/statsd_test.cc b/test/extensions/stats_sinks/common/statsd/statsd_test.cc index 82015050207..36503764de5 100644 --- a/test/extensions/stats_sinks/common/statsd/statsd_test.cc +++ b/test/extensions/stats_sinks/common/statsd/statsd_test.cc @@ -17,11 +17,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc index c54a1687772..a8abc7f8205 100644 --- a/test/extensions/stats_sinks/dog_statsd/config_test.cc +++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc @@ -16,10 +16,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc index ec224c4ddb9..abcdcca1691 100644 --- a/test/extensions/stats_sinks/hystrix/config_test.cc +++ b/test/extensions/stats_sinks/hystrix/config_test.cc @@ -15,10 +15,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/hystrix/hystrix_test.cc b/test/extensions/stats_sinks/hystrix/hystrix_test.cc index 5a704834669..81be09a24ae 100644 --- a/test/extensions/stats_sinks/hystrix/hystrix_test.cc +++ b/test/extensions/stats_sinks/hystrix/hystrix_test.cc @@ -12,11 +12,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc index aba7183e3d0..f2996770d3a 100644 --- a/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc +++ b/test/extensions/stats_sinks/metrics_service/grpc_metrics_service_impl_test.cc @@ -6,11 +6,11 @@ #include "test/mocks/thread_local/mocks.h" using namespace std::chrono_literals; +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc index fc4eeee983c..1c9e6ce118a 100644 --- a/test/extensions/stats_sinks/statsd/config_test.cc +++ b/test/extensions/stats_sinks/statsd/config_test.cc @@ -17,10 +17,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/tracers/dynamic_ot/config_test.cc b/test/extensions/tracers/dynamic_ot/config_test.cc index 47764aca930..d2c2077bcd7 100644 --- a/test/extensions/tracers/dynamic_ot/config_test.cc +++ b/test/extensions/tracers/dynamic_ot/config_test.cc @@ -7,9 +7,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/tracers/lightstep/config_test.cc b/test/extensions/tracers/lightstep/config_test.cc index 3651224f2ab..3eb338d87dd 100644 --- a/test/extensions/tracers/lightstep/config_test.cc +++ b/test/extensions/tracers/lightstep/config_test.cc @@ -5,9 +5,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc index fc1d0ba0349..2650ddc7df3 100644 --- a/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc +++ b/test/extensions/tracers/lightstep/lightstep_tracer_impl_test.cc @@ -27,13 +27,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AtLeast; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::Test; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc index a52333cf848..818cca0d9c8 100644 --- a/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc +++ b/test/extensions/tracers/zipkin/zipkin_tracer_impl_test.cc @@ -24,12 +24,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::Test; -using testing::_; namespace Envoy { namespace Extensions { diff --git a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc index 2604e837c8c..d98217a9f53 100644 --- a/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc +++ b/test/extensions/transport_sockets/alts/tsi_frame_protector_test.cc @@ -11,12 +11,12 @@ namespace Extensions { namespace TransportSockets { namespace Alts { +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::SaveArg; using testing::Test; -using testing::_; using namespace std::string_literals; /** diff --git a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc index 883462f77c0..61147929827 100644 --- a/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc +++ b/test/extensions/transport_sockets/alts/tsi_handshaker_test.cc @@ -11,12 +11,12 @@ namespace Extensions { namespace TransportSockets { namespace Alts { +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::SaveArg; using testing::Test; -using testing::_; class MockTsiHandshakerCallbacks : public TsiHandshakerCallbacks { public: diff --git a/test/integration/http_integration.cc b/test/integration/http_integration.cc index e1bfbab9e51..67ec481704d 100644 --- a/test/integration/http_integration.cc +++ b/test/integration/http_integration.cc @@ -28,11 +28,11 @@ #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::HasSubstr; using testing::Invoke; using testing::Not; -using testing::_; namespace Envoy { diff --git a/test/integration/integration.cc b/test/integration/integration.cc index b91be75da80..ab8754717ea 100644 --- a/test/integration/integration.cc +++ b/test/integration/integration.cc @@ -28,11 +28,11 @@ #include "gtest/gtest.h" +using testing::_; using testing::AnyNumber; using testing::AtLeast; using testing::Invoke; using testing::NiceMock; -using testing::_; namespace Envoy { diff --git a/test/integration/tcp_proxy_integration_test.cc b/test/integration/tcp_proxy_integration_test.cc index 4166a3beb0e..31fc601e0cc 100644 --- a/test/integration/tcp_proxy_integration_test.cc +++ b/test/integration/tcp_proxy_integration_test.cc @@ -12,10 +12,10 @@ #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::MatchesRegex; using testing::NiceMock; -using testing::_; namespace Envoy { namespace { diff --git a/test/mocks/access_log/mocks.cc b/test/mocks/access_log/mocks.cc index 70784ddada3..6f7edb0232a 100644 --- a/test/mocks/access_log/mocks.cc +++ b/test/mocks/access_log/mocks.cc @@ -3,9 +3,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace AccessLog { diff --git a/test/mocks/api/mocks.cc b/test/mocks/api/mocks.cc index 6373bf33d66..2a577efed11 100644 --- a/test/mocks/api/mocks.cc +++ b/test/mocks/api/mocks.cc @@ -6,8 +6,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Return; using testing::_; +using testing::Return; namespace Envoy { namespace Api { diff --git a/test/mocks/event/mocks.cc b/test/mocks/event/mocks.cc index 402d25b17a8..59d724f85e4 100644 --- a/test/mocks/event/mocks.cc +++ b/test/mocks/event/mocks.cc @@ -3,12 +3,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnNew; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Event { diff --git a/test/mocks/http/mocks.cc b/test/mocks/http/mocks.cc index eeac8a67236..5527abab5ee 100644 --- a/test/mocks/http/mocks.cc +++ b/test/mocks/http/mocks.cc @@ -6,11 +6,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Http { diff --git a/test/mocks/init/mocks.cc b/test/mocks/init/mocks.cc index c8ddb6b96ca..ce0cb291ebc 100644 --- a/test/mocks/init/mocks.cc +++ b/test/mocks/init/mocks.cc @@ -5,8 +5,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Init { diff --git a/test/mocks/network/mocks.cc b/test/mocks/network/mocks.cc index 31fba736120..43ade3273e4 100644 --- a/test/mocks/network/mocks.cc +++ b/test/mocks/network/mocks.cc @@ -13,12 +13,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Network { diff --git a/test/mocks/request_info/mocks.cc b/test/mocks/request_info/mocks.cc index e034c1e82d5..868422743c6 100644 --- a/test/mocks/request_info/mocks.cc +++ b/test/mocks/request_info/mocks.cc @@ -5,11 +5,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace RequestInfo { diff --git a/test/mocks/router/mocks.cc b/test/mocks/router/mocks.cc index e4afcf3d534..643f191d70d 100644 --- a/test/mocks/router/mocks.cc +++ b/test/mocks/router/mocks.cc @@ -5,12 +5,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::NiceMock; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Router { diff --git a/test/mocks/runtime/mocks.cc b/test/mocks/runtime/mocks.cc index 956b5474e59..56f299b4d38 100644 --- a/test/mocks/runtime/mocks.cc +++ b/test/mocks/runtime/mocks.cc @@ -3,9 +3,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Return; using testing::ReturnArg; -using testing::_; namespace Envoy { namespace Runtime { diff --git a/test/mocks/secret/mocks.cc b/test/mocks/secret/mocks.cc index 48b788874a6..3de2c5d039b 100644 --- a/test/mocks/secret/mocks.cc +++ b/test/mocks/secret/mocks.cc @@ -2,8 +2,8 @@ #include "common/secret/secret_provider_impl.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace Secret { diff --git a/test/mocks/server/mocks.cc b/test/mocks/server/mocks.cc index 65c55ba9f6e..b7f2db5efa7 100644 --- a/test/mocks/server/mocks.cc +++ b/test/mocks/server/mocks.cc @@ -7,13 +7,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnNew; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/mocks/stats/mocks.cc b/test/mocks/stats/mocks.cc index 9ec20c8dec6..d2269d308f7 100644 --- a/test/mocks/stats/mocks.cc +++ b/test/mocks/stats/mocks.cc @@ -3,12 +3,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Stats { diff --git a/test/mocks/tcp/mocks.cc b/test/mocks/tcp/mocks.cc index 1374d415dea..d9ffcc2f79e 100644 --- a/test/mocks/tcp/mocks.cc +++ b/test/mocks/tcp/mocks.cc @@ -4,9 +4,9 @@ using testing::ReturnRef; +using testing::_; using testing::Invoke; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Tcp { diff --git a/test/mocks/thread_local/mocks.cc b/test/mocks/thread_local/mocks.cc index 6c40f98875f..cfabd7a7f52 100644 --- a/test/mocks/thread_local/mocks.cc +++ b/test/mocks/thread_local/mocks.cc @@ -3,8 +3,8 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -using testing::Invoke; using testing::_; +using testing::Invoke; namespace Envoy { namespace ThreadLocal { diff --git a/test/mocks/upstream/cluster_info.cc b/test/mocks/upstream/cluster_info.cc index b0b45f0f26b..da27d7c4357 100644 --- a/test/mocks/upstream/cluster_info.cc +++ b/test/mocks/upstream/cluster_info.cc @@ -3,11 +3,11 @@ #include "common/network/raw_buffer_socket.h" #include "common/upstream/upstream_impl.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/mocks/upstream/host.cc b/test/mocks/upstream/host.cc index 71d7df2efe9..6bd306c87aa 100644 --- a/test/mocks/upstream/host.cc +++ b/test/mocks/upstream/host.cc @@ -2,10 +2,10 @@ #include "common/network/utility.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/mocks/upstream/mocks.cc b/test/mocks/upstream/mocks.cc index b487c0b16fc..5be57cff244 100644 --- a/test/mocks/upstream/mocks.cc +++ b/test/mocks/upstream/mocks.cc @@ -8,12 +8,12 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Upstream { diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index b40ee8ad1e5..746aae1dba4 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -14,13 +14,13 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ByRef; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Server { @@ -90,7 +90,6 @@ TEST_F(ConnectionHandlerTest, RemoveListener) { [&](Network::Socket&, Network::ListenerCallbacks& cb, bool, bool) -> Network::Listener* { listener_callbacks = &cb; return listener; - })); TestListener* test_listener = addListener(1, true, false, "test_listener"); EXPECT_CALL(test_listener->socket_, localAddress()); @@ -127,7 +126,6 @@ TEST_F(ConnectionHandlerTest, DestroyCloseConnections) { [&](Network::Socket&, Network::ListenerCallbacks& cb, bool, bool) -> Network::Listener* { listener_callbacks = &cb; return listener; - })); TestListener* test_listener = addListener(1, true, false, "test_listener"); EXPECT_CALL(test_listener->socket_, localAddress()); @@ -153,7 +151,6 @@ TEST_F(ConnectionHandlerTest, CloseDuringFilterChainCreate) { [&](Network::Socket&, Network::ListenerCallbacks& cb, bool, bool) -> Network::Listener* { listener_callbacks = &cb; return listener; - })); TestListener* test_listener = addListener(1, true, false, "test_listener"); EXPECT_CALL(test_listener->socket_, localAddress()); @@ -182,7 +179,6 @@ TEST_F(ConnectionHandlerTest, CloseConnectionOnEmptyFilterChain) { [&](Network::Socket&, Network::ListenerCallbacks& cb, bool, bool) -> Network::Listener* { listener_callbacks = &cb; return listener; - })); TestListener* test_listener = addListener(1, true, false, "test_listener"); EXPECT_CALL(test_listener->socket_, localAddress()); diff --git a/test/server/drain_manager_impl_test.cc b/test/server/drain_manager_impl_test.cc index 207e3d6deba..29ba7fd6599 100644 --- a/test/server/drain_manager_impl_test.cc +++ b/test/server/drain_manager_impl_test.cc @@ -7,10 +7,10 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Return; using testing::SaveArg; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/hot_restart_impl_test.cc b/test/server/hot_restart_impl_test.cc index c5ed4e40fd6..b9a2d6b5cea 100644 --- a/test/server/hot_restart_impl_test.cc +++ b/test/server/hot_restart_impl_test.cc @@ -12,12 +12,12 @@ #include "absl/strings/string_view.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::InvokeWithoutArgs; using testing::Return; using testing::ReturnRef; using testing::WithArg; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/http/admin_test.cc b/test/server/http/admin_test.cc index f237fc30ff8..def04abb45d 100644 --- a/test/server/http/admin_test.cc +++ b/test/server/http/admin_test.cc @@ -26,6 +26,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::HasSubstr; using testing::InSequence; using testing::Invoke; @@ -34,7 +35,6 @@ using testing::Ref; using testing::Return; using testing::ReturnPointee; using testing::ReturnRef; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/init_manager_impl_test.cc b/test/server/init_manager_impl_test.cc index 530e67df30c..afaa2e44a01 100644 --- a/test/server/init_manager_impl_test.cc +++ b/test/server/init_manager_impl_test.cc @@ -5,9 +5,9 @@ #include "gmock/gmock.h" +using testing::_; using testing::InSequence; using testing::Invoke; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc index 906cfd920d2..7c39a8235e3 100644 --- a/test/server/lds_api_test.cc +++ b/test/server/lds_api_test.cc @@ -11,11 +11,11 @@ #include "gmock/gmock.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::Return; using testing::Throw; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/listener_manager_impl_test.cc b/test/server/listener_manager_impl_test.cc index 4c113784edd..aba15f05284 100644 --- a/test/server/listener_manager_impl_test.cc +++ b/test/server/listener_manager_impl_test.cc @@ -26,13 +26,13 @@ #include "absl/strings/match.h" #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::NiceMock; using testing::Return; using testing::ReturnRef; using testing::Throw; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/overload_manager_impl_test.cc b/test/server/overload_manager_impl_test.cc index 3d3b5f37cab..a4c8fd67794 100644 --- a/test/server/overload_manager_impl_test.cc +++ b/test/server/overload_manager_impl_test.cc @@ -15,9 +15,9 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::Invoke; using testing::NiceMock; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/server_test.cc b/test/server/server_test.cc index a682d3184ae..b6726ed75ca 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -12,6 +12,7 @@ #include "gtest/gtest.h" +using testing::_; using testing::HasSubstr; using testing::InSequence; using testing::Invoke; @@ -20,7 +21,6 @@ using testing::Property; using testing::Ref; using testing::SaveArg; using testing::StrictMock; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/server/worker_impl_test.cc b/test/server/worker_impl_test.cc index 6a73bf302cf..50a2d7fff08 100644 --- a/test/server/worker_impl_test.cc +++ b/test/server/worker_impl_test.cc @@ -9,13 +9,13 @@ #include "gtest/gtest.h" +using testing::_; using testing::InSequence; using testing::Invoke; using testing::InvokeWithoutArgs; using testing::NiceMock; using testing::Return; using testing::Throw; -using testing::_; namespace Envoy { namespace Server { diff --git a/test/test_common/utility.h b/test/test_common/utility.h index c27d4be9319..3300c44678c 100644 --- a/test/test_common/utility.h +++ b/test/test_common/utility.h @@ -25,11 +25,11 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::AssertionFailure; using testing::AssertionResult; using testing::AssertionSuccess; using testing::Invoke; -using testing::_; namespace Envoy { #define EXPECT_THROW_WITH_MESSAGE(statement, expected_exception, message) \ diff --git a/tools/check_format.py b/tools/check_format.py index 5cd498832ba..c9e8fc24353 100755 --- a/tools/check_format.py +++ b/tools/check_format.py @@ -23,7 +23,7 @@ GOOGLE_PROTOBUF_WHITELIST = ("ci/prebuilt", "source/common/protobuf", "api/test") REPOSITORIES_BZL = "bazel/repositories.bzl" -CLANG_FORMAT_PATH = os.getenv("CLANG_FORMAT", "clang-format-5.0") +CLANG_FORMAT_PATH = os.getenv("CLANG_FORMAT", "clang-format-6.0") BUILDIFIER_PATH = os.getenv("BUILDIFIER_BIN", "$GOPATH/bin/buildifier") ENVOY_BUILD_FIXER_PATH = os.path.join( os.path.dirname(os.path.abspath(sys.argv[0])), "envoy_build_fixer.py")