From a51ba3bb174283823b76b00d4f35d3f7df6cb535 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Fri, 6 Jan 2017 15:32:40 -0800 Subject: [PATCH] Remove async_client_impl from upstream/mocks.h --- test/common/filter/auth/client_ssl_test.cc | 1 + test/common/grpc/rpc_channel_impl_test.cc | 1 + test/common/router/router_test.cc | 1 + test/common/router/shadow_writer_impl_test.cc | 1 + test/common/tracing/http_tracer_impl_test.cc | 1 + test/common/upstream/sds_test.cc | 1 + test/mocks/buffer/mocks.h | 2 ++ test/mocks/upstream/mocks.h | 2 +- test/server/http/admin_test.cc | 1 + test/server/http/health_check_test.cc | 1 + 10 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/common/filter/auth/client_ssl_test.cc b/test/common/filter/auth/client_ssl_test.cc index 46e2aa82aa5de..69c08cc69306d 100644 --- a/test/common/filter/auth/client_ssl_test.cc +++ b/test/common/filter/auth/client_ssl_test.cc @@ -1,5 +1,6 @@ #include "common/filesystem/filesystem_impl.h" #include "common/filter/auth/client_ssl.h" +#include "common/http/message_impl.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" diff --git a/test/common/grpc/rpc_channel_impl_test.cc b/test/common/grpc/rpc_channel_impl_test.cc index 0e17ef11d8849..85c193dcd4edc 100644 --- a/test/common/grpc/rpc_channel_impl_test.cc +++ b/test/common/grpc/rpc_channel_impl_test.cc @@ -1,5 +1,6 @@ #include "common/grpc/common.h" #include "common/grpc/rpc_channel_impl.h" +#include "common/http/message_impl.h" #include "test/generated/helloworld.pb.h" #include "test/mocks/grpc/mocks.h" diff --git a/test/common/router/router_test.cc b/test/common/router/router_test.cc index 3e16fe3b19921..9dc50e9fbc74c 100644 --- a/test/common/router/router_test.cc +++ b/test/common/router/router_test.cc @@ -1,3 +1,4 @@ +#include "common/buffer/buffer_impl.h" #include "common/router/router.h" #include "common/upstream/upstream_impl.h" diff --git a/test/common/router/shadow_writer_impl_test.cc b/test/common/router/shadow_writer_impl_test.cc index 484534fa25c70..4c4fd353ba925 100644 --- a/test/common/router/shadow_writer_impl_test.cc +++ b/test/common/router/shadow_writer_impl_test.cc @@ -1,4 +1,5 @@ #include "common/http/headers.h" +#include "common/http/message_impl.h" #include "common/router/shadow_writer_impl.h" #include "test/mocks/upstream/mocks.h" diff --git a/test/common/tracing/http_tracer_impl_test.cc b/test/common/tracing/http_tracer_impl_test.cc index 9c2ca9c30fe55..dc34abc888a28 100644 --- a/test/common/tracing/http_tracer_impl_test.cc +++ b/test/common/tracing/http_tracer_impl_test.cc @@ -1,5 +1,6 @@ #include "common/http/headers.h" #include "common/http/header_map_impl.h" +#include "common/http/message_impl.h" #include "common/runtime/runtime_impl.h" #include "common/runtime/uuid_util.h" #include "common/tracing/http_tracer_impl.h" diff --git a/test/common/upstream/sds_test.cc b/test/common/upstream/sds_test.cc index 2027039fce30c..88b8957e4fc5b 100644 --- a/test/common/upstream/sds_test.cc +++ b/test/common/upstream/sds_test.cc @@ -1,4 +1,5 @@ #include "common/filesystem/filesystem_impl.h" +#include "common/http/message_impl.h" #include "common/json/json_loader.h" #include "common/network/utility.h" #include "common/upstream/sds.h" diff --git a/test/mocks/buffer/mocks.h b/test/mocks/buffer/mocks.h index b42a8f3d40253..8372c551b6768 100644 --- a/test/mocks/buffer/mocks.h +++ b/test/mocks/buffer/mocks.h @@ -1,5 +1,7 @@ #pragma once +#include "common/buffer/buffer_impl.h" + #include "test/test_common/utility.h" MATCHER_P(BufferEqual, rhs, testing::PrintToString(*rhs)) { diff --git a/test/mocks/upstream/mocks.h b/test/mocks/upstream/mocks.h index 328e6f9b71aa2..242a1cc9386cd 100644 --- a/test/mocks/upstream/mocks.h +++ b/test/mocks/upstream/mocks.h @@ -1,10 +1,10 @@ #pragma once +#include "envoy/http/async_client.h" #include "envoy/upstream/cluster_manager.h" #include "envoy/upstream/health_checker.h" #include "envoy/upstream/upstream.h" -#include "common/http/async_client_impl.h" #include "common/stats/stats_impl.h" #include "test/mocks/http/mocks.h" diff --git a/test/server/http/admin_test.cc b/test/server/http/admin_test.cc index 2d6f80da4ff1a..fe35109b4a55f 100644 --- a/test/server/http/admin_test.cc +++ b/test/server/http/admin_test.cc @@ -1,3 +1,4 @@ +#include "common/http/message_impl.h" #include "server/http/admin.h" #include "test/mocks/server/mocks.h" diff --git a/test/server/http/health_check_test.cc b/test/server/http/health_check_test.cc index 3c539b44e2db9..3a53e9702178a 100644 --- a/test/server/http/health_check_test.cc +++ b/test/server/http/health_check_test.cc @@ -1,3 +1,4 @@ +#include "common/buffer/buffer_impl.h" #include "server/http/health_check.h" #include "test/mocks/server/mocks.h"