From 33fb953135ff1a76375afb070ac84acd224ab4df Mon Sep 17 00:00:00 2001 From: foreseeable Date: Tue, 14 Jul 2020 16:24:54 +0000 Subject: [PATCH] resolve dependencies (#12052) Commit Message: refactor header inclusion to speed up building Additional Description: Risk Level: low Testing: exsiting tests Docs Changes: N/A Release Notes: no Related Issues: #10917 Signed-off-by: Muge Chen Signed-off-by: scheler --- test/config_test/BUILD | 5 ++++- test/config_test/config_test.cc | 5 ++++- test/extensions/access_loggers/file/BUILD | 2 +- test/extensions/access_loggers/file/config_test.cc | 2 +- test/extensions/access_loggers/grpc/BUILD | 2 +- test/extensions/access_loggers/grpc/http_config_test.cc | 2 +- test/extensions/clusters/aggregate/BUILD | 5 +++-- test/extensions/clusters/aggregate/cluster_test.cc | 3 ++- test/extensions/clusters/aggregate/cluster_update_test.cc | 2 +- test/extensions/clusters/dynamic_forward_proxy/BUILD | 3 ++- .../clusters/dynamic_forward_proxy/cluster_test.cc | 3 ++- test/extensions/clusters/redis/BUILD | 3 ++- test/extensions/clusters/redis/redis_cluster_test.cc | 3 ++- test/extensions/filters/listener/http_inspector/BUILD | 2 +- .../listener/http_inspector/http_inspector_config_test.cc | 2 +- test/extensions/filters/listener/original_src/BUILD | 2 +- .../original_src/original_src_config_factory_test.cc | 2 +- test/extensions/filters/listener/proxy_protocol/BUILD | 2 +- .../filters/listener/proxy_protocol/proxy_protocol_test.cc | 2 +- test/extensions/filters/udp/dns_filter/BUILD | 3 ++- test/extensions/filters/udp/dns_filter/dns_filter_test.cc | 3 ++- test/extensions/health_checkers/redis/BUILD | 3 ++- test/extensions/health_checkers/redis/config_test.cc | 3 ++- test/extensions/quic_listeners/quiche/BUILD | 2 +- .../quic_listeners/quiche/active_quic_listener_test.cc | 3 ++- test/extensions/stats_sinks/dog_statsd/BUILD | 2 +- test/extensions/stats_sinks/dog_statsd/config_test.cc | 2 +- test/extensions/stats_sinks/hystrix/BUILD | 6 ++++-- test/extensions/stats_sinks/hystrix/config_test.cc | 2 +- test/extensions/stats_sinks/hystrix/hystrix_test.cc | 4 +++- test/extensions/stats_sinks/statsd/BUILD | 2 +- test/extensions/stats_sinks/statsd/config_test.cc | 2 +- test/tools/router_check/BUILD | 2 +- test/tools/router_check/coverage.h | 2 -- test/tools/router_check/router.h | 2 +- 35 files changed, 57 insertions(+), 38 deletions(-) diff --git a/test/config_test/BUILD b/test/config_test/BUILD index 154dc3ec4c1e..304e92005a49 100644 --- a/test/config_test/BUILD +++ b/test/config_test/BUILD @@ -40,7 +40,10 @@ envoy_cc_test_library( "//source/server:configuration_lib", "//source/server/config_validation:server_lib", "//test/integration:integration_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:worker_factory_mocks", + "//test/mocks/server:listener_component_factory_mocks", + "//test/mocks/server:worker_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:threadsafe_singleton_injector_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/config_test/config_test.cc b/test/config_test/config_test.cc index 1074186abd65..47f7e88037ba 100644 --- a/test/config_test/config_test.cc +++ b/test/config_test/config_test.cc @@ -15,7 +15,10 @@ #include "server/options_impl.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/listener_component_factory.h" +#include "test/mocks/server/worker.h" +#include "test/mocks/server/worker_factory.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/extensions/access_loggers/file/BUILD b/test/extensions/access_loggers/file/BUILD index 76361877e881..4fe61e776483 100644 --- a/test/extensions/access_loggers/file/BUILD +++ b/test/extensions/access_loggers/file/BUILD @@ -17,7 +17,7 @@ envoy_extension_cc_test( extension_name = "envoy.access_loggers.file", deps = [ "//source/extensions/access_loggers/file:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto", diff --git a/test/extensions/access_loggers/file/config_test.cc b/test/extensions/access_loggers/file/config_test.cc index f0c7e6dd9359..9d7215e3f713 100644 --- a/test/extensions/access_loggers/file/config_test.cc +++ b/test/extensions/access_loggers/file/config_test.cc @@ -9,7 +9,7 @@ #include "extensions/access_loggers/file/file_access_log_impl.h" #include "extensions/access_loggers/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/access_loggers/grpc/BUILD b/test/extensions/access_loggers/grpc/BUILD index 219520a97056..b573bc6082f5 100644 --- a/test/extensions/access_loggers/grpc/BUILD +++ b/test/extensions/access_loggers/grpc/BUILD @@ -68,7 +68,7 @@ envoy_extension_cc_test( extension_name = "envoy.access_loggers.http_grpc", deps = [ "//source/extensions/access_loggers/grpc:http_config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:factory_context_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/grpc/v3:pkg_cc_proto", ], diff --git a/test/extensions/access_loggers/grpc/http_config_test.cc b/test/extensions/access_loggers/grpc/http_config_test.cc index 1c6be1e2dec4..37ba5220244f 100644 --- a/test/extensions/access_loggers/grpc/http_config_test.cc +++ b/test/extensions/access_loggers/grpc/http_config_test.cc @@ -7,7 +7,7 @@ #include "extensions/access_loggers/grpc/http_grpc_access_log_impl.h" #include "extensions/access_loggers/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD index 3001535ca9ad..4e75753f133b 100644 --- a/test/extensions/clusters/aggregate/BUILD +++ b/test/extensions/clusters/aggregate/BUILD @@ -20,7 +20,8 @@ envoy_extension_cc_test( "//source/extensions/transport_sockets/raw_buffer:config", "//test/common/upstream:utility_lib", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -40,7 +41,7 @@ envoy_extension_cc_test( "//test/common/upstream:test_cluster_manager", "//test/common/upstream:utility_lib", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/clusters/aggregate/cluster_test.cc b/test/extensions/clusters/aggregate/cluster_test.cc index 748ab076a90f..b2c4174fbd65 100644 --- a/test/extensions/clusters/aggregate/cluster_test.cc +++ b/test/extensions/clusters/aggregate/cluster_test.cc @@ -8,7 +8,8 @@ #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" +#include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/environment.h" diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc index e7cbbcb4311d..cf80d8599b7f 100644 --- a/test/extensions/clusters/aggregate/cluster_update_test.cc +++ b/test/extensions/clusters/aggregate/cluster_update_test.cc @@ -11,7 +11,7 @@ #include "test/common/upstream/test_cluster_manager.h" #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/clusters/dynamic_forward_proxy/BUILD b/test/extensions/clusters/dynamic_forward_proxy/BUILD index baaf5068a1b5..126bb1aa7840 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/BUILD +++ b/test/extensions/clusters/dynamic_forward_proxy/BUILD @@ -23,7 +23,8 @@ envoy_extension_cc_test( "//test/common/upstream:utility_lib", "//test/extensions/common/dynamic_forward_proxy:mocks", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc index cf9116a3d56c..725e62590c85 100644 --- a/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc +++ b/test/extensions/clusters/dynamic_forward_proxy/cluster_test.cc @@ -10,7 +10,8 @@ #include "test/common/upstream/utility.h" #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" +#include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/environment.h" diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index 1ae33bf15b0c..6c88308d93d6 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -36,7 +36,8 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:upstream_mocks", diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index 5ce57a167231..284dab85ea05 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -21,7 +21,8 @@ #include "test/extensions/filters/network/common/redis/mocks.h" #include "test/mocks/local_info/mocks.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" +#include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" using testing::_; diff --git a/test/extensions/filters/listener/http_inspector/BUILD b/test/extensions/filters/listener/http_inspector/BUILD index defcc0d8c7da..8530e24434d9 100644 --- a/test/extensions/filters/listener/http_inspector/BUILD +++ b/test/extensions/filters/listener/http_inspector/BUILD @@ -37,7 +37,7 @@ envoy_extension_cc_test( "//source/extensions/filters/listener/http_inspector:http_inspector_lib", "//test/mocks/api:api_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:listener_factory_context_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:threadsafe_singleton_injector_lib", ], diff --git a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc index c2037ed8ca67..4fba684513d2 100644 --- a/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc +++ b/test/extensions/filters/listener/http_inspector/http_inspector_config_test.cc @@ -1,7 +1,7 @@ #include "extensions/filters/listener/http_inspector/http_inspector.h" #include "extensions/filters/listener/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/listener_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/listener/original_src/BUILD b/test/extensions/filters/listener/original_src/BUILD index 235c5263793d..c3cf3365ad0a 100644 --- a/test/extensions/filters/listener/original_src/BUILD +++ b/test/extensions/filters/listener/original_src/BUILD @@ -32,7 +32,7 @@ envoy_extension_cc_test( "//source/extensions/filters/listener/original_src:config", "//source/extensions/filters/listener/original_src:config_lib", "//source/extensions/filters/listener/original_src:original_src_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:listener_factory_context_mocks", ], ) diff --git a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc index dca16ca9e455..eac36949aa96 100644 --- a/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc +++ b/test/extensions/filters/listener/original_src/original_src_config_factory_test.cc @@ -2,7 +2,7 @@ #include "extensions/filters/listener/original_src/original_src.h" #include "extensions/filters/listener/original_src/original_src_config_factory.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/listener_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/listener/proxy_protocol/BUILD b/test/extensions/filters/listener/proxy_protocol/BUILD index 1ff78bc0b820..f37389795778 100644 --- a/test/extensions/filters/listener/proxy_protocol/BUILD +++ b/test/extensions/filters/listener/proxy_protocol/BUILD @@ -30,7 +30,7 @@ envoy_extension_cc_test( "//test/mocks/api:api_mocks", "//test/mocks/buffer:buffer_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:listener_factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", 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 05a65551e6de..b14e18c7ade6 100644 --- a/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc +++ b/test/extensions/filters/listener/proxy_protocol/proxy_protocol_test.cc @@ -23,7 +23,7 @@ #include "test/mocks/api/mocks.h" #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/listener_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/udp/dns_filter/BUILD b/test/extensions/filters/udp/dns_filter/BUILD index 2ac152fc7f1a..31583a527a63 100644 --- a/test/extensions/filters/udp/dns_filter/BUILD +++ b/test/extensions/filters/udp/dns_filter/BUILD @@ -32,7 +32,8 @@ envoy_extension_cc_test( deps = [ ":dns_filter_test_lib", "//source/extensions/filters/udp/dns_filter:dns_filter_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:listener_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "@envoy_api//envoy/extensions/filters/udp/dns_filter/v3alpha:pkg_cc_proto", diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc index 80914f2f7cbd..9da9c52ced95 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc @@ -4,7 +4,8 @@ #include "common/common/logger.h" #include "test/mocks/event/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/listener_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/health_checkers/redis/BUILD b/test/extensions/health_checkers/redis/BUILD index aa4f80e21330..e03d6efc0a52 100644 --- a/test/extensions/health_checkers/redis/BUILD +++ b/test/extensions/health_checkers/redis/BUILD @@ -39,9 +39,10 @@ envoy_extension_cc_test( "//source/common/upstream:health_checker_lib", "//source/extensions/health_checkers/redis:config", "//test/common/upstream:utility_lib", + "//test/mocks/access_log:access_log_mocks", "//test/mocks/network:network_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:health_checker_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", "@envoy_api//envoy/extensions/filters/network/redis_proxy/v3:pkg_cc_proto", ], diff --git a/test/extensions/health_checkers/redis/config_test.cc b/test/extensions/health_checkers/redis/config_test.cc index 84945209284e..cd18ecc1644c 100644 --- a/test/extensions/health_checkers/redis/config_test.cc +++ b/test/extensions/health_checkers/redis/config_test.cc @@ -6,9 +6,10 @@ #include "extensions/health_checkers/redis/config.h" #include "test/common/upstream/utility.h" +#include "test/mocks/access_log/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/health_checker_factory_context.h" #include "test/mocks/upstream/mocks.h" namespace Envoy { diff --git a/test/extensions/quic_listeners/quiche/BUILD b/test/extensions/quic_listeners/quiche/BUILD index 482bae22257e..e14bc1f36fef 100644 --- a/test/extensions/quic_listeners/quiche/BUILD +++ b/test/extensions/quic_listeners/quiche/BUILD @@ -179,7 +179,7 @@ envoy_cc_test( "//source/extensions/quic_listeners/quiche:envoy_quic_utils_lib", "//source/server:configuration_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:network_utility_lib", "//test/test_common:simulated_time_system_lib", "@com_googlesource_quiche//:quic_test_tools_crypto_server_config_peer_lib", diff --git a/test/extensions/quic_listeners/quiche/active_quic_listener_test.cc b/test/extensions/quic_listeners/quiche/active_quic_listener_test.cc index 13c38062a376..8c1e7e222790 100644 --- a/test/extensions/quic_listeners/quiche/active_quic_listener_test.cc +++ b/test/extensions/quic_listeners/quiche/active_quic_listener_test.cc @@ -32,7 +32,8 @@ #include "test/test_common/simulated_time_system.h" #include "test/test_common/environment.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" + #include "test/mocks/runtime/mocks.h" #include "test/test_common/utility.h" #include "test/test_common/network_utility.h" diff --git a/test/extensions/stats_sinks/dog_statsd/BUILD b/test/extensions/stats_sinks/dog_statsd/BUILD index 8c909f5d54f0..a9a0057336fa 100644 --- a/test/extensions/stats_sinks/dog_statsd/BUILD +++ b/test/extensions/stats_sinks/dog_statsd/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( "//include/envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/dog_statsd:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", diff --git a/test/extensions/stats_sinks/dog_statsd/config_test.cc b/test/extensions/stats_sinks/dog_statsd/config_test.cc index 8108dd6618d2..e3a20a067ca7 100644 --- a/test/extensions/stats_sinks/dog_statsd/config_test.cc +++ b/test/extensions/stats_sinks/dog_statsd/config_test.cc @@ -9,7 +9,7 @@ #include "extensions/stat_sinks/dog_statsd/config.h" #include "extensions/stat_sinks/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD index 093fa1f1d516..127f263d8d42 100644 --- a/test/extensions/stats_sinks/hystrix/BUILD +++ b/test/extensions/stats_sinks/hystrix/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( "//include/envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/hystrix:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", @@ -34,7 +34,9 @@ envoy_extension_cc_test( deps = [ "//source/common/stats:stats_lib", "//source/extensions/stat_sinks/hystrix:hystrix_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:admin_mocks", + "//test/mocks/server:admin_stream_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/stats:stats_mocks", "//test/mocks/upstream:upstream_mocks", ], diff --git a/test/extensions/stats_sinks/hystrix/config_test.cc b/test/extensions/stats_sinks/hystrix/config_test.cc index e99723421022..79bf2c4bd21e 100644 --- a/test/extensions/stats_sinks/hystrix/config_test.cc +++ b/test/extensions/stats_sinks/hystrix/config_test.cc @@ -7,7 +7,7 @@ #include "extensions/stat_sinks/hystrix/hystrix.h" #include "extensions/stat_sinks/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/stats_sinks/hystrix/hystrix_test.cc b/test/extensions/stats_sinks/hystrix/hystrix_test.cc index a09fed9ffb12..f7e9671a2956 100644 --- a/test/extensions/stats_sinks/hystrix/hystrix_test.cc +++ b/test/extensions/stats_sinks/hystrix/hystrix_test.cc @@ -5,7 +5,9 @@ #include "extensions/stat_sinks/hystrix/hystrix.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/admin.h" +#include "test/mocks/server/admin_stream.h" +#include "test/mocks/server/instance.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/upstream/mocks.h" diff --git a/test/extensions/stats_sinks/statsd/BUILD b/test/extensions/stats_sinks/statsd/BUILD index 0b21cee0f5c3..b1c56f0466d8 100644 --- a/test/extensions/stats_sinks/statsd/BUILD +++ b/test/extensions/stats_sinks/statsd/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( "//include/envoy/registry", "//source/common/protobuf:utility_lib", "//source/extensions/stat_sinks/statsd:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:utility_lib", diff --git a/test/extensions/stats_sinks/statsd/config_test.cc b/test/extensions/stats_sinks/statsd/config_test.cc index 44c89aa5e579..48e2a575b087 100644 --- a/test/extensions/stats_sinks/statsd/config_test.cc +++ b/test/extensions/stats_sinks/statsd/config_test.cc @@ -10,7 +10,7 @@ #include "extensions/stat_sinks/statsd/config.h" #include "extensions/stat_sinks/well_known_names.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/tools/router_check/BUILD b/test/tools/router_check/BUILD index 610e09311027..992fb394d424 100644 --- a/test/tools/router_check/BUILD +++ b/test/tools/router_check/BUILD @@ -35,7 +35,7 @@ envoy_cc_test_library( "//source/common/router:config_lib", "//source/common/stats:stats_lib", "//source/exe:platform_impl_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:printers_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/tools/router_check/coverage.h b/test/tools/router_check/coverage.h index 13019eec1af5..051ea3a50f7c 100644 --- a/test/tools/router_check/coverage.h +++ b/test/tools/router_check/coverage.h @@ -3,8 +3,6 @@ #include "envoy/config/route/v3/route.pb.h" #include "envoy/router/router.h" -#include "test/mocks/server/mocks.h" - namespace Envoy { class RouteCoverage : Logger::Loggable { public: diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index 19d2f86d746e..04da7a40af7d 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -14,7 +14,7 @@ #include "common/router/config_impl.h" #include "common/stats/fake_symbol_table_impl.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/global.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h"