diff --git a/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD b/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD index e6e280243d1bd..e80262232e0c9 100644 --- a/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD +++ b/contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD @@ -17,6 +17,6 @@ envoy_cc_test( deps = [ "//contrib/generic_proxy/filters/network/source/codecs/kafka:config", "//test/extensions/filters/network/generic_proxy/mocks:codec_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/network:connection_mocks", ], ) diff --git a/contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc b/contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc index 2925622f8d9de..41385708c9ac5 100644 --- a/contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc +++ b/contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc @@ -2,7 +2,7 @@ #include #include "test/extensions/filters/network/generic_proxy/mocks/codec.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/network/connection.h" #include "contrib/generic_proxy/filters/network/source/codecs/kafka/config.h" #include "contrib/kafka/filters/network/source/external/requests.h" diff --git a/contrib/hyperscan/matching/input_matchers/test/BUILD b/contrib/hyperscan/matching/input_matchers/test/BUILD index c3c64a5fe5a97..6161e002b7e08 100644 --- a/contrib/hyperscan/matching/input_matchers/test/BUILD +++ b/contrib/hyperscan/matching/input_matchers/test/BUILD @@ -15,7 +15,7 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//contrib/hyperscan/matching/input_matchers/source:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/contrib/hyperscan/matching/input_matchers/test/config_test.cc b/contrib/hyperscan/matching/input_matchers/test/config_test.cc index 4a7953a0758f8..1eb5b1775d749 100644 --- a/contrib/hyperscan/matching/input_matchers/test/config_test.cc +++ b/contrib/hyperscan/matching/input_matchers/test/config_test.cc @@ -1,4 +1,4 @@ -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "contrib/hyperscan/matching/input_matchers/source/config.h" #include "gtest/gtest.h" diff --git a/contrib/hyperscan/regex_engines/test/BUILD b/contrib/hyperscan/regex_engines/test/BUILD index e10fda5b1c14b..09fa24f0f76dd 100644 --- a/contrib/hyperscan/regex_engines/test/BUILD +++ b/contrib/hyperscan/regex_engines/test/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//contrib/hyperscan/regex_engines/source:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/contrib/hyperscan/regex_engines/test/config_test.cc b/contrib/hyperscan/regex_engines/test/config_test.cc index 8d9e68d51e981..8b00061a31ba2 100644 --- a/contrib/hyperscan/regex_engines/test/config_test.cc +++ b/contrib/hyperscan/regex_engines/test/config_test.cc @@ -1,4 +1,4 @@ -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "contrib/hyperscan/regex_engines/source/config.h" #include "gtest/gtest.h" diff --git a/contrib/peak_ewma/load_balancing_policies/test/BUILD b/contrib/peak_ewma/load_balancing_policies/test/BUILD index 745c6dc6cbc70..c3b6f4a101da2 100644 --- a/contrib/peak_ewma/load_balancing_policies/test/BUILD +++ b/contrib/peak_ewma/load_balancing_policies/test/BUILD @@ -30,7 +30,7 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//test/common/stats:stat_test_utility_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:utility_lib", "@envoy_api//contrib/envoy/extensions/load_balancing_policies/peak_ewma/v3alpha:pkg_cc_proto", diff --git a/contrib/peak_ewma/load_balancing_policies/test/config_test.cc b/contrib/peak_ewma/load_balancing_policies/test/config_test.cc index 8ecbebee8448e..041b8f79dc5a0 100644 --- a/contrib/peak_ewma/load_balancing_policies/test/config_test.cc +++ b/contrib/peak_ewma/load_balancing_policies/test/config_test.cc @@ -7,7 +7,7 @@ #include "test/common/stats/stat_test_utility.h" #include "test/mocks/common.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" #include "test/test_common/utility.h" diff --git a/contrib/rocketmq_proxy/filters/network/test/BUILD b/contrib/rocketmq_proxy/filters/network/test/BUILD index 5adbf7bd341df..2a394d9eeba4a 100644 --- a/contrib/rocketmq_proxy/filters/network/test/BUILD +++ b/contrib/rocketmq_proxy/filters/network/test/BUILD @@ -73,7 +73,6 @@ envoy_cc_test( "//test/common/upstream:utility_lib", "//test/mocks/network:network_mocks", "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", ], diff --git a/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc b/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc index 2cbd77621f6f9..1c5d64001cafb 100644 --- a/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc +++ b/contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc @@ -5,7 +5,6 @@ #include "test/mocks/network/connection.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "contrib/rocketmq_proxy/filters/network/source/config.h" #include "contrib/rocketmq_proxy/filters/network/source/conn_manager.h" diff --git a/contrib/stat_sinks/wasm_filter/test/BUILD b/contrib/stat_sinks/wasm_filter/test/BUILD index 7e773ca78462e..d5464c685893c 100644 --- a/contrib/stat_sinks/wasm_filter/test/BUILD +++ b/contrib/stat_sinks/wasm_filter/test/BUILD @@ -26,7 +26,6 @@ envoy_cc_test( srcs = ["config_test.cc"], deps = [ "//contrib/stat_sinks/wasm_filter/source:config_lib", - "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", "@envoy_api//contrib/envoy/extensions/stat_sinks/wasm_filter/v3:pkg_cc_proto", ], diff --git a/contrib/stat_sinks/wasm_filter/test/config_test.cc b/contrib/stat_sinks/wasm_filter/test/config_test.cc index ff23a5466b698..fb0b81405f759 100644 --- a/contrib/stat_sinks/wasm_filter/test/config_test.cc +++ b/contrib/stat_sinks/wasm_filter/test/config_test.cc @@ -2,7 +2,6 @@ #include "source/common/protobuf/protobuf.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/utility.h" #include "contrib/envoy/extensions/stat_sinks/wasm_filter/v3/wasm_filter.pb.validate.h" diff --git a/mobile/test/common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc b/mobile/test/common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc index c76f5a176c528..ac587c9ecf9c7 100644 --- a/mobile/test/common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc +++ b/mobile/test/common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc @@ -3,7 +3,6 @@ #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/event/mocks.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/common/config/BUILD b/test/common/config/BUILD index f2ca47573c0fd..f61e9da302819 100644 --- a/test/common/config/BUILD +++ b/test/common/config/BUILD @@ -183,7 +183,7 @@ envoy_cc_test( ":dummy_config_proto_cc_proto", "//source/common/config:config_provider_lib", "//source/common/protobuf:utility_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:simulated_time_system_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/service/discovery/v3:pkg_cc_proto", diff --git a/test/common/config/config_provider_impl_test.cc b/test/common/config/config_provider_impl_test.cc index d6617dbfb3036..b11719780bfd8 100644 --- a/test/common/config/config_provider_impl_test.cc +++ b/test/common/config/config_provider_impl_test.cc @@ -8,7 +8,7 @@ #include "source/common/protobuf/utility.h" #include "test/common/config/dummy_config.pb.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/http/BUILD b/test/common/http/BUILD index 8f03184eff993..0e3f92888950a 100644 --- a/test/common/http/BUILD +++ b/test/common/http/BUILD @@ -346,7 +346,7 @@ envoy_cc_test( "//test/mocks/local_info:local_info_mocks", "//test/mocks/network:network_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_runtime_lib", @@ -492,7 +492,7 @@ envoy_cc_test( "//source/common/http:utility_lib", "//source/common/network:address_lib", "//test/mocks/http:http_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -719,7 +719,7 @@ envoy_cc_fuzz_test( "//test/mocks/network:network_mocks", "//test/mocks/router:router_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:overload_manager_mocks", "//test/mocks/server:server_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/tracing:tracing_mocks", diff --git a/test/common/http/conn_manager_utility_test.cc b/test/common/http/conn_manager_utility_test.cc index ed66b55451dd1..9b25a93afe9c4 100644 --- a/test/common/http/conn_manager_utility_test.cc +++ b/test/common/http/conn_manager_utility_test.cc @@ -23,7 +23,7 @@ #include "test/mocks/local_info/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/printers.h" diff --git a/test/common/http/hcm_router_fuzz_test.cc b/test/common/http/hcm_router_fuzz_test.cc index 0d18358ceb94b..022842232b531 100644 --- a/test/common/http/hcm_router_fuzz_test.cc +++ b/test/common/http/hcm_router_fuzz_test.cc @@ -18,7 +18,7 @@ #include "test/fuzz/utility.h" #include "test/mocks/network/mocks.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/overload_manager.h" #include "test/test_common/registry.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/http/http1/BUILD b/test/common/http/http1/BUILD index f6f6cfddfc5c7..017acc2874cc6 100644 --- a/test/common/http/http1/BUILD +++ b/test/common/http/http1/BUILD @@ -36,8 +36,8 @@ envoy_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:overload_manager_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:logging_lib", diff --git a/test/common/http/http1/codec_impl_test.cc b/test/common/http/http1/codec_impl_test.cc index 55d1242fdd96b..4d5d75a632abe 100644 --- a/test/common/http/http1/codec_impl_test.cc +++ b/test/common/http/http1/codec_impl_test.cc @@ -22,8 +22,8 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/overload_manager.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/logging.h" #include "test/test_common/printers.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/http/utility_test.cc b/test/common/http/utility_test.cc index c9f4ccd4db309..2e494591226fe 100644 --- a/test/common/http/utility_test.cc +++ b/test/common/http/utility_test.cc @@ -15,7 +15,7 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/printers.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/common/io/BUILD b/test/common/io/BUILD index a13cd925ea928..7b92d4dd44375 100644 --- a/test/common/io/BUILD +++ b/test/common/io/BUILD @@ -71,7 +71,7 @@ envoy_cc_test( }), rbe_pool = "6gig", deps = [ - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", ] + select({ diff --git a/test/common/io/io_uring_worker_factory_impl_test.cc b/test/common/io/io_uring_worker_factory_impl_test.cc index f6eebbc664449..78c597fda259a 100644 --- a/test/common/io/io_uring_worker_factory_impl_test.cc +++ b/test/common/io/io_uring_worker_factory_impl_test.cc @@ -1,7 +1,7 @@ #include "source/common/io/io_uring_impl.h" #include "source/common/io/io_uring_worker_factory_impl.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/common/matcher/BUILD b/test/common/matcher/BUILD index a47472f101d69..2e4189d23327e 100644 --- a/test/common/matcher/BUILD +++ b/test/common/matcher/BUILD @@ -84,7 +84,7 @@ envoy_cc_test( "//source/common/matcher:matcher_lib", "//test/mocks/http:http_mocks", "//test/mocks/matcher:matcher_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", diff --git a/test/common/matcher/actions/BUILD b/test/common/matcher/actions/BUILD index 56ac2b4626066..134084f61649e 100644 --- a/test/common/matcher/actions/BUILD +++ b/test/common/matcher/actions/BUILD @@ -13,10 +13,9 @@ envoy_cc_test( srcs = ["string_returning_action_test.cc"], rbe_pool = "6gig", deps = [ - # formatter_extension_lib is required for DYNAMIC_METADATA to function in test. "//source/common/formatter:formatter_extension_lib", "//source/common/matcher/actions:string_returning_action_lib", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", - "//test/mocks/server:instance_mocks", ], ) diff --git a/test/common/matcher/actions/string_returning_action_test.cc b/test/common/matcher/actions/string_returning_action_test.cc index 22ec090024f87..74d57a92da197 100644 --- a/test/common/matcher/actions/string_returning_action_test.cc +++ b/test/common/matcher/actions/string_returning_action_test.cc @@ -1,7 +1,7 @@ #include "source/common/matcher/actions/string_returning_action.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "gtest/gtest.h" diff --git a/test/common/matcher/matcher_test.cc b/test/common/matcher/matcher_test.cc index 4439880aa80e1..10f071da25a98 100644 --- a/test/common/matcher/matcher_test.cc +++ b/test/common/matcher/matcher_test.cc @@ -12,7 +12,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/common/network/BUILD b/test/common/network/BUILD index e57064f567cb3..977d33a8b2b10 100644 --- a/test/common/network/BUILD +++ b/test/common/network/BUILD @@ -163,8 +163,6 @@ envoy_cc_test( "//test/mocks/buffer:buffer_mocks", "//test/mocks/network:network_mocks", "//test/mocks/ratelimit:ratelimit_mocks", - "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/upstream:host_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -430,7 +428,6 @@ envoy_cc_fuzz_test( "//source/common/stats:stats_lib", "//test/common/network:listener_impl_test_base_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", diff --git a/test/common/network/filter_manager_impl_test.cc b/test/common/network/filter_manager_impl_test.cc index e156aa6d772e0..1bfe38ac00490 100644 --- a/test/common/network/filter_manager_impl_test.cc +++ b/test/common/network/filter_manager_impl_test.cc @@ -13,8 +13,6 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/ratelimit/mocks.h" -#include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/mocks/upstream/host.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/common/network/udp_fuzz.cc b/test/common/network/udp_fuzz.cc index 536d1faedcf0c..0dc3edf20263f 100644 --- a/test/common/network/udp_fuzz.cc +++ b/test/common/network/udp_fuzz.cc @@ -13,7 +13,6 @@ #include "test/common/network/udp_listener_impl_test_base.h" #include "test/fuzz/fuzz_runner.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/common/network/udp_listener_impl_batch_writer_test.cc b/test/common/network/udp_listener_impl_batch_writer_test.cc index 3e90d25f75f2d..a5ec75522d27b 100644 --- a/test/common/network/udp_listener_impl_batch_writer_test.cc +++ b/test/common/network/udp_listener_impl_batch_writer_test.cc @@ -30,7 +30,6 @@ #include "test/common/network/udp_listener_impl_test_base.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/common/quic/active_quic_listener_test.cc b/test/common/quic/active_quic_listener_test.cc index f87bd248f5574..14e867b2c7f5f 100644 --- a/test/common/quic/active_quic_listener_test.cc +++ b/test/common/quic/active_quic_listener_test.cc @@ -22,7 +22,6 @@ #include "test/common/quic/test_proof_source.h" #include "test/common/quic/test_utils.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/listener_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/environment.h" diff --git a/test/common/rds/BUILD b/test/common/rds/BUILD index 8a44d738cd69a..6066855ba0321 100644 --- a/test/common/rds/BUILD +++ b/test/common/rds/BUILD @@ -14,7 +14,7 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//source/common/rds:rds_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/thrift_proxy/v3:pkg_cc_proto", diff --git a/test/common/rds/rds_test.cc b/test/common/rds/rds_test.cc index 3417aa67a8578..303f6eed1a902 100644 --- a/test/common/rds/rds_test.cc +++ b/test/common/rds/rds_test.cc @@ -20,7 +20,7 @@ #include "source/common/rds/static_route_config_provider_impl.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/simulated_time_system.h" #include "gmock/gmock.h" diff --git a/test/common/router/BUILD b/test/common/router/BUILD index f7d3909fa46c0..8bd99ef4dc7f3 100644 --- a/test/common/router/BUILD +++ b/test/common/router/BUILD @@ -49,7 +49,7 @@ envoy_cc_test_library( "//test/extensions/filters/http/common:empty_http_filter_config_lib", "//test/fuzz:utility_lib", "//test/mocks/router:router_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:retry_priority_mocks", "//test/test_common:environment_lib", "//test/test_common:registry_lib", @@ -130,7 +130,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/http:header_map_lib", "//source/common/router:config_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@benchmark", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -230,7 +230,7 @@ envoy_cc_test( "//test/mocks/matcher:matcher_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/router:router_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -254,7 +254,7 @@ envoy_cc_test( "//source/common/router:vhds_lib", "//source/server/admin:admin_lib", "//test/mocks/config:config_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -308,7 +308,7 @@ envoy_cc_fuzz_test( ":route_fuzz_proto_cc_proto", "//source/common/router:config_lib", "//test/fuzz:utility_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], ) @@ -334,7 +334,7 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/ratelimit:ratelimit_mocks", "//test/mocks/router:router_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", @@ -481,7 +481,6 @@ envoy_cc_test( deps = [ ":router_test_base_lib", "//source/common/router:router_lib", - "//test/mocks/server:factory_context_mocks", "@envoy_api//envoy/extensions/filters/http/router/v3:pkg_cc_proto", ], ) @@ -576,7 +575,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/common:assert_lib", "//source/common/router:config_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", "@benchmark", diff --git a/test/common/router/config_impl_headermap_benchmark_test.cc b/test/common/router/config_impl_headermap_benchmark_test.cc index b3226990a1028..f77e0be943226 100644 --- a/test/common/router/config_impl_headermap_benchmark_test.cc +++ b/test/common/router/config_impl_headermap_benchmark_test.cc @@ -5,7 +5,7 @@ #include "source/common/http/header_map_impl.h" #include "source/common/router/config_impl.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "benchmark/benchmark.h" diff --git a/test/common/router/config_impl_speed_test.cc b/test/common/router/config_impl_speed_test.cc index 76d3cc2774070..a30adac0c7220 100644 --- a/test/common/router/config_impl_speed_test.cc +++ b/test/common/router/config_impl_speed_test.cc @@ -4,7 +4,7 @@ #include "source/common/common/assert.h" #include "source/common/router/config_impl.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/common/router/config_impl_test.cc b/test/common/router/config_impl_test.cc index 2beb08e00bc21..79f8bd6a0dcb6 100644 --- a/test/common/router/config_impl_test.cc +++ b/test/common/router/config_impl_test.cc @@ -27,7 +27,7 @@ #include "test/extensions/filters/http/common/empty_http_filter_config.h" #include "test/fuzz/utility.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/retry_priority.h" #include "test/mocks/upstream/retry_priority_factory.h" #include "test/mocks/upstream/test_retry_host_predicate_factory.h" diff --git a/test/common/router/route_fuzz_test.cc b/test/common/router/route_fuzz_test.cc index 61a30820d6018..15f1af03027e2 100644 --- a/test/common/router/route_fuzz_test.cc +++ b/test/common/router/route_fuzz_test.cc @@ -9,7 +9,7 @@ #include "test/common/router/route_fuzz.pb.validate.h" #include "test/fuzz/fuzz_runner.h" #include "test/fuzz/utility.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" namespace Envoy { namespace Router { diff --git a/test/common/router/router_outlier_detection_test.cc b/test/common/router/router_outlier_detection_test.cc index a17519f36ba2c..46fc6294823d7 100644 --- a/test/common/router/router_outlier_detection_test.cc +++ b/test/common/router/router_outlier_detection_test.cc @@ -3,7 +3,6 @@ #include "source/common/router/router.h" #include "test/common/router/router_test_base.h" -#include "test/mocks/server/factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/router/router_ratelimit_test.cc b/test/common/router/router_ratelimit_test.cc index cf936248c432b..e8b416c16eaf7 100644 --- a/test/common/router/router_ratelimit_test.cc +++ b/test/common/router/router_ratelimit_test.cc @@ -15,7 +15,7 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/ratelimit/mocks.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/printers.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/router/scoped_rds_test.cc b/test/common/router/scoped_rds_test.cc index c320433718624..0a8555a20aefa 100644 --- a/test/common/router/scoped_rds_test.cc +++ b/test/common/router/scoped_rds_test.cc @@ -24,7 +24,7 @@ #include "test/mocks/matcher/mocks.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/common/router/vhds_test.cc b/test/common/router/vhds_test.cc index cb2b311e4b578..f48b9e19f3a68 100644 --- a/test/common/router/vhds_test.cc +++ b/test/common/router/vhds_test.cc @@ -18,7 +18,7 @@ #endif #include "test/mocks/config/mocks.h" #include "test/mocks/init/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/common/signal/BUILD b/test/common/signal/BUILD index 80da57e871e7f..c3f27a0ec4192 100644 --- a/test/common/signal/BUILD +++ b/test/common/signal/BUILD @@ -31,7 +31,6 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//source/common/signal:fatal_error_handler_lib", - "//test/mocks/server:instance_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/common/signal/fatal_action_test.cc b/test/common/signal/fatal_action_test.cc index b6b43470c60f3..dfc8b877f4bea 100644 --- a/test/common/signal/fatal_action_test.cc +++ b/test/common/signal/fatal_action_test.cc @@ -6,7 +6,6 @@ #include "source/common/signal/fatal_action.h" #include "source/common/signal/fatal_error_handler.h" -#include "test/mocks/server/instance.h" #include "test/test_common/utility.h" #include "absl/synchronization/notification.h" diff --git a/test/common/ssl/matching/BUILD b/test/common/ssl/matching/BUILD index e9e7dbe4512b3..a721c77ea56d4 100644 --- a/test/common/ssl/matching/BUILD +++ b/test/common/ssl/matching/BUILD @@ -32,7 +32,7 @@ envoy_cc_test( "//source/common/ssl/matching:inputs_lib", "//test/common/matcher:test_utility_lib", "//test/mocks/matcher:matcher_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_time_lib", ], ) diff --git a/test/common/ssl/matching/inputs_integration_test.cc b/test/common/ssl/matching/inputs_integration_test.cc index 8e97120925191..fef8f08daf20e 100644 --- a/test/common/ssl/matching/inputs_integration_test.cc +++ b/test/common/ssl/matching/inputs_integration_test.cc @@ -6,7 +6,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/test_time.h" diff --git a/test/common/tcp_proxy/BUILD b/test/common/tcp_proxy/BUILD index d85cc1453662f..ee863dddd5dee 100644 --- a/test/common/tcp_proxy/BUILD +++ b/test/common/tcp_proxy/BUILD @@ -68,6 +68,7 @@ envoy_cc_test( deps = [ ":tcp_proxy_test_base", "//source/common/router:string_accessor_lib", + "//test/mocks/server:factory_context_mocks", "@envoy_api//envoy/config/accesslog/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/access_loggers/file/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/tcp_proxy/v3:pkg_cc_proto", diff --git a/test/common/tcp_proxy/tcp_proxy_test.cc b/test/common/tcp_proxy/tcp_proxy_test.cc index 9ab2ebd03a053..2ba8c8047e648 100644 --- a/test/common/tcp_proxy/tcp_proxy_test.cc +++ b/test/common/tcp_proxy/tcp_proxy_test.cc @@ -33,7 +33,6 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stream_info/mocks.h" #include "test/mocks/tcp/mocks.h" diff --git a/test/common/tcp_proxy/tcp_proxy_test_base.h b/test/common/tcp_proxy/tcp_proxy_test_base.h index 54c5dfadcf3a0..a4a2d40bec406 100644 --- a/test/common/tcp_proxy/tcp_proxy_test_base.h +++ b/test/common/tcp_proxy/tcp_proxy_test_base.h @@ -27,7 +27,6 @@ #include "test/mocks/buffer/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/mocks/stream_info/mocks.h" #include "test/mocks/tcp/mocks.h" #include "test/mocks/upstream/host.h" diff --git a/test/common/tracing/BUILD b/test/common/tracing/BUILD index 2781ade6e4e5d..e0e3732d1ceed 100644 --- a/test/common/tracing/BUILD +++ b/test/common/tracing/BUILD @@ -67,7 +67,7 @@ envoy_cc_test( "//source/common/tracing:tracer_config_lib", "//source/common/tracing:tracer_lib", "//source/common/tracing:tracer_manager_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/server:tracer_factory_mocks", "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", diff --git a/test/common/tracing/tracer_manager_impl_test.cc b/test/common/tracing/tracer_manager_impl_test.cc index c19a798e7f840..f97ed8127c965 100644 --- a/test/common/tracing/tracer_manager_impl_test.cc +++ b/test/common/tracing/tracer_manager_impl_test.cc @@ -2,7 +2,7 @@ #include "source/common/tracing/tracer_impl.h" #include "source/common/tracing/tracer_manager_impl.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/server/tracer_factory.h" #include "test/test_common/registry.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 95916b289680e..24a149cf5f954 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -24,7 +24,7 @@ envoy_cc_test( "//source/common/upstream:od_cds_api_lib", "//test/mocks/config:xds_manager_mocks", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:missing_cluster_notifier_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -41,7 +41,7 @@ envoy_cc_test( "//source/common/upstream:od_cds_api_lib", "//test/mocks/config:xds_manager_mocks", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:missing_cluster_notifier_mocks", "//test/test_common:test_runtime_lib", @@ -60,7 +60,7 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//source/common/upstream:cds_api_lib", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:cluster_priority_set_mocks", "//test/test_common:utility_lib", @@ -323,7 +323,6 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:health_checker_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_priority_set_mocks", @@ -443,7 +442,7 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_factory_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", @@ -581,11 +580,8 @@ envoy_cc_test( data = ["//test/common/tls/test_data:certs"], rbe_pool = "6gig", deps = [ - ":utility_lib", ":test_local_address_selector", - "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", - "@envoy_api//envoy/config/core/v3:pkg_cc_proto", - "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", + ":utility_lib", "//envoy/api:api_interface", "//envoy/http:codec_interface", "//envoy/upstream:cluster_manager_interface", @@ -598,8 +594,15 @@ envoy_cc_test( "//source/extensions/clusters/eds:eds_lib", # TODO(mattklein123): Split this into 2 tests for each cluster. "//source/extensions/clusters/static:static_cluster_lib", - "//source/extensions/transport_sockets/raw_buffer:config", + "//source/extensions/load_balancing_policies/cluster_provided:config", + "//source/extensions/load_balancing_policies/least_request:config", + "//source/extensions/load_balancing_policies/maglev:config", + "//source/extensions/load_balancing_policies/random:config", + "//source/extensions/load_balancing_policies/ring_hash:config", + "//source/extensions/load_balancing_policies/round_robin:config", + "//source/extensions/load_balancing_policies/subset:config", "//source/extensions/transport_sockets/http_11_proxy:upstream_config", + "//source/extensions/transport_sockets/raw_buffer:config", "//source/extensions/transport_sockets/tls:config", "//source/extensions/upstreams/http:config", "//source/extensions/upstreams/tcp:config", @@ -609,7 +612,9 @@ envoy_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:options_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", @@ -617,16 +622,12 @@ envoy_cc_test( "//test/mocks/upstream:priority_set_mocks", "//test/mocks/upstream:thread_aware_load_balancer_mocks", "//test/mocks/upstream:typed_load_balancer_factory_mocks", - "//source/extensions/load_balancing_policies/cluster_provided:config", - "//source/extensions/load_balancing_policies/least_request:config", - "//source/extensions/load_balancing_policies/maglev:config", - "//source/extensions/load_balancing_policies/random:config", - "//source/extensions/load_balancing_policies/ring_hash:config", - "//source/extensions/load_balancing_policies/round_robin:config", - "//source/extensions/load_balancing_policies/subset:config", "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", + "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", + "@envoy_api//envoy/config/core/v3:pkg_cc_proto", + "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", ] + envoy_select_enable_http3([ "//source/common/quic:quic_transport_socket_factory_lib", ]), @@ -716,8 +717,8 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/server:options_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index 6cbc51f1b10a8..9e6d6325defdf 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -14,7 +14,7 @@ #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/cluster_priority_set.h" #include "test/test_common/printers.h" diff --git a/test/common/upstream/cluster_factory_impl_test.cc b/test/common/upstream/cluster_factory_impl_test.cc index 5f5769e81dc3d..8caff564347eb 100644 --- a/test/common/upstream/cluster_factory_impl_test.cc +++ b/test/common/upstream/cluster_factory_impl_test.cc @@ -21,8 +21,8 @@ #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/options.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/registry.h" diff --git a/test/common/upstream/deferred_cluster_initialization_test.cc b/test/common/upstream/deferred_cluster_initialization_test.cc index 8afb826d7a3d8..209314ab767ae 100644 --- a/test/common/upstream/deferred_cluster_initialization_test.cc +++ b/test/common/upstream/deferred_cluster_initialization_test.cc @@ -13,7 +13,6 @@ #include "test/mocks/config/mocks.h" #include "test/mocks/config/xds_manager.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/instance.h" #include "test/test_common/utility.h" namespace Envoy { diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index 92194721ab5b7..b8f851f069e63 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -17,7 +17,7 @@ #include "test/mocks/grpc/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_info_factory.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index aaeddf49fe1bc..7d64db788237b 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -32,7 +32,6 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/health_checker_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_priority_set.h" diff --git a/test/common/upstream/od_cds_api_impl_test.cc b/test/common/upstream/od_cds_api_impl_test.cc index 82b1d915fc6f9..059223697c27c 100644 --- a/test/common/upstream/od_cds_api_impl_test.cc +++ b/test/common/upstream/od_cds_api_impl_test.cc @@ -6,7 +6,7 @@ #include "test/mocks/config/xds_manager.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/missing_cluster_notifier.h" diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index d3898794c0084..556a836f4d0d0 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -40,8 +40,8 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/options.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/health_checker.h" diff --git a/test/common/upstream/xdstp_od_cds_api_impl_test.cc b/test/common/upstream/xdstp_od_cds_api_impl_test.cc index d4ece12be41db..717d3af8eee48 100644 --- a/test/common/upstream/xdstp_od_cds_api_impl_test.cc +++ b/test/common/upstream/xdstp_od_cds_api_impl_test.cc @@ -8,7 +8,7 @@ #include "test/mocks/config/xds_manager.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/missing_cluster_notifier.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/access_loggers/dynamic_modules/BUILD b/test/extensions/access_loggers/dynamic_modules/BUILD index dec6098d0b1a7..71e891a4c68aa 100644 --- a/test/extensions/access_loggers/dynamic_modules/BUILD +++ b/test/extensions/access_loggers/dynamic_modules/BUILD @@ -25,7 +25,8 @@ envoy_cc_test( "//source/extensions/access_loggers/dynamic_modules:config", "//test/extensions/dynamic_modules:util", "//test/mocks/access_log:access_log_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:options_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/access_loggers/dynamic_modules/config_test.cc b/test/extensions/access_loggers/dynamic_modules/config_test.cc index 7245c137945db..1cf01a7396375 100644 --- a/test/extensions/access_loggers/dynamic_modules/config_test.cc +++ b/test/extensions/access_loggers/dynamic_modules/config_test.cc @@ -4,7 +4,8 @@ #include "test/extensions/dynamic_modules/util.h" #include "test/mocks/access_log/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/options.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/access_loggers/fluentd/BUILD b/test/extensions/access_loggers/fluentd/BUILD index 78bd85662304c..cb27e7ed459d0 100644 --- a/test/extensions/access_loggers/fluentd/BUILD +++ b/test/extensions/access_loggers/fluentd/BUILD @@ -33,9 +33,10 @@ envoy_extension_cc_test( extension_names = ["envoy.access_loggers.fluentd"], rbe_pool = "6gig", deps = [ - "//source/common/formatter:formatter_extension_lib", + "//source/common/formatter:http_speicific_formatter_extension_lib", + "//source/common/formatter:substitution_format_string_lib", "//source/extensions/access_loggers/fluentd:substitution_formatter_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", ], diff --git a/test/extensions/access_loggers/fluentd/substitution_formatter_test.cc b/test/extensions/access_loggers/fluentd/substitution_formatter_test.cc index a3245ee45634e..c4e26c1a433ea 100644 --- a/test/extensions/access_loggers/fluentd/substitution_formatter_test.cc +++ b/test/extensions/access_loggers/fluentd/substitution_formatter_test.cc @@ -4,7 +4,6 @@ #include "source/common/json/json_loader.h" #include "source/extensions/access_loggers/fluentd/substitution_formatter.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/stats/BUILD b/test/extensions/access_loggers/stats/BUILD index 7e2b64685a00a..9e87a3c364608 100644 --- a/test/extensions/access_loggers/stats/BUILD +++ b/test/extensions/access_loggers/stats/BUILD @@ -40,7 +40,7 @@ envoy_extension_cc_test( "//source/extensions/matching/actions/transform_stat:config", "//test/common/memory:memory_test_utility_lib", "//test/mocks/config:config_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:logging_lib", "//test/test_common:status_utility_lib", @@ -78,7 +78,7 @@ envoy_cc_benchmark_binary( deps = [ "//source/common/stats:thread_local_store_lib", "//source/extensions/access_loggers/stats:stats_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", "@benchmark", diff --git a/test/extensions/access_loggers/stats/stats_speed_test.cc b/test/extensions/access_loggers/stats/stats_speed_test.cc index 85fa299314d50..ef40405530966 100644 --- a/test/extensions/access_loggers/stats/stats_speed_test.cc +++ b/test/extensions/access_loggers/stats/stats_speed_test.cc @@ -4,7 +4,7 @@ #include "source/common/stats/thread_local_store.h" #include "source/extensions/access_loggers/stats/stats.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/access_loggers/stats/stats_test.cc b/test/extensions/access_loggers/stats/stats_test.cc index 1f17cfb8cbef2..9d2f84ef1ac6e 100644 --- a/test/extensions/access_loggers/stats/stats_test.cc +++ b/test/extensions/access_loggers/stats/stats_test.cc @@ -9,7 +9,6 @@ #include "test/common/memory/memory_test_utility.h" #include "test/mocks/config/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/server_factory_context.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/stream_info/mocks.h" diff --git a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/BUILD b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/BUILD index 9f5d51b630ca9..e67a33a44c030 100644 --- a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/BUILD +++ b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/BUILD @@ -90,7 +90,7 @@ envoy_cc_test( "//source/common/network:utility_lib", "//source/extensions/bootstrap/reverse_tunnel/upstream_socket_interface:reverse_tunnel_acceptor_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:instance_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:logging_lib", ], @@ -103,7 +103,7 @@ envoy_cc_test( deps = [ "//source/extensions/access_loggers/stream:config", "//source/extensions/bootstrap/reverse_tunnel/upstream_socket_interface:reverse_tunnel_acceptor_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/access_loggers/stream/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/v3:pkg_cc_proto", diff --git a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/config_validation_test.cc b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/config_validation_test.cc index cfff6655e9d1f..0a7442edb900b 100644 --- a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/config_validation_test.cc +++ b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/config_validation_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/reverse_tunnel_acceptor.h" #include "source/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/reverse_tunnel_acceptor_extension.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/upstream_reverse_connection_io_handle_test.cc b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/upstream_reverse_connection_io_handle_test.cc index 4c37b43e658bb..20449ab3b995c 100644 --- a/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/upstream_reverse_connection_io_handle_test.cc +++ b/test/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/upstream_reverse_connection_io_handle_test.cc @@ -9,7 +9,6 @@ #include "source/extensions/bootstrap/reverse_tunnel/upstream_socket_interface/reverse_tunnel_acceptor_extension.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" #include "gmock/gmock.h" diff --git a/test/extensions/bootstrap/wasm/BUILD b/test/extensions/bootstrap/wasm/BUILD index 5f83c02dc0b79..ee195b7b4ec65 100644 --- a/test/extensions/bootstrap/wasm/BUILD +++ b/test/extensions/bootstrap/wasm/BUILD @@ -41,7 +41,7 @@ envoy_extension_cc_test( "//source/extensions/common/wasm:wasm_lib", "//test/extensions/bootstrap/wasm/test_data:stats_cpp_plugin", "//test/extensions/common/wasm:wasm_runtime", - "//test/mocks/server:server_mocks", + "//test/mocks/local_info:local_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", @@ -108,7 +108,7 @@ envoy_extension_cc_test_binary( "//source/extensions/common/wasm:wasm_lib", "//test/extensions/bootstrap/wasm/test_data:speed_cpp_plugin", "//test/extensions/common/wasm:wasm_runtime", - "//test/mocks/server:server_mocks", + "//test/mocks/local_info:local_info_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/bootstrap/wasm/wasm_speed_test.cc b/test/extensions/bootstrap/wasm/wasm_speed_test.cc index 2c1333fbb8a39..fd7c995dd0e87 100644 --- a/test/extensions/bootstrap/wasm/wasm_speed_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_speed_test.cc @@ -8,7 +8,7 @@ #include "source/common/stats/isolated_store_impl.h" #include "source/extensions/common/wasm/wasm.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/local_info/mocks.h" #include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/extensions/bootstrap/wasm/wasm_test.cc b/test/extensions/bootstrap/wasm/wasm_test.cc index 0d9e895445de8..6242ae2225308 100644 --- a/test/extensions/bootstrap/wasm/wasm_test.cc +++ b/test/extensions/bootstrap/wasm/wasm_test.cc @@ -3,7 +3,7 @@ #include "source/extensions/common/wasm/wasm.h" #include "test/extensions/common/wasm/wasm_runtime.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/local_info/mocks.h" #include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD index 27775f37caef4..81871517dcfef 100644 --- a/test/extensions/clusters/aggregate/BUILD +++ b/test/extensions/clusters/aggregate/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "//source/extensions/transport_sockets/raw_buffer:config", "//test/common/upstream:utility_lib", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:load_balancer_context_mock", "//test/mocks/upstream:load_balancer_mocks", "//test/mocks/upstream:priority_set_mocks", diff --git a/test/extensions/clusters/aggregate/cluster_test.cc b/test/extensions/clusters/aggregate/cluster_test.cc index e2ece779d9bf5..b87eeece96a39 100644 --- a/test/extensions/clusters/aggregate/cluster_test.cc +++ b/test/extensions/clusters/aggregate/cluster_test.cc @@ -7,7 +7,7 @@ #include "test/common/upstream/utility.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/load_balancer.h" #include "test/mocks/upstream/load_balancer_context.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc index 0c99a5c78ba16..00e8c972742ec 100644 --- a/test/extensions/clusters/aggregate/cluster_update_test.cc +++ b/test/extensions/clusters/aggregate/cluster_update_test.cc @@ -12,7 +12,6 @@ #include "test/common/upstream/utility.h" #include "test/mocks/config/xds_manager.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" #include "test/mocks/upstream/cluster_update_callbacks.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/clusters/dynamic_modules/BUILD b/test/extensions/clusters/dynamic_modules/BUILD index 34ecf00e5d820..eb99f547812ba 100644 --- a/test/extensions/clusters/dynamic_modules/BUILD +++ b/test/extensions/clusters/dynamic_modules/BUILD @@ -29,7 +29,7 @@ envoy_cc_test( "//test/extensions/dynamic_modules:util", "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:load_balancer_context_mock", "//test/mocks/upstream:priority_set_mocks", diff --git a/test/extensions/clusters/dynamic_modules/cluster_test.cc b/test/extensions/clusters/dynamic_modules/cluster_test.cc index 6729ff7a268f5..37bf05dee2447 100644 --- a/test/extensions/clusters/dynamic_modules/cluster_test.cc +++ b/test/extensions/clusters/dynamic_modules/cluster_test.cc @@ -12,7 +12,7 @@ #include "test/extensions/dynamic_modules/util.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/connection.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/load_balancer_context.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/clusters/eds/BUILD b/test/extensions/clusters/eds/BUILD index ba43b15e5ae29..63d45862a57c0 100644 --- a/test/extensions/clusters/eds/BUILD +++ b/test/extensions/clusters/eds/BUILD @@ -29,7 +29,7 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:health_checker_mocks", @@ -63,7 +63,8 @@ envoy_cc_benchmark_binary( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:options_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:test_runtime_lib", @@ -97,7 +98,7 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:utility_lib", diff --git a/test/extensions/clusters/eds/eds_speed_test.cc b/test/extensions/clusters/eds/eds_speed_test.cc index 67d045b8bc07c..7c01947c9248d 100644 --- a/test/extensions/clusters/eds/eds_speed_test.cc +++ b/test/extensions/clusters/eds/eds_speed_test.cc @@ -25,8 +25,8 @@ #include "test/mocks/local_info/mocks.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/options.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/eds/eds_test.cc b/test/extensions/clusters/eds/eds_test.cc index d6f0e9d08516c..6bec9dfe88d6c 100644 --- a/test/extensions/clusters/eds/eds_test.cc +++ b/test/extensions/clusters/eds/eds_test.cc @@ -17,7 +17,7 @@ #include "test/mocks/config/eds_resources_cache.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/health_checker.h" diff --git a/test/extensions/clusters/eds/leds_test.cc b/test/extensions/clusters/eds/leds_test.cc index 39e25ca15ef5d..09675ccddf51a 100644 --- a/test/extensions/clusters/eds/leds_test.cc +++ b/test/extensions/clusters/eds/leds_test.cc @@ -13,7 +13,7 @@ #include "test/mocks/protobuf/mocks.h" #include "test/mocks/runtime/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/logical_dns/BUILD b/test/extensions/clusters/logical_dns/BUILD index b95be0057a6cf..28d2432da0c66 100644 --- a/test/extensions/clusters/logical_dns/BUILD +++ b/test/extensions/clusters/logical_dns/BUILD @@ -26,7 +26,7 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", diff --git a/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc b/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc index 98c31ec08b6b8..7e91711fd8a9c 100644 --- a/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc +++ b/test/extensions/clusters/logical_dns/logical_dns_cluster_test.cc @@ -24,7 +24,7 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/mcp_multicluster/BUILD b/test/extensions/clusters/mcp_multicluster/BUILD index 7eb0fbd0a8791..8858a2ccad707 100644 --- a/test/extensions/clusters/mcp_multicluster/BUILD +++ b/test/extensions/clusters/mcp_multicluster/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/network:connection_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/mocks/upstream:load_balancer_context_mock", diff --git a/test/extensions/clusters/mcp_multicluster/cluster_test.cc b/test/extensions/clusters/mcp_multicluster/cluster_test.cc index 80f29fb11a46e..9b36b1ba662b4 100644 --- a/test/extensions/clusters/mcp_multicluster/cluster_test.cc +++ b/test/extensions/clusters/mcp_multicluster/cluster_test.cc @@ -8,7 +8,6 @@ #include "test/mocks/http/conn_pool.h" #include "test/mocks/network/connection.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/mocks/upstream/cluster_info.h" diff --git a/test/extensions/clusters/original_dst/BUILD b/test/extensions/clusters/original_dst/BUILD index b226dcc7b33a0..fc09a1a57a0f2 100644 --- a/test/extensions/clusters/original_dst/BUILD +++ b/test/extensions/clusters/original_dst/BUILD @@ -24,7 +24,7 @@ envoy_cc_test( "//test/mocks:common_lib", "//test/mocks/network:network_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/test/extensions/clusters/original_dst/original_dst_cluster_test.cc b/test/extensions/clusters/original_dst/original_dst_cluster_test.cc index 05ea8478c3e3f..fbd9c357339a7 100644 --- a/test/extensions/clusters/original_dst/original_dst_cluster_test.cc +++ b/test/extensions/clusters/original_dst/original_dst_cluster_test.cc @@ -20,7 +20,7 @@ #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/redis/BUILD b/test/extensions/clusters/redis/BUILD index 2f16341c58744..95d1981d201b1 100644 --- a/test/extensions/clusters/redis/BUILD +++ b/test/extensions/clusters/redis/BUILD @@ -39,7 +39,7 @@ envoy_extension_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", "//test/mocks/upstream:health_check_event_logger_mocks", diff --git a/test/extensions/clusters/redis/redis_cluster_test.cc b/test/extensions/clusters/redis/redis_cluster_test.cc index 363b56f18ec9b..582f25bd83893 100644 --- a/test/extensions/clusters/redis/redis_cluster_test.cc +++ b/test/extensions/clusters/redis/redis_cluster_test.cc @@ -23,7 +23,7 @@ #include "test/mocks/common.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/cluster_priority_set.h" #include "test/mocks/upstream/health_check_event_logger.h" diff --git a/test/extensions/clusters/reverse_connection/BUILD b/test/extensions/clusters/reverse_connection/BUILD index 1d57201e14b7d..b07e0c32759d6 100644 --- a/test/extensions/clusters/reverse_connection/BUILD +++ b/test/extensions/clusters/reverse_connection/BUILD @@ -29,7 +29,6 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:instance_mocks", "//test/test_common:registry_lib", "//test/test_common:threadsafe_singleton_injector_lib", diff --git a/test/extensions/clusters/reverse_connection/reverse_connection_cluster_test.cc b/test/extensions/clusters/reverse_connection/reverse_connection_cluster_test.cc index 937895d94b425..69375f67706ae 100644 --- a/test/extensions/clusters/reverse_connection/reverse_connection_cluster_test.cc +++ b/test/extensions/clusters/reverse_connection/reverse_connection_cluster_test.cc @@ -28,7 +28,6 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" #include "test/mocks/stream_info/mocks.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/extensions/common/async_files/BUILD b/test/extensions/common/async_files/BUILD index 4c26b5dbef575..5cec63c89f472 100644 --- a/test/extensions/common/async_files/BUILD +++ b/test/extensions/common/async_files/BUILD @@ -15,10 +15,12 @@ envoy_cc_test( rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ + "//source/common/singleton:manager_impl_lib", "//source/extensions/common/async_files", "//test/mocks/api:api_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/buffer:buffer_mocks", "//test/test_common:status_utility_lib", + "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/common/async_files/v3:pkg_cc_proto", ], ) @@ -32,9 +34,10 @@ envoy_cc_test( rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ + "//source/common/api:os_sys_calls_lib", + "//source/common/singleton:manager_impl_lib", "//source/extensions/common/async_files", "//test/mocks/api:api_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:status_utility_lib", "@envoy_api//envoy/extensions/common/async_files/v3:pkg_cc_proto", ], @@ -48,9 +51,9 @@ envoy_cc_test( rbe_pool = "6gig", tags = ["skip_on_windows"], deps = [ + "//source/common/singleton:manager_impl_lib", "//source/extensions/common/async_files", "//test/mocks/api:api_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:status_utility_lib", "@envoy_api//envoy/extensions/common/async_files/v3:pkg_cc_proto", ], diff --git a/test/extensions/common/async_files/async_file_handle_thread_pool_test.cc b/test/extensions/common/async_files/async_file_handle_thread_pool_test.cc index 71fa10e5111e9..3713a565a7015 100644 --- a/test/extensions/common/async_files/async_file_handle_thread_pool_test.cc +++ b/test/extensions/common/async_files/async_file_handle_thread_pool_test.cc @@ -8,13 +8,16 @@ #include "envoy/extensions/common/async_files/v3/async_file_manager.pb.h" #include "source/common/buffer/buffer_impl.h" +#include "source/common/singleton/manager_impl.h" #include "source/extensions/common/async_files/async_file_action.h" #include "source/extensions/common/async_files/async_file_handle.h" #include "source/extensions/common/async_files/async_file_manager.h" #include "source/extensions/common/async_files/async_file_manager_factory.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/api/mocks.h" +#include "test/mocks/buffer/mocks.h" #include "test/test_common/status_utility.h" +#include "test/test_common/utility.h" #include "absl/status/statusor.h" #include "gmock/gmock.h" diff --git a/test/extensions/common/async_files/async_file_manager_factory_test.cc b/test/extensions/common/async_files/async_file_manager_factory_test.cc index f2afd824354c1..1ba78a6dc9279 100644 --- a/test/extensions/common/async_files/async_file_manager_factory_test.cc +++ b/test/extensions/common/async_files/async_file_manager_factory_test.cc @@ -5,13 +5,13 @@ #include "envoy/extensions/common/async_files/v3/async_file_manager.pb.h" +#include "source/common/singleton/manager_impl.h" #include "source/extensions/common/async_files/async_file_action.h" #include "source/extensions/common/async_files/async_file_handle.h" #include "source/extensions/common/async_files/async_file_manager.h" #include "source/extensions/common/async_files/async_file_manager_factory.h" #include "test/mocks/api/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/utility.h" #include "absl/base/thread_annotations.h" diff --git a/test/extensions/common/async_files/async_file_manager_thread_pool_test.cc b/test/extensions/common/async_files/async_file_manager_thread_pool_test.cc index 7956b61db2cce..f66525b3069e9 100644 --- a/test/extensions/common/async_files/async_file_manager_thread_pool_test.cc +++ b/test/extensions/common/async_files/async_file_manager_thread_pool_test.cc @@ -6,12 +6,13 @@ #include "envoy/extensions/common/async_files/v3/async_file_manager.pb.h" +#include "source/common/api/os_sys_calls_impl.h" +#include "source/common/singleton/manager_impl.h" #include "source/extensions/common/async_files/async_file_action.h" #include "source/extensions/common/async_files/async_file_handle.h" #include "source/extensions/common/async_files/async_file_manager.h" #include "source/extensions/common/async_files/async_file_manager_factory.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/status_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/async_files/async_file_manager_thread_pool_with_mocks_test.cc b/test/extensions/common/async_files/async_file_manager_thread_pool_with_mocks_test.cc index 8e058436217d3..c6d98e738410a 100644 --- a/test/extensions/common/async_files/async_file_manager_thread_pool_with_mocks_test.cc +++ b/test/extensions/common/async_files/async_file_manager_thread_pool_with_mocks_test.cc @@ -7,13 +7,13 @@ #include "envoy/extensions/common/async_files/v3/async_file_manager.pb.h" +#include "source/common/singleton/manager_impl.h" #include "source/extensions/common/async_files/async_file_action.h" #include "source/extensions/common/async_files/async_file_handle.h" #include "source/extensions/common/async_files/async_file_manager.h" #include "source/extensions/common/async_files/async_file_manager_factory.h" #include "test/mocks/api/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/status_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/dynamic_forward_proxy/BUILD b/test/extensions/common/dynamic_forward_proxy/BUILD index c85e0369b61ba..481bb3379756d 100644 --- a/test/extensions/common/dynamic_forward_proxy/BUILD +++ b/test/extensions/common/dynamic_forward_proxy/BUILD @@ -20,7 +20,7 @@ envoy_cc_test( "//source/extensions/common/dynamic_forward_proxy:dns_cache_manager_impl", "//test/mocks/network:network_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", diff --git a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc index e68c91ab49038..2604233951e1c 100644 --- a/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc +++ b/test/extensions/common/dynamic_forward_proxy/dns_cache_impl_test.cc @@ -10,7 +10,7 @@ #include "test/extensions/common/dynamic_forward_proxy/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_runtime.h" diff --git a/test/extensions/common/matcher/BUILD b/test/extensions/common/matcher/BUILD index 345fe7fc6fa52..1015148ca3b3c 100644 --- a/test/extensions/common/matcher/BUILD +++ b/test/extensions/common/matcher/BUILD @@ -35,7 +35,7 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/matcher:matcher_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -56,7 +56,7 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/matcher:matcher_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/common/matcher/domain_matcher_test.cc b/test/extensions/common/matcher/domain_matcher_test.cc index c867776496f4a..87a6928283273 100644 --- a/test/extensions/common/matcher/domain_matcher_test.cc +++ b/test/extensions/common/matcher/domain_matcher_test.cc @@ -13,7 +13,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/matcher/ip_range_matcher_test.cc b/test/extensions/common/matcher/ip_range_matcher_test.cc index 410d9d3f0a37d..22d7dcc07ee8e 100644 --- a/test/extensions/common/matcher/ip_range_matcher_test.cc +++ b/test/extensions/common/matcher/ip_range_matcher_test.cc @@ -13,7 +13,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/common/tap/BUILD b/test/extensions/common/tap/BUILD index ccfb7cddc3e20..d2205d85f9745 100644 --- a/test/extensions/common/tap/BUILD +++ b/test/extensions/common/tap/BUILD @@ -30,7 +30,7 @@ envoy_cc_test( "//source/extensions/common/tap:tap_config_base", "//test/mocks/server:admin_mocks", "//test/mocks/server:admin_stream_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:logging_lib", "//test/test_common:registry_lib", "@envoy_api//envoy/config/tap/v3:pkg_cc_proto", diff --git a/test/extensions/common/tap/admin_test.cc b/test/extensions/common/tap/admin_test.cc index ec3c7e2cabb92..63763db6b5334 100644 --- a/test/extensions/common/tap/admin_test.cc +++ b/test/extensions/common/tap/admin_test.cc @@ -9,7 +9,7 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/admin_stream.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/logging.h" #include "test/test_common/registry.h" diff --git a/test/extensions/common/wasm/BUILD b/test/extensions/common/wasm/BUILD index f185858a54c80..6e39c3bb1b222 100644 --- a/test/extensions/common/wasm/BUILD +++ b/test/extensions/common/wasm/BUILD @@ -57,7 +57,9 @@ envoy_cc_test( "//test/extensions/common/wasm/test_data:test_cpp_plugin", "//test/extensions/common/wasm/test_data:test_restriction_cpp_plugin", "//test/mocks/local_reply:local_reply_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:overload_manager_mocks", + "//test/mocks/server:server_factory_context_mocks", + "//test/mocks/server:server_lifecycle_notifier_mocks", "//test/test_common:environment_lib", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", @@ -87,7 +89,6 @@ envoy_cc_test_binary( "//source/common/event:dispatcher_lib", "//source/extensions/common/wasm:wasm_lib", "//test/extensions/common/wasm:wasm_runtime", - "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "@abseil-cpp//absl/types:optional", diff --git a/test/extensions/common/wasm/foreign_test.cc b/test/extensions/common/wasm/foreign_test.cc index 2edea699acd26..7d1634074d3ba 100644 --- a/test/extensions/common/wasm/foreign_test.cc +++ b/test/extensions/common/wasm/foreign_test.cc @@ -9,7 +9,6 @@ #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/http/mocks.h" #include "test/mocks/local_info/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" #include "test/test_common/wasm_base.h" diff --git a/test/extensions/common/wasm/wasm_speed_test.cc b/test/extensions/common/wasm/wasm_speed_test.cc index f2e9371267e04..61380ef3a0f69 100644 --- a/test/extensions/common/wasm/wasm_speed_test.cc +++ b/test/extensions/common/wasm/wasm_speed_test.cc @@ -2,7 +2,6 @@ #include "source/common/common/thread_synchronizer.h" #include "source/extensions/common/wasm/wasm.h" -#include "test/mocks/server/mocks.h" #include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/extensions/common/wasm/wasm_test.cc b/test/extensions/common/wasm/wasm_test.cc index 6c3701599b299..6d8e60e65e541 100644 --- a/test/extensions/common/wasm/wasm_test.cc +++ b/test/extensions/common/wasm/wasm_test.cc @@ -11,7 +11,9 @@ #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/local_reply/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/overload_manager.h" +#include "test/mocks/server/server_factory_context.h" +#include "test/mocks/server/server_lifecycle_notifier.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" diff --git a/test/extensions/content_parsers/json/BUILD b/test/extensions/content_parsers/json/BUILD index d2be6f6fce2fc..df78cc048f417 100644 --- a/test/extensions/content_parsers/json/BUILD +++ b/test/extensions/content_parsers/json/BUILD @@ -28,7 +28,7 @@ envoy_extension_cc_test( extension_names = ["envoy.content_parsers.json"], deps = [ "//source/extensions/content_parsers/json:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/content_parsers/json/config_test.cc b/test/extensions/content_parsers/json/config_test.cc index b31eb343a5047..0a8d17e706315 100644 --- a/test/extensions/content_parsers/json/config_test.cc +++ b/test/extensions/content_parsers/json/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/content_parsers/json/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/dynamic_modules/bootstrap/BUILD b/test/extensions/dynamic_modules/bootstrap/BUILD index abfef68d91226..10da32d344e16 100644 --- a/test/extensions/dynamic_modules/bootstrap/BUILD +++ b/test/extensions/dynamic_modules/bootstrap/BUILD @@ -102,7 +102,7 @@ envoy_cc_test( ], deps = [ "//source/extensions/bootstrap/dynamic_modules:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/bootstrap/dynamic_modules/v3:pkg_cc_proto", diff --git a/test/extensions/dynamic_modules/bootstrap/factory_test.cc b/test/extensions/dynamic_modules/bootstrap/factory_test.cc index 77099f6e3e6f8..8864bbf6b3f4f 100644 --- a/test/extensions/dynamic_modules/bootstrap/factory_test.cc +++ b/test/extensions/dynamic_modules/bootstrap/factory_test.cc @@ -3,7 +3,7 @@ #include "source/common/protobuf/protobuf.h" #include "source/extensions/bootstrap/dynamic_modules/factory.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/rbac/BUILD b/test/extensions/filters/common/rbac/BUILD index f28647786dcdc..31a6b10730e0a 100644 --- a/test/extensions/filters/common/rbac/BUILD +++ b/test/extensions/filters/common/rbac/BUILD @@ -46,7 +46,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/rbac:rbac_filter_lib", "//source/extensions/matching/network/common:inputs_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", @@ -65,7 +65,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/common/rbac:utility_lib", "//source/extensions/filters/http/rbac:rbac_filter_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/filters/common/rbac/engine_impl_test.cc b/test/extensions/filters/common/rbac/engine_impl_test.cc index 4c333bd7758ca..e1a61011b62ed 100644 --- a/test/extensions/filters/common/rbac/engine_impl_test.cc +++ b/test/extensions/filters/common/rbac/engine_impl_test.cc @@ -9,7 +9,7 @@ #include "source/extensions/filters/http/rbac/rbac_filter.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/common/rbac/utility_test.cc b/test/extensions/filters/common/rbac/utility_test.cc index 37525eb004aa1..9fa7d0bbdcab1 100644 --- a/test/extensions/filters/common/rbac/utility_test.cc +++ b/test/extensions/filters/common/rbac/utility_test.cc @@ -1,7 +1,7 @@ #include "source/extensions/filters/common/rbac/utility.h" #include "source/extensions/filters/http/rbac/rbac_filter.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" namespace Envoy { diff --git a/test/extensions/filters/common/set_filter_state/BUILD b/test/extensions/filters/common/set_filter_state/BUILD index 20adfff075e80..555ef1fd8473e 100644 --- a/test/extensions/filters/common/set_filter_state/BUILD +++ b/test/extensions/filters/common/set_filter_state/BUILD @@ -18,7 +18,7 @@ envoy_cc_test( "//source/common/router:string_accessor_lib", "//source/extensions/filters/common/set_filter_state:filter_config_lib", "//source/server:generic_factory_context_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", ], diff --git a/test/extensions/filters/common/set_filter_state/filter_config_test.cc b/test/extensions/filters/common/set_filter_state/filter_config_test.cc index bd4fd4b9a9450..8483e7462c190 100644 --- a/test/extensions/filters/common/set_filter_state/filter_config_test.cc +++ b/test/extensions/filters/common/set_filter_state/filter_config_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/filters/common/set_filter_state/filter_config.h" #include "source/server/generic_factory_context.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/composite/BUILD b/test/extensions/filters/http/composite/BUILD index 1aa7ff94f89c8..93ee5fa808c1a 100644 --- a/test/extensions/filters/http/composite/BUILD +++ b/test/extensions/filters/http/composite/BUILD @@ -28,7 +28,6 @@ envoy_extension_cc_test( "//test/mocks/access_log:access_log_mocks", "//test/mocks/http:http_mocks", "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", ], diff --git a/test/extensions/filters/http/composite/filter_test.cc b/test/extensions/filters/http/composite/filter_test.cc index bd920a42de943..8cfaa464541f8 100644 --- a/test/extensions/filters/http/composite/filter_test.cc +++ b/test/extensions/filters/http/composite/filter_test.cc @@ -15,7 +15,6 @@ #include "test/mocks/event/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/logging.h" #include "test/test_common/registry.h" diff --git a/test/extensions/filters/http/custom_response/BUILD b/test/extensions/filters/http/custom_response/BUILD index ed5e284435508..6689aa5c2415d 100644 --- a/test/extensions/filters/http/custom_response/BUILD +++ b/test/extensions/filters/http/custom_response/BUILD @@ -67,8 +67,7 @@ envoy_extension_cc_test( "//source/extensions/http/custom_response/redirect_policy:redirect_policy_lib", "//source/extensions/matching/network/common:inputs_lib", "//test/common/http:common_lib", - "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/filters/http/custom_response/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/custom_response/custom_response_filter_test.cc b/test/extensions/filters/http/custom_response/custom_response_filter_test.cc index deb68ce3b86e1..bae354695df1b 100644 --- a/test/extensions/filters/http/custom_response/custom_response_filter_test.cc +++ b/test/extensions/filters/http/custom_response/custom_response_filter_test.cc @@ -6,8 +6,7 @@ #include "test/common/http/common.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/factory_context.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/file_system_buffer/BUILD b/test/extensions/filters/http/file_system_buffer/BUILD index 938bf923ceca0..3794c07a2230e 100644 --- a/test/extensions/filters/http/file_system_buffer/BUILD +++ b/test/extensions/filters/http/file_system_buffer/BUILD @@ -37,7 +37,8 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/file_system_buffer:config", "//test/extensions/common/async_files:mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", ], ) diff --git a/test/extensions/filters/http/file_system_buffer/config_test.cc b/test/extensions/filters/http/file_system_buffer/config_test.cc index 0a2afdd10dff8..03aad39266008 100644 --- a/test/extensions/filters/http/file_system_buffer/config_test.cc +++ b/test/extensions/filters/http/file_system_buffer/config_test.cc @@ -1,7 +1,8 @@ #include "source/extensions/filters/http/file_system_buffer/config.h" #include "source/extensions/filters/http/file_system_buffer/filter.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/http/file_system_buffer/filter_test.cc b/test/extensions/filters/http/file_system_buffer/filter_test.cc index ec34383cbc903..adc18e07526e5 100644 --- a/test/extensions/filters/http/file_system_buffer/filter_test.cc +++ b/test/extensions/filters/http/file_system_buffer/filter_test.cc @@ -6,7 +6,6 @@ #include "test/extensions/common/async_files/mocks.h" #include "test/mocks/buffer/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/mocks/upstream/mocks.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/http/health_check/BUILD b/test/extensions/filters/http/health_check/BUILD index b113a0e72d974..c00b5ef98fcf3 100644 --- a/test/extensions/filters/http/health_check/BUILD +++ b/test/extensions/filters/http/health_check/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "//source/common/buffer:buffer_lib", "//source/common/http:header_utility_lib", "//source/extensions/filters/http/health_check:health_check_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", ], 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 be949c6e88915..51ef16edbe56d 100644 --- a/test/extensions/filters/http/health_check/health_check_test.cc +++ b/test/extensions/filters/http/health_check/health_check_test.cc @@ -8,7 +8,7 @@ #include "source/common/upstream/upstream_impl.h" #include "source/extensions/filters/http/health_check/health_check.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/json_to_metadata/BUILD b/test/extensions/filters/http/json_to_metadata/BUILD index 6bf95f46ac7fc..4aaf9b15cc350 100644 --- a/test/extensions/filters/http/json_to_metadata/BUILD +++ b/test/extensions/filters/http/json_to_metadata/BUILD @@ -19,7 +19,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/json_to_metadata:json_to_metadata_lib", "//test/common/stream_info:test_util", - "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", ], ) diff --git a/test/extensions/filters/http/json_to_metadata/filter_test.cc b/test/extensions/filters/http/json_to_metadata/filter_test.cc index 9b301f24e1e1b..58290f8e1b5c8 100644 --- a/test/extensions/filters/http/json_to_metadata/filter_test.cc +++ b/test/extensions/filters/http/json_to_metadata/filter_test.cc @@ -8,7 +8,6 @@ #include "test/common/stream_info/test_util.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/local_ratelimit/BUILD b/test/extensions/filters/http/local_ratelimit/BUILD index 366f0e675f80e..fc9974258d517 100644 --- a/test/extensions/filters/http/local_ratelimit/BUILD +++ b/test/extensions/filters/http/local_ratelimit/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/local_ratelimit:local_ratelimit_lib", "//test/common/stream_info:test_util", "//test/mocks/http:http_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/filters/http/local_ratelimit/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/local_ratelimit/filter_test.cc b/test/extensions/filters/http/local_ratelimit/filter_test.cc index 4f45e155e8de5..624fd18260e25 100644 --- a/test/extensions/filters/http/local_ratelimit/filter_test.cc +++ b/test/extensions/filters/http/local_ratelimit/filter_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/filters/http/local_ratelimit/local_ratelimit.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/test_runtime.h" #include "test/test_common/thread_factory_for_test.h" diff --git a/test/extensions/filters/http/proto_message_extraction/BUILD b/test/extensions/filters/http/proto_message_extraction/BUILD index 309af62ead1f1..b6ebbb6989dd5 100644 --- a/test/extensions/filters/http/proto_message_extraction/BUILD +++ b/test/extensions/filters/http/proto_message_extraction/BUILD @@ -43,7 +43,7 @@ envoy_cc_test( "//source/extensions/filters/http/proto_message_extraction:extractor_impl", "//source/extensions/filters/http/proto_message_extraction:filter_config", "//test/mocks/http:http_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/proto:apikeys_proto_cc_proto", "//test/proto:bookstore_proto_cc_proto", "//test/test_common:environment_lib", diff --git a/test/extensions/filters/http/proto_message_extraction/filter_config_test.cc b/test/extensions/filters/http/proto_message_extraction/filter_config_test.cc index 5d5500d168f19..88e7f87efd7cf 100644 --- a/test/extensions/filters/http/proto_message_extraction/filter_config_test.cc +++ b/test/extensions/filters/http/proto_message_extraction/filter_config_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/filters/http/proto_message_extraction/filter_config.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/proto/apikeys.pb.h" #include "test/test_common/environment.h" #include "test/test_common/printers.h" diff --git a/test/extensions/filters/http/ratelimit/BUILD b/test/extensions/filters/http/ratelimit/BUILD index da4e6b9414767..463f1ff3f01a4 100644 --- a/test/extensions/filters/http/ratelimit/BUILD +++ b/test/extensions/filters/http/ratelimit/BUILD @@ -43,7 +43,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/http/ratelimit:config", "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/ratelimit/v3:pkg_cc_proto", ], diff --git a/test/extensions/filters/http/ratelimit/config_test.cc b/test/extensions/filters/http/ratelimit/config_test.cc index 699b1e664a875..fb942555b21e0 100644 --- a/test/extensions/filters/http/ratelimit/config_test.cc +++ b/test/extensions/filters/http/ratelimit/config_test.cc @@ -5,7 +5,6 @@ #include "source/extensions/filters/http/ratelimit/config.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "absl/strings/str_cat.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/http/rbac/BUILD b/test/extensions/filters/http/rbac/BUILD index 549ff23508a4b..d9369c6cf692d 100644 --- a/test/extensions/filters/http/rbac/BUILD +++ b/test/extensions/filters/http/rbac/BUILD @@ -47,7 +47,7 @@ envoy_extension_cc_test( "//test/extensions/filters/http/rbac:route_config_mocks", "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/http/rbac/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/matching/common_inputs/network/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/rbac/rbac_filter_test.cc b/test/extensions/filters/http/rbac/rbac_filter_test.cc index f47846665285e..2f4444c675a32 100644 --- a/test/extensions/filters/http/rbac/rbac_filter_test.cc +++ b/test/extensions/filters/http/rbac/rbac_filter_test.cc @@ -15,7 +15,7 @@ #include "test/extensions/filters/http/rbac/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "xds/type/matcher/v3/matcher.pb.h" diff --git a/test/extensions/filters/http/sse_to_metadata/BUILD b/test/extensions/filters/http/sse_to_metadata/BUILD index ade1cc3708922..f4a6d8a8d423c 100644 --- a/test/extensions/filters/http/sse_to_metadata/BUILD +++ b/test/extensions/filters/http/sse_to_metadata/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( "//source/extensions/filters/http/sse_to_metadata:sse_to_metadata_lib", "//test/common/stream_info:test_util", "//test/mocks/http:http_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/content_parsers/json/v3:pkg_cc_proto", diff --git a/test/extensions/filters/http/sse_to_metadata/filter_test.cc b/test/extensions/filters/http/sse_to_metadata/filter_test.cc index f0234da64c1f9..d5e8422fb52e3 100644 --- a/test/extensions/filters/http/sse_to_metadata/filter_test.cc +++ b/test/extensions/filters/http/sse_to_metadata/filter_test.cc @@ -6,7 +6,7 @@ #include "test/common/stream_info/test_util.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/http/thrift_to_metadata/BUILD b/test/extensions/filters/http/thrift_to_metadata/BUILD index 89dec79622f18..f4b04a82b70fd 100644 --- a/test/extensions/filters/http/thrift_to_metadata/BUILD +++ b/test/extensions/filters/http/thrift_to_metadata/BUILD @@ -21,7 +21,6 @@ envoy_extension_cc_test( "//source/extensions/filters/network/thrift_proxy:protocol_converter_lib", "//test/common/buffer:utility_lib", "//test/common/stream_info:test_util", - "//test/mocks/server:server_mocks", "//test/mocks/upstream:upstream_mocks", ], ) diff --git a/test/extensions/filters/http/thrift_to_metadata/filter_test.cc b/test/extensions/filters/http/thrift_to_metadata/filter_test.cc index cc863757bdf3c..61aa585e4f4f4 100644 --- a/test/extensions/filters/http/thrift_to_metadata/filter_test.cc +++ b/test/extensions/filters/http/thrift_to_metadata/filter_test.cc @@ -9,7 +9,6 @@ #include "test/common/buffer/utility.h" #include "test/common/stream_info/test_util.h" #include "test/mocks/http/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/stream_info/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/dubbo_proxy/BUILD b/test/extensions/filters/network/dubbo_proxy/BUILD index dc2e6e2a1f18b..7b650afd70e41 100644 --- a/test/extensions/filters/network/dubbo_proxy/BUILD +++ b/test/extensions/filters/network/dubbo_proxy/BUILD @@ -132,7 +132,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/network/dubbo_proxy:metadata_lib", "//source/extensions/filters/network/dubbo_proxy/router:route_matcher", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "@envoy_api//envoy/extensions/filters/network/dubbo_proxy/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc index 649fa639fb8b8..3224420f5b1c2 100644 --- a/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc +++ b/test/extensions/filters/network/dubbo_proxy/route_matcher_test.cc @@ -7,7 +7,7 @@ #include "source/extensions/filters/network/dubbo_proxy/message_impl.h" #include "source/extensions/filters/network/dubbo_proxy/router/route_matcher.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/generic_proxy/BUILD b/test/extensions/filters/network/generic_proxy/BUILD index d317667047610..4a9a3e3bd6c76 100644 --- a/test/extensions/filters/network/generic_proxy/BUILD +++ b/test/extensions/filters/network/generic_proxy/BUILD @@ -34,7 +34,7 @@ envoy_cc_test( "//source/extensions/filters/network/generic_proxy:route_lib", "//test/extensions/filters/network/generic_proxy/mocks:filter_mocks", "//test/extensions/filters/network/generic_proxy/mocks:route_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -115,7 +115,6 @@ envoy_cc_test( "//test/extensions/filters/network/generic_proxy/mocks:route_mocks", "//test/integration:base_integration_test_lib", "//test/integration:common_extensions_lib", - "//test/mocks/server:factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", @@ -180,6 +179,6 @@ envoy_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/filters/network/generic_proxy:stats_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/filters/network/generic_proxy/codecs/http1/BUILD b/test/extensions/filters/network/generic_proxy/codecs/http1/BUILD index 567a824949e13..ce8ff6d588dc1 100644 --- a/test/extensions/filters/network/generic_proxy/codecs/http1/BUILD +++ b/test/extensions/filters/network/generic_proxy/codecs/http1/BUILD @@ -17,6 +17,6 @@ envoy_cc_test( deps = [ "//source/extensions/filters/network/generic_proxy/codecs/http1:config", "//test/extensions/filters/network/generic_proxy/mocks:codec_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/filters/network/generic_proxy/codecs/http1/config_test.cc b/test/extensions/filters/network/generic_proxy/codecs/http1/config_test.cc index b445334b652ac..6fa83087e1134 100644 --- a/test/extensions/filters/network/generic_proxy/codecs/http1/config_test.cc +++ b/test/extensions/filters/network/generic_proxy/codecs/http1/config_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/filters/network/generic_proxy/codecs/http1/config.h" #include "test/extensions/filters/network/generic_proxy/mocks/codec.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/generic_proxy/integration_test.cc b/test/extensions/filters/network/generic_proxy/integration_test.cc index 94c8bda2ea709..8751a6bc03b78 100644 --- a/test/extensions/filters/network/generic_proxy/integration_test.cc +++ b/test/extensions/filters/network/generic_proxy/integration_test.cc @@ -11,7 +11,6 @@ #include "test/extensions/filters/network/generic_proxy/mocks/filter.h" #include "test/extensions/filters/network/generic_proxy/mocks/route.h" #include "test/integration/base_integration_test.h" -#include "test/mocks/server/factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/generic_proxy/route_test.cc b/test/extensions/filters/network/generic_proxy/route_test.cc index 3eb597570f12b..379b239483a33 100644 --- a/test/extensions/filters/network/generic_proxy/route_test.cc +++ b/test/extensions/filters/network/generic_proxy/route_test.cc @@ -7,7 +7,7 @@ #include "test/extensions/filters/network/generic_proxy/fake_codec.h" #include "test/extensions/filters/network/generic_proxy/mocks/filter.h" #include "test/extensions/filters/network/generic_proxy/mocks/route.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/extensions/filters/network/generic_proxy/router/BUILD b/test/extensions/filters/network/generic_proxy/router/BUILD index ec391e52e7f3e..abdfd5b5cd2dc 100644 --- a/test/extensions/filters/network/generic_proxy/router/BUILD +++ b/test/extensions/filters/network/generic_proxy/router/BUILD @@ -39,7 +39,8 @@ envoy_cc_test( "//test/extensions/filters/network/generic_proxy/mocks:codec_mocks", "//test/extensions/filters/network/generic_proxy/mocks:filter_mocks", "//test/extensions/filters/network/generic_proxy/mocks:route_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/network:connection_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/filters/network/generic_proxy/router/upstream_test.cc b/test/extensions/filters/network/generic_proxy/router/upstream_test.cc index a7b683eb8f0ae..b31c742182b1c 100644 --- a/test/extensions/filters/network/generic_proxy/router/upstream_test.cc +++ b/test/extensions/filters/network/generic_proxy/router/upstream_test.cc @@ -7,12 +7,15 @@ #include "test/extensions/filters/network/generic_proxy/mocks/codec.h" #include "test/extensions/filters/network/generic_proxy/mocks/filter.h" #include "test/extensions/filters/network/generic_proxy/mocks/route.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/network/connection.h" +#include "test/mocks/upstream/thread_local_cluster.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; +using testing::ByMove; using testing::NiceMock; using testing::Return; diff --git a/test/extensions/filters/network/generic_proxy/stats_test.cc b/test/extensions/filters/network/generic_proxy/stats_test.cc index 738952a872a9f..e1770c6053265 100644 --- a/test/extensions/filters/network/generic_proxy/stats_test.cc +++ b/test/extensions/filters/network/generic_proxy/stats_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/filters/network/generic_proxy/stats.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/geoip/BUILD b/test/extensions/filters/network/geoip/BUILD index 10755f469668e..39cf2cf0a2c6d 100644 --- a/test/extensions/filters/network/geoip/BUILD +++ b/test/extensions/filters/network/geoip/BUILD @@ -21,7 +21,6 @@ envoy_cc_test( "//source/extensions/filters/network/geoip:geoip_filter_lib", "//test/extensions/filters/http/geoip:geoip_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:logging_lib", "//test/test_common:registry_lib", diff --git a/test/extensions/filters/network/geoip/geoip_filter_test.cc b/test/extensions/filters/network/geoip/geoip_filter_test.cc index f710b814fd635..afc1c35741f37 100644 --- a/test/extensions/filters/network/geoip/geoip_filter_test.cc +++ b/test/extensions/filters/network/geoip/geoip_filter_test.cc @@ -8,7 +8,6 @@ #include "test/extensions/filters/http/geoip/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/logging.h" #include "test/test_common/registry.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc index 6ec85637ce1d3..7a23f381c81a5 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_chain_test.cc @@ -4,7 +4,6 @@ #include "test/mocks/config/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc index 5af63a048f207..00cca4f73378b 100644 --- a/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc +++ b/test/extensions/filters/network/http_connection_manager/config_filter_dependencies_test.cc @@ -6,7 +6,6 @@ #include "test/mocks/config/mocks.h" #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" #include "test/test_common/registry.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/network/ratelimit/BUILD b/test/extensions/filters/network/ratelimit/BUILD index 1fceaa756d117..383d690c27c27 100644 --- a/test/extensions/filters/network/ratelimit/BUILD +++ b/test/extensions/filters/network/ratelimit/BUILD @@ -46,7 +46,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/filters/network/ratelimit:config", "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/ratelimit/v3:pkg_cc_proto", diff --git a/test/extensions/filters/network/ratelimit/config_test.cc b/test/extensions/filters/network/ratelimit/config_test.cc index d1f04d3805c38..40d1338394dc5 100644 --- a/test/extensions/filters/network/ratelimit/config_test.cc +++ b/test/extensions/filters/network/ratelimit/config_test.cc @@ -5,7 +5,6 @@ #include "source/extensions/filters/network/ratelimit/config.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/network/rbac/BUILD b/test/extensions/filters/network/rbac/BUILD index 4f08179478663..39d1452065289 100644 --- a/test/extensions/filters/network/rbac/BUILD +++ b/test/extensions/filters/network/rbac/BUILD @@ -37,7 +37,7 @@ envoy_extension_cc_test( "//source/extensions/filters/network/rbac:rbac_filter", "//source/extensions/matching/network/common:inputs_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "@envoy_api//envoy/config/rbac/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/rbac/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/matching/common_inputs/network/v3:pkg_cc_proto", diff --git a/test/extensions/filters/network/rbac/filter_test.cc b/test/extensions/filters/network/rbac/filter_test.cc index 4229b293b5cbb..eff59b8854c15 100644 --- a/test/extensions/filters/network/rbac/filter_test.cc +++ b/test/extensions/filters/network/rbac/filter_test.cc @@ -12,7 +12,7 @@ #include "test/mocks/event/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "xds/type/matcher/v3/matcher.pb.h" diff --git a/test/extensions/filters/network/wasm/BUILD b/test/extensions/filters/network/wasm/BUILD index b561b390e23bb..ca44955fd2bc2 100644 --- a/test/extensions/filters/network/wasm/BUILD +++ b/test/extensions/filters/network/wasm/BUILD @@ -60,7 +60,6 @@ envoy_extension_cc_test( "//test/extensions/common/wasm:wasm_runtime", "//test/extensions/filters/network/wasm/test_data:test_cpp_plugin", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:wasm_lib", ], ) diff --git a/test/extensions/filters/network/wasm/wasm_filter_test.cc b/test/extensions/filters/network/wasm/wasm_filter_test.cc index 979642483d5cf..04b8702be0cec 100644 --- a/test/extensions/filters/network/wasm/wasm_filter_test.cc +++ b/test/extensions/filters/network/wasm/wasm_filter_test.cc @@ -6,7 +6,6 @@ #include "test/extensions/common/wasm/wasm_runtime.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/wasm_base.h" #include "gmock/gmock.h" diff --git a/test/extensions/filters/udp/dns_filter/BUILD b/test/extensions/filters/udp/dns_filter/BUILD index 59209cfa5f101..d6f58b28d1338 100644 --- a/test/extensions/filters/udp/dns_filter/BUILD +++ b/test/extensions/filters/udp/dns_filter/BUILD @@ -37,7 +37,6 @@ envoy_extension_cc_test( ":dns_filter_test_lib", "//source/extensions/filters/udp/dns_filter:dns_filter_lib", "//source/extensions/network/dns_resolver/getaddrinfo:config", - "//test/mocks/server:instance_mocks", "//test/mocks/server:listener_factory_context_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", @@ -58,7 +57,6 @@ envoy_extension_cc_test( "//source/extensions/network/dns_resolver/cares:config", "//source/extensions/network/dns_resolver/getaddrinfo:config", "//test/mocks/access_log:access_log_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/server:listener_factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:registry_lib", diff --git a/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc index 0977d04619dc1..f81ce17379024 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_access_log_test.cc @@ -8,7 +8,6 @@ #include "source/extensions/filters/udp/dns_filter/dns_filter_utils.h" #include "test/mocks/event/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/filters/udp/dns_filter/dns_filter_test.cc b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc index 4d2573c8fd85a..d49153c61c47a 100644 --- a/test/extensions/filters/udp/dns_filter/dns_filter_test.cc +++ b/test/extensions/filters/udp/dns_filter/dns_filter_test.cc @@ -6,7 +6,6 @@ #include "source/extensions/network/dns_resolver/getaddrinfo/getaddrinfo.h" #include "test/mocks/event/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/registry.h" diff --git a/test/extensions/filters/udp/udp_proxy/BUILD b/test/extensions/filters/udp/udp_proxy/BUILD index 5390915796c26..557d894429c3b 100644 --- a/test/extensions/filters/udp/udp_proxy/BUILD +++ b/test/extensions/filters/udp/udp_proxy/BUILD @@ -85,7 +85,7 @@ envoy_extension_cc_test( "//source/common/network:utility_lib", "//source/extensions/filters/udp/udp_proxy/router:router_lib", "//source/extensions/matching/network/common:inputs_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/filters/udp/udp_proxy/v3:pkg_cc_proto", ], diff --git a/test/extensions/filters/udp/udp_proxy/router_impl_test.cc b/test/extensions/filters/udp/udp_proxy/router_impl_test.cc index 06aab24dcd5ab..a7105f22cda90 100644 --- a/test/extensions/filters/udp/udp_proxy/router_impl_test.cc +++ b/test/extensions/filters/udp/udp_proxy/router_impl_test.cc @@ -5,7 +5,7 @@ #include "source/common/protobuf/protobuf.h" #include "source/extensions/filters/udp/udp_proxy/router/router_impl.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/health_checkers/redis/BUILD b/test/extensions/health_checkers/redis/BUILD index a9e38d42af9b6..0edf6f98c6a1d 100644 --- a/test/extensions/health_checkers/redis/BUILD +++ b/test/extensions/health_checkers/redis/BUILD @@ -47,7 +47,6 @@ envoy_extension_cc_test( "//source/common/upstream:health_checker_lib", "//source/extensions/health_checkers/redis:config", "//test/common/upstream:utility_lib", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:health_checker_factory_context_mocks", "//test/mocks/upstream:health_checker_mocks", "//test/mocks/upstream:priority_set_mocks", diff --git a/test/extensions/health_checkers/redis/config_test.cc b/test/extensions/health_checkers/redis/config_test.cc index 3ebd2fa485d3b..0dc325cea37e7 100644 --- a/test/extensions/health_checkers/redis/config_test.cc +++ b/test/extensions/health_checkers/redis/config_test.cc @@ -5,7 +5,6 @@ #include "source/extensions/health_checkers/redis/config.h" #include "test/common/upstream/utility.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/health_checker_factory_context.h" #include "test/mocks/upstream/health_checker.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/health_checkers/thrift/BUILD b/test/extensions/health_checkers/thrift/BUILD index f227a9ee6a3aa..a6b7e85029cf0 100644 --- a/test/extensions/health_checkers/thrift/BUILD +++ b/test/extensions/health_checkers/thrift/BUILD @@ -75,7 +75,6 @@ envoy_extension_cc_test( "//source/common/upstream:health_checker_lib", "//source/extensions/health_checkers/thrift:config", "//test/common/upstream:utility_lib", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:health_checker_factory_context_mocks", "//test/mocks/upstream:health_checker_mocks", "//test/mocks/upstream:priority_set_mocks", diff --git a/test/extensions/health_checkers/thrift/config_test.cc b/test/extensions/health_checkers/thrift/config_test.cc index 280ab53339aba..cb8845cfe1326 100644 --- a/test/extensions/health_checkers/thrift/config_test.cc +++ b/test/extensions/health_checkers/thrift/config_test.cc @@ -4,7 +4,6 @@ #include "source/extensions/health_checkers/thrift/config.h" #include "test/common/upstream/utility.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/health_checker_factory_context.h" #include "test/mocks/upstream/health_checker.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/http/header_validators/envoy_default/BUILD b/test/extensions/http/header_validators/envoy_default/BUILD index f97d0c48c6ed8..72609c4321abd 100644 --- a/test/extensions/http/header_validators/envoy_default/BUILD +++ b/test/extensions/http/header_validators/envoy_default/BUILD @@ -113,7 +113,7 @@ envoy_extension_cc_test( "//source/common/network:utility_lib", "//source/extensions/http/header_validators/envoy_default:config", "//test/mocks/http:header_validator_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/http/header_validators/envoy_default/v3:pkg_cc_proto", ], diff --git a/test/extensions/http/header_validators/envoy_default/header_validator_factory_test.cc b/test/extensions/http/header_validators/envoy_default/header_validator_factory_test.cc index 9831a345cf72c..a29538b7f2704 100644 --- a/test/extensions/http/header_validators/envoy_default/header_validator_factory_test.cc +++ b/test/extensions/http/header_validators/envoy_default/header_validator_factory_test.cc @@ -6,7 +6,7 @@ #include "source/extensions/http/header_validators/envoy_default/http2_header_validator.h" #include "test/mocks/http/header_validator.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/http/stateful_session/cookie/BUILD b/test/extensions/http/stateful_session/cookie/BUILD index 9bface0708487..bd37739c80952 100644 --- a/test/extensions/http/stateful_session/cookie/BUILD +++ b/test/extensions/http/stateful_session/cookie/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( deps = [ "//envoy/registry", "//source/extensions/http/stateful_session/cookie:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/http/stateful_session/cookie/config_test.cc b/test/extensions/http/stateful_session/cookie/config_test.cc index 47a3383aaff47..7c94334f478f8 100644 --- a/test/extensions/http/stateful_session/cookie/config_test.cc +++ b/test/extensions/http/stateful_session/cookie/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/http/stateful_session/cookie/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/http/stateful_session/envelope/BUILD b/test/extensions/http/stateful_session/envelope/BUILD index 0b318c0b529ea..10faf8452d247 100644 --- a/test/extensions/http/stateful_session/envelope/BUILD +++ b/test/extensions/http/stateful_session/envelope/BUILD @@ -32,7 +32,7 @@ envoy_extension_cc_test( deps = [ "//envoy/registry", "//source/extensions/http/stateful_session/envelope:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/http/stateful_session/envelope/config_test.cc b/test/extensions/http/stateful_session/envelope/config_test.cc index 743de9ea38066..f25ad9da15475 100644 --- a/test/extensions/http/stateful_session/envelope/config_test.cc +++ b/test/extensions/http/stateful_session/envelope/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/http/stateful_session/envelope/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/http/stateful_session/header/BUILD b/test/extensions/http/stateful_session/header/BUILD index 5b0e2070e92e9..c897d68e25332 100644 --- a/test/extensions/http/stateful_session/header/BUILD +++ b/test/extensions/http/stateful_session/header/BUILD @@ -32,7 +32,7 @@ envoy_extension_cc_test( deps = [ "//envoy/registry", "//source/extensions/http/stateful_session/header:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/http/stateful_session/header/config_test.cc b/test/extensions/http/stateful_session/header/config_test.cc index 2a763669158b1..bc22e8d902d61 100644 --- a/test/extensions/http/stateful_session/header/config_test.cc +++ b/test/extensions/http/stateful_session/header/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/http/stateful_session/header/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/load_balancing_policies/client_side_weighted_round_robin/BUILD b/test/extensions/load_balancing_policies/client_side_weighted_round_robin/BUILD index 3fe95cd238e71..eb2daa60ff5a9 100644 --- a/test/extensions/load_balancing_policies/client_side_weighted_round_robin/BUILD +++ b/test/extensions/load_balancing_policies/client_side_weighted_round_robin/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/client_side_weighted_round_robin:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/client_side_weighted_round_robin/config_test.cc b/test/extensions/load_balancing_policies/client_side_weighted_round_robin/config_test.cc index bd0c734599b8a..d4c6d478fcf91 100644 --- a/test/extensions/load_balancing_policies/client_side_weighted_round_robin/config_test.cc +++ b/test/extensions/load_balancing_policies/client_side_weighted_round_robin/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/client_side_weighted_round_robin/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/cluster_provided/BUILD b/test/extensions/load_balancing_policies/cluster_provided/BUILD index ef527f5ab1b4b..0467581e1091f 100644 --- a/test/extensions/load_balancing_policies/cluster_provided/BUILD +++ b/test/extensions/load_balancing_policies/cluster_provided/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/cluster_provided:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/cluster_provided/config_test.cc b/test/extensions/load_balancing_policies/cluster_provided/config_test.cc index f50d8358fb700..ab5daab867cfd 100644 --- a/test/extensions/load_balancing_policies/cluster_provided/config_test.cc +++ b/test/extensions/load_balancing_policies/cluster_provided/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/cluster_provided/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/dynamic_modules/BUILD b/test/extensions/load_balancing_policies/dynamic_modules/BUILD index df8769440d786..31bee36c1d1bf 100644 --- a/test/extensions/load_balancing_policies/dynamic_modules/BUILD +++ b/test/extensions/load_balancing_policies/dynamic_modules/BUILD @@ -26,7 +26,7 @@ envoy_cc_test( "//source/extensions/load_balancing_policies/dynamic_modules:config", "//source/extensions/load_balancing_policies/dynamic_modules:load_balancer_lib", "//test/extensions/dynamic_modules:util", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:host_mocks", "//test/mocks/upstream:host_set_mocks", diff --git a/test/extensions/load_balancing_policies/dynamic_modules/config_test.cc b/test/extensions/load_balancing_policies/dynamic_modules/config_test.cc index 65bc98434e964..7d24e3eab96fc 100644 --- a/test/extensions/load_balancing_policies/dynamic_modules/config_test.cc +++ b/test/extensions/load_balancing_policies/dynamic_modules/config_test.cc @@ -8,7 +8,7 @@ #include "source/extensions/load_balancing_policies/dynamic_modules/load_balancer.h" #include "test/extensions/dynamic_modules/util.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/host.h" #include "test/mocks/upstream/host_set.h" diff --git a/test/extensions/load_balancing_policies/least_request/BUILD b/test/extensions/load_balancing_policies/least_request/BUILD index bcf201898c573..db88ea982caf1 100644 --- a/test/extensions/load_balancing_policies/least_request/BUILD +++ b/test/extensions/load_balancing_policies/least_request/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/least_request:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/least_request/config_test.cc b/test/extensions/load_balancing_policies/least_request/config_test.cc index 16d3ee562ee18..f85ccf31d4c3b 100644 --- a/test/extensions/load_balancing_policies/least_request/config_test.cc +++ b/test/extensions/load_balancing_policies/least_request/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/least_request/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/maglev/BUILD b/test/extensions/load_balancing_policies/maglev/BUILD index 107e91912fad1..4de66be68799d 100644 --- a/test/extensions/load_balancing_policies/maglev/BUILD +++ b/test/extensions/load_balancing_policies/maglev/BUILD @@ -64,7 +64,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/maglev:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/maglev/config_test.cc b/test/extensions/load_balancing_policies/maglev/config_test.cc index d482456685f44..11e3b6b502a1e 100644 --- a/test/extensions/load_balancing_policies/maglev/config_test.cc +++ b/test/extensions/load_balancing_policies/maglev/config_test.cc @@ -3,7 +3,7 @@ #include "source/extensions/load_balancing_policies/maglev/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/random/BUILD b/test/extensions/load_balancing_policies/random/BUILD index 0014f2cec84b6..174c24166009a 100644 --- a/test/extensions/load_balancing_policies/random/BUILD +++ b/test/extensions/load_balancing_policies/random/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/random:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/random/config_test.cc b/test/extensions/load_balancing_policies/random/config_test.cc index 2dc9a367e2595..f851a11f55834 100644 --- a/test/extensions/load_balancing_policies/random/config_test.cc +++ b/test/extensions/load_balancing_policies/random/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/random/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/ring_hash/BUILD b/test/extensions/load_balancing_policies/ring_hash/BUILD index 20a51cbfaf54a..563c874cc4b52 100644 --- a/test/extensions/load_balancing_policies/ring_hash/BUILD +++ b/test/extensions/load_balancing_policies/ring_hash/BUILD @@ -45,7 +45,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/ring_hash:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/ring_hash/config_test.cc b/test/extensions/load_balancing_policies/ring_hash/config_test.cc index 8437ae4595c65..0e60b9c0d1489 100644 --- a/test/extensions/load_balancing_policies/ring_hash/config_test.cc +++ b/test/extensions/load_balancing_policies/ring_hash/config_test.cc @@ -4,7 +4,7 @@ #include "source/extensions/load_balancing_policies/ring_hash/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/round_robin/BUILD b/test/extensions/load_balancing_policies/round_robin/BUILD index 9be16c6636430..a71259f8495d0 100644 --- a/test/extensions/load_balancing_policies/round_robin/BUILD +++ b/test/extensions/load_balancing_policies/round_robin/BUILD @@ -22,7 +22,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/load_balancing_policies/round_robin:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/round_robin/config_test.cc b/test/extensions/load_balancing_policies/round_robin/config_test.cc index f9cf3feac72b0..d89a8c9ce72ab 100644 --- a/test/extensions/load_balancing_policies/round_robin/config_test.cc +++ b/test/extensions/load_balancing_policies/round_robin/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/round_robin/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/load_balancing_policies/subset/BUILD b/test/extensions/load_balancing_policies/subset/BUILD index 5ad2b1d01fd73..6eafd449593bc 100644 --- a/test/extensions/load_balancing_policies/subset/BUILD +++ b/test/extensions/load_balancing_policies/subset/BUILD @@ -65,7 +65,7 @@ envoy_extension_cc_test( "//test/common/upstream:utility_lib", "//test/mocks:common_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:host_mocks", "//test/mocks/upstream:host_set_mocks", @@ -88,7 +88,7 @@ envoy_extension_cc_benchmark_binary( "//source/extensions/load_balancing_policies/random:config", "//source/extensions/load_balancing_policies/subset:config", "//test/extensions/load_balancing_policies/common:benchmark_base_tester_lib", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:load_balancer_mocks", "@benchmark", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/subset/subset_benchmark.cc b/test/extensions/load_balancing_policies/subset/subset_benchmark.cc index 9f9bc953be066..455b9c16114b5 100644 --- a/test/extensions/load_balancing_policies/subset/subset_benchmark.cc +++ b/test/extensions/load_balancing_policies/subset/subset_benchmark.cc @@ -15,7 +15,7 @@ #include "test/benchmark/main.h" #include "test/common/upstream/utility.h" #include "test/extensions/load_balancing_policies/common/benchmark_base_tester.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/load_balancer.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/load_balancing_policies/subset/subset_test.cc b/test/extensions/load_balancing_policies/subset/subset_test.cc index 46c0bee0cf4fa..e05514c52183f 100644 --- a/test/extensions/load_balancing_policies/subset/subset_test.cc +++ b/test/extensions/load_balancing_policies/subset/subset_test.cc @@ -19,7 +19,7 @@ #include "test/common/upstream/utility.h" #include "test/mocks/common.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/host.h" #include "test/mocks/upstream/host_set.h" diff --git a/test/extensions/load_balancing_policies/wrr_locality/BUILD b/test/extensions/load_balancing_policies/wrr_locality/BUILD index 9ceecb2e80392..7bd52f60ca491 100644 --- a/test/extensions/load_balancing_policies/wrr_locality/BUILD +++ b/test/extensions/load_balancing_policies/wrr_locality/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/load_balancing_policies/random:config", "//source/extensions/load_balancing_policies/wrr_locality:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", diff --git a/test/extensions/load_balancing_policies/wrr_locality/config_test.cc b/test/extensions/load_balancing_policies/wrr_locality/config_test.cc index cec21f327bb49..8e900c71fde7d 100644 --- a/test/extensions/load_balancing_policies/wrr_locality/config_test.cc +++ b/test/extensions/load_balancing_policies/wrr_locality/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/load_balancing_policies/wrr_locality/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/priority_set.h" diff --git a/test/extensions/matching/common_inputs/environment_variable/BUILD b/test/extensions/matching/common_inputs/environment_variable/BUILD index 4a50fb77f9de4..d79a871f92820 100644 --- a/test/extensions/matching/common_inputs/environment_variable/BUILD +++ b/test/extensions/matching/common_inputs/environment_variable/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/matching/common_inputs/environment_variable:config", - "//test/mocks/server:factory_context_mocks", + "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/matching/common_inputs/environment_variable/config_test.cc b/test/extensions/matching/common_inputs/environment_variable/config_test.cc index 70a795cfae636..ea86b3ca94999 100644 --- a/test/extensions/matching/common_inputs/environment_variable/config_test.cc +++ b/test/extensions/matching/common_inputs/environment_variable/config_test.cc @@ -1,8 +1,8 @@ #include "source/common/config/utility.h" #include "source/extensions/matching/common_inputs/environment_variable/config.h" -#include "test/mocks/server/factory_context.h" #include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/matching/input_matchers/cel_matcher/BUILD b/test/extensions/matching/input_matchers/cel_matcher/BUILD index cb94d0d14454b..ba4ad3bf0a692 100644 --- a/test/extensions/matching/input_matchers/cel_matcher/BUILD +++ b/test/extensions/matching/input_matchers/cel_matcher/BUILD @@ -33,7 +33,7 @@ envoy_extension_cc_test( "//test/common/matcher:test_utility_lib", "//test/mocks/http:http_mocks", "//test/mocks/matcher:matcher_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", "//test/test_common:test_runtime_lib", diff --git a/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc b/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc index 5f6b5c10f9807..c137f420b51fc 100644 --- a/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc +++ b/test/extensions/matching/input_matchers/cel_matcher/cel_matcher_test.cc @@ -17,7 +17,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/test_runtime.h" #include "test/test_common/utility.h" diff --git a/test/extensions/matching/input_matchers/consistent_hashing/BUILD b/test/extensions/matching/input_matchers/consistent_hashing/BUILD index 18f823ccae322..bfc20c8668670 100644 --- a/test/extensions/matching/input_matchers/consistent_hashing/BUILD +++ b/test/extensions/matching/input_matchers/consistent_hashing/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/consistent_hashing:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc index 821b9b8998c0e..af5d859a1436b 100644 --- a/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc +++ b/test/extensions/matching/input_matchers/consistent_hashing/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/matching/input_matchers/consistent_hashing/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gtest/gtest.h" diff --git a/test/extensions/matching/input_matchers/dynamic_modules/BUILD b/test/extensions/matching/input_matchers/dynamic_modules/BUILD index ae7d1e74b4f25..240009ff6e659 100644 --- a/test/extensions/matching/input_matchers/dynamic_modules/BUILD +++ b/test/extensions/matching/input_matchers/dynamic_modules/BUILD @@ -23,7 +23,7 @@ envoy_cc_test( "//envoy/registry", "//source/extensions/matching/input_matchers/dynamic_modules:config", "//test/extensions/dynamic_modules:util", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/matching/input_matchers/dynamic_modules/config_test.cc b/test/extensions/matching/input_matchers/dynamic_modules/config_test.cc index cf9b526f20eaf..e39ab36a06264 100644 --- a/test/extensions/matching/input_matchers/dynamic_modules/config_test.cc +++ b/test/extensions/matching/input_matchers/dynamic_modules/config_test.cc @@ -3,7 +3,7 @@ #include "source/extensions/matching/input_matchers/dynamic_modules/config.h" #include "test/extensions/dynamic_modules/util.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/matching/input_matchers/ip/BUILD b/test/extensions/matching/input_matchers/ip/BUILD index b3e1c7950cdb3..d6d504ec0a777 100644 --- a/test/extensions/matching/input_matchers/ip/BUILD +++ b/test/extensions/matching/input_matchers/ip/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/ip:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/matching/input_matchers/ip/config_test.cc b/test/extensions/matching/input_matchers/ip/config_test.cc index ef5b99d0e5136..2461a4d7af651 100644 --- a/test/extensions/matching/input_matchers/ip/config_test.cc +++ b/test/extensions/matching/input_matchers/ip/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/matching/input_matchers/ip/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gtest/gtest.h" diff --git a/test/extensions/matching/input_matchers/metadata/BUILD b/test/extensions/matching/input_matchers/metadata/BUILD index 862c59c2c214c..baa762bb77875 100644 --- a/test/extensions/matching/input_matchers/metadata/BUILD +++ b/test/extensions/matching/input_matchers/metadata/BUILD @@ -24,7 +24,7 @@ envoy_extension_cc_test( "//test/common/matcher:test_utility_lib", "//test/mocks/http:http_mocks", "//test/mocks/matcher:matcher_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stream_info:stream_info_mocks", "//test/test_common:registry_lib", "@envoy_api//envoy/config/common/matcher/v3:pkg_cc_proto", diff --git a/test/extensions/matching/input_matchers/metadata/dyn_meta_matcher_test.cc b/test/extensions/matching/input_matchers/metadata/dyn_meta_matcher_test.cc index a7a30744b72d1..9e2b7df53fa1f 100644 --- a/test/extensions/matching/input_matchers/metadata/dyn_meta_matcher_test.cc +++ b/test/extensions/matching/input_matchers/metadata/dyn_meta_matcher_test.cc @@ -14,7 +14,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/matching/input_matchers/runtime_fraction/BUILD b/test/extensions/matching/input_matchers/runtime_fraction/BUILD index c93c71e3825e6..b4aa38620b421 100644 --- a/test/extensions/matching/input_matchers/runtime_fraction/BUILD +++ b/test/extensions/matching/input_matchers/runtime_fraction/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/matching/input_matchers/runtime_fraction:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/matching/input_matchers/runtime_fraction/config_test.cc b/test/extensions/matching/input_matchers/runtime_fraction/config_test.cc index d00b487b61a5f..7cd5df18d18dc 100644 --- a/test/extensions/matching/input_matchers/runtime_fraction/config_test.cc +++ b/test/extensions/matching/input_matchers/runtime_fraction/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/matching/input_matchers/runtime_fraction/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gtest/gtest.h" diff --git a/test/extensions/matching/network/common/BUILD b/test/extensions/matching/network/common/BUILD index df62868323811..da1594b9bb328 100644 --- a/test/extensions/matching/network/common/BUILD +++ b/test/extensions/matching/network/common/BUILD @@ -38,6 +38,6 @@ envoy_cc_test( "//test/common/matcher:test_utility_lib", "//test/mocks/matcher:matcher_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) diff --git a/test/extensions/matching/network/common/inputs_integration_test.cc b/test/extensions/matching/network/common/inputs_integration_test.cc index 8c368b71e627b..1b520fae9e607 100644 --- a/test/extensions/matching/network/common/inputs_integration_test.cc +++ b/test/extensions/matching/network/common/inputs_integration_test.cc @@ -8,7 +8,7 @@ #include "test/common/matcher/test_utility.h" #include "test/mocks/matcher/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "gtest/gtest.h" diff --git a/test/extensions/path/match/uri_template/BUILD b/test/extensions/path/match/uri_template/BUILD index 7463db5b5e02c..1107287f5d9b7 100644 --- a/test/extensions/path/match/uri_template/BUILD +++ b/test/extensions/path/match/uri_template/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/path/match/uri_template:config", - "//test/mocks/server:factory_context_mocks", + "//test/test_common:utility_lib", ], ) @@ -30,6 +30,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/path/match/uri_template:config", "//source/extensions/path/match/uri_template:uri_template_match_lib", - "//test/mocks/server:factory_context_mocks", + "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/path/match/uri_template/config_test.cc b/test/extensions/path/match/uri_template/config_test.cc index c99108c566ae6..4385abd9c6550 100644 --- a/test/extensions/path/match/uri_template/config_test.cc +++ b/test/extensions/path/match/uri_template/config_test.cc @@ -1,8 +1,7 @@ #include "source/common/config/utility.h" #include "source/extensions/path/match/uri_template/config.h" -#include "test/mocks/server/factory_context.h" -#include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/path/match/uri_template/library_test.cc b/test/extensions/path/match/uri_template/library_test.cc index 002fea5a8c689..69ecfe0693865 100644 --- a/test/extensions/path/match/uri_template/library_test.cc +++ b/test/extensions/path/match/uri_template/library_test.cc @@ -2,8 +2,8 @@ #include "source/extensions/path/match/uri_template/config.h" #include "source/extensions/path/match/uri_template/uri_template_match.h" -#include "test/mocks/server/factory_context.h" #include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/path/rewrite/uri_template/BUILD b/test/extensions/path/rewrite/uri_template/BUILD index ab9f6866c257d..fb2aefaf8c893 100644 --- a/test/extensions/path/rewrite/uri_template/BUILD +++ b/test/extensions/path/rewrite/uri_template/BUILD @@ -18,7 +18,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/path/rewrite/uri_template:config", - "//test/mocks/server:factory_context_mocks", + "//test/test_common:utility_lib", ], ) @@ -32,6 +32,6 @@ envoy_extension_cc_test( "//source/extensions/path/match/uri_template:uri_template_match_lib", "//source/extensions/path/rewrite/uri_template:config", "//source/extensions/path/rewrite/uri_template:uri_template_rewrite_lib", - "//test/mocks/server:factory_context_mocks", + "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/path/rewrite/uri_template/config_test.cc b/test/extensions/path/rewrite/uri_template/config_test.cc index 96e7d564e820d..bd65e583e7e6d 100644 --- a/test/extensions/path/rewrite/uri_template/config_test.cc +++ b/test/extensions/path/rewrite/uri_template/config_test.cc @@ -1,8 +1,7 @@ #include "source/common/config/utility.h" #include "source/extensions/path/rewrite/uri_template/config.h" -#include "test/mocks/server/factory_context.h" -#include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/path/rewrite/uri_template/library_test.cc b/test/extensions/path/rewrite/uri_template/library_test.cc index 4783b8725f638..8959a58cf8c51 100644 --- a/test/extensions/path/rewrite/uri_template/library_test.cc +++ b/test/extensions/path/rewrite/uri_template/library_test.cc @@ -3,8 +3,7 @@ #include "source/extensions/path/rewrite/uri_template/config.h" #include "source/extensions/path/rewrite/uri_template/uri_template_rewrite.h" -#include "test/mocks/server/factory_context.h" -#include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/rate_limit_descriptors/expr/BUILD b/test/extensions/rate_limit_descriptors/expr/BUILD index 902cb6019396f..b98f42d2f6d43 100644 --- a/test/extensions/rate_limit_descriptors/expr/BUILD +++ b/test/extensions/rate_limit_descriptors/expr/BUILD @@ -29,7 +29,7 @@ envoy_extension_cc_test( "//source/extensions/rate_limit_descriptors/expr:config", "//test/mocks/http:http_mocks", "//test/mocks/ratelimit:ratelimit_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/route/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/rate_limit_descriptors/expr/v3:pkg_cc_proto", diff --git a/test/extensions/rate_limit_descriptors/expr/config_test.cc b/test/extensions/rate_limit_descriptors/expr/config_test.cc index 49810f6e6c490..295c8060cd9a8 100644 --- a/test/extensions/rate_limit_descriptors/expr/config_test.cc +++ b/test/extensions/rate_limit_descriptors/expr/config_test.cc @@ -9,7 +9,7 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/ratelimit/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/extensions/router/cluster_specifiers/lua/BUILD b/test/extensions/router/cluster_specifiers/lua/BUILD index 0e8111608812f..0a122e94432a1 100644 --- a/test/extensions/router/cluster_specifiers/lua/BUILD +++ b/test/extensions/router/cluster_specifiers/lua/BUILD @@ -19,7 +19,7 @@ envoy_extension_cc_test( deps = [ "//source/extensions/router/cluster_specifiers/lua:lua_cluster_specifier_lib", "//test/mocks/router:router_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", ], @@ -32,7 +32,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/router/cluster_specifiers/lua:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/router/cluster_specifiers/lua/config_test.cc b/test/extensions/router/cluster_specifiers/lua/config_test.cc index ff23f0a556b6a..613880109e1a0 100644 --- a/test/extensions/router/cluster_specifiers/lua/config_test.cc +++ b/test/extensions/router/cluster_specifiers/lua/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/router/cluster_specifiers/lua/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/router/cluster_specifiers/lua/lua_cluster_specifier_test.cc b/test/extensions/router/cluster_specifiers/lua/lua_cluster_specifier_test.cc index 83f5591f3f275..b803c6a1172ac 100644 --- a/test/extensions/router/cluster_specifiers/lua/lua_cluster_specifier_test.cc +++ b/test/extensions/router/cluster_specifiers/lua/lua_cluster_specifier_test.cc @@ -1,7 +1,7 @@ #include "source/extensions/router/cluster_specifiers/lua/lua_cluster_specifier.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/router/cluster_specifiers/matcher/BUILD b/test/extensions/router/cluster_specifiers/matcher/BUILD index 137ae291e545b..1dd776a9cfa68 100644 --- a/test/extensions/router/cluster_specifiers/matcher/BUILD +++ b/test/extensions/router/cluster_specifiers/matcher/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "//source/extensions/router/cluster_specifiers/matcher:config", "//source/extensions/router/cluster_specifiers/matcher:matcher_cluster_specifier_lib", "//test/mocks/router:router_mocks", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", ], @@ -33,7 +33,7 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/router/cluster_specifiers/matcher:config", - "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/router/cluster_specifiers/matcher/config_test.cc b/test/extensions/router/cluster_specifiers/matcher/config_test.cc index 00a732e702060..ca75f515ac4c1 100644 --- a/test/extensions/router/cluster_specifiers/matcher/config_test.cc +++ b/test/extensions/router/cluster_specifiers/matcher/config_test.cc @@ -1,6 +1,6 @@ #include "source/extensions/router/cluster_specifiers/matcher/config.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier_test.cc b/test/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier_test.cc index 513ccbdecef4a..7e0813cfdf08f 100644 --- a/test/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier_test.cc +++ b/test/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/router/cluster_specifiers/matcher/matcher_cluster_specifier.h" #include "test/mocks/router/mocks.h" -#include "test/mocks/server/factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/stats_sinks/hystrix/BUILD b/test/extensions/stats_sinks/hystrix/BUILD index 2a8de832918c7..277b605416980 100644 --- a/test/extensions/stats_sinks/hystrix/BUILD +++ b/test/extensions/stats_sinks/hystrix/BUILD @@ -40,7 +40,7 @@ envoy_extension_cc_test( "//source/extensions/stat_sinks/hystrix:hystrix_lib", "//test/mocks/server:admin_mocks", "//test/mocks/server:admin_stream_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stats:stats_mocks", "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", diff --git a/test/extensions/stats_sinks/hystrix/hystrix_test.cc b/test/extensions/stats_sinks/hystrix/hystrix_test.cc index 6b185039009a2..768bd795aa09e 100644 --- a/test/extensions/stats_sinks/hystrix/hystrix_test.cc +++ b/test/extensions/stats_sinks/hystrix/hystrix_test.cc @@ -8,7 +8,7 @@ #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" #include "test/mocks/server/admin_stream.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stats/mocks.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_manager.h" diff --git a/test/extensions/stats_sinks/open_telemetry/BUILD b/test/extensions/stats_sinks/open_telemetry/BUILD index 1d1ac7f0da865..cc7261b9b5c84 100644 --- a/test/extensions/stats_sinks/open_telemetry/BUILD +++ b/test/extensions/stats_sinks/open_telemetry/BUILD @@ -34,7 +34,7 @@ envoy_extension_cc_test( "//source/extensions/stat_sinks/open_telemetry:config", "//source/extensions/stat_sinks/open_telemetry:open_telemetry_lib", "//test/mocks/grpc:grpc_mocks", - "//test/mocks/server:instance_mocks", + "//test/mocks/server:server_factory_context_mocks", ], ) @@ -74,6 +74,7 @@ envoy_cc_benchmark_binary( "//source/common/stats:isolated_store_lib", "//source/extensions/stat_sinks/open_telemetry:open_telemetry_lib", "//test/mocks/server:factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/mocks/stats:stats_mocks", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:inlined_vector", diff --git a/test/extensions/stats_sinks/open_telemetry/open_telemetry_benchmark.cc b/test/extensions/stats_sinks/open_telemetry/open_telemetry_benchmark.cc index 6256d2ee32946..1a5f8e9ac93b1 100644 --- a/test/extensions/stats_sinks/open_telemetry/open_telemetry_benchmark.cc +++ b/test/extensions/stats_sinks/open_telemetry/open_telemetry_benchmark.cc @@ -8,7 +8,7 @@ #include "source/common/stats/histogram_impl.h" #include "source/extensions/stat_sinks/open_telemetry/open_telemetry_impl.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stats/mocks.h" #include "absl/container/inlined_vector.h" diff --git a/test/extensions/stats_sinks/open_telemetry/open_telemetry_impl_test.cc b/test/extensions/stats_sinks/open_telemetry/open_telemetry_impl_test.cc index 532ad67363992..80694b2be3cf5 100644 --- a/test/extensions/stats_sinks/open_telemetry/open_telemetry_impl_test.cc +++ b/test/extensions/stats_sinks/open_telemetry/open_telemetry_impl_test.cc @@ -7,7 +7,7 @@ #include "test/mocks/common.h" #include "test/mocks/grpc/mocks.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/mocks/stats/mocks.h" #include "gtest/gtest.h" diff --git a/test/extensions/stats_sinks/wasm/BUILD b/test/extensions/stats_sinks/wasm/BUILD index d82a35e1b9e2f..ea7ef34e7c635 100644 --- a/test/extensions/stats_sinks/wasm/BUILD +++ b/test/extensions/stats_sinks/wasm/BUILD @@ -28,7 +28,8 @@ envoy_extension_cc_test( "//source/extensions/stat_sinks/wasm:config", "//test/extensions/common/wasm:wasm_runtime", "//test/extensions/stats_sinks/wasm/test_data:test_context_cpp_plugin", - "//test/mocks/server:server_mocks", + "//test/mocks/server:server_factory_context_mocks", + "//test/mocks/server:server_lifecycle_notifier_mocks", "@envoy_api//envoy/extensions/stat_sinks/wasm/v3:pkg_cc_proto", ], ) diff --git a/test/extensions/stats_sinks/wasm/config_test.cc b/test/extensions/stats_sinks/wasm/config_test.cc index 7214cf83a637c..511d523b6e95b 100644 --- a/test/extensions/stats_sinks/wasm/config_test.cc +++ b/test/extensions/stats_sinks/wasm/config_test.cc @@ -7,7 +7,8 @@ #include "source/extensions/stat_sinks/wasm/wasm_stat_sink_impl.h" #include "test/extensions/common/wasm/wasm_runtime.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/server_factory_context.h" +#include "test/mocks/server/server_lifecycle_notifier.h" #include "test/test_common/environment.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/BUILD index a6b1d45bcb339..8c2282143861d 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/BUILD @@ -16,7 +16,7 @@ envoy_cc_test( "//envoy/registry", "//source/common/version:version_lib", "//source/extensions/tracers/opentelemetry/resource_detectors:resource_detector_lib", - "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", ], diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD index 20be396bc8fb2..7484fcc88a813 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:config", "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:dynatrace_resource_detector_lib", - "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) @@ -36,7 +36,6 @@ envoy_extension_cc_test( deps = [ "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:config", "//source/extensions/tracers/opentelemetry/resource_detectors/dynatrace:dynatrace_resource_detector_lib", - "//test/mocks/server:tracer_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/tracers/opentelemetry/resource_detectors/v3:pkg_cc_proto", ], diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config_test.cc b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config_test.cc index 6891bd2da4204..850aff9e852f4 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config_test.cc +++ b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/tracers/opentelemetry/resource_detectors/dynatrace/config.h" -#include "test/mocks/server/tracer_factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector_test.cc b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector_test.cc index 9f1d94409ee4f..1da24a53347d8 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector_test.cc +++ b/test/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector_test.cc @@ -7,13 +7,14 @@ #include "source/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_metadata_file_reader.h" #include "source/extensions/tracers/opentelemetry/resource_detectors/dynatrace/dynatrace_resource_detector.h" -#include "test/mocks/server/tracer_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; +using testing::NiceMock; using testing::Return; namespace Envoy { diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD index 264622838abc4..95db1a61c77e3 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/environment/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/environment:config", "//source/extensions/tracers/opentelemetry/resource_detectors/environment:environment_resource_detector_lib", - "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", ], ) diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/environment/config_test.cc b/test/extensions/tracers/opentelemetry/resource_detectors/environment/config_test.cc index 1d7180d604c13..a6b6d873be26f 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/environment/config_test.cc +++ b/test/extensions/tracers/opentelemetry/resource_detectors/environment/config_test.cc @@ -2,7 +2,7 @@ #include "source/extensions/tracers/opentelemetry/resource_detectors/environment/config.h" -#include "test/mocks/server/tracer_factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/resource_provider_test.cc b/test/extensions/tracers/opentelemetry/resource_detectors/resource_provider_test.cc index dcbf3ce57da68..99ce5cb6cced7 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/resource_provider_test.cc +++ b/test/extensions/tracers/opentelemetry/resource_detectors/resource_provider_test.cc @@ -5,7 +5,7 @@ #include "source/common/version/version.h" #include "source/extensions/tracers/opentelemetry/resource_detectors/resource_provider.h" -#include "test/mocks/server/tracer_factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD b/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD index 72f9283397457..aeabe26136e28 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD +++ b/test/extensions/tracers/opentelemetry/resource_detectors/static/BUILD @@ -20,7 +20,7 @@ envoy_extension_cc_test( "//envoy/registry", "//source/extensions/tracers/opentelemetry/resource_detectors/static:config", "//source/extensions/tracers/opentelemetry/resource_detectors/static:static_config_resource_detector_lib", - "//test/mocks/server:tracer_factory_context_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/extensions/tracers/opentelemetry/resource_detectors/v3:pkg_cc_proto", ], diff --git a/test/extensions/tracers/opentelemetry/resource_detectors/static/config_test.cc b/test/extensions/tracers/opentelemetry/resource_detectors/static/config_test.cc index 59e40fda2e30e..2659764f12289 100644 --- a/test/extensions/tracers/opentelemetry/resource_detectors/static/config_test.cc +++ b/test/extensions/tracers/opentelemetry/resource_detectors/static/config_test.cc @@ -5,7 +5,7 @@ #include "source/common/config/utility.h" #include "source/extensions/tracers/opentelemetry/resource_detectors/static/config.h" -#include "test/mocks/server/tracer_factory_context.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" #include "gtest/gtest.h" diff --git a/test/extensions/tracers/xray/BUILD b/test/extensions/tracers/xray/BUILD index d66fdf913d22d..df1d9d969b6ed 100644 --- a/test/extensions/tracers/xray/BUILD +++ b/test/extensions/tracers/xray/BUILD @@ -45,7 +45,6 @@ envoy_extension_cc_test( rbe_pool = "6gig", deps = [ "//source/extensions/tracers/xray:config", - "//test/mocks/server:instance_mocks", "//test/mocks/server:tracer_factory_context_mocks", "//test/mocks/server:tracer_factory_mocks", "//test/test_common:environment_lib", diff --git a/test/extensions/tracers/xray/config_test.cc b/test/extensions/tracers/xray/config_test.cc index ef146def35bb2..14749e0199337 100644 --- a/test/extensions/tracers/xray/config_test.cc +++ b/test/extensions/tracers/xray/config_test.cc @@ -5,7 +5,6 @@ #include "source/extensions/tracers/xray/config.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/tracer_factory.h" #include "test/mocks/server/tracer_factory_context.h" #include "test/test_common/environment.h" diff --git a/test/extensions/upstreams/http/tcp/BUILD b/test/extensions/upstreams/http/tcp/BUILD index f07d993db1f89..9641d1d1e17a6 100644 --- a/test/extensions/upstreams/http/tcp/BUILD +++ b/test/extensions/upstreams/http/tcp/BUILD @@ -24,7 +24,6 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/router:router_filter_interface", "//test/mocks/router:router_mocks", - "//test/mocks/server:factory_context_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", diff --git a/test/extensions/upstreams/http/tcp/upstream_request_test.cc b/test/extensions/upstreams/http/tcp/upstream_request_test.cc index 4b31b65f744fb..8cb67175701d3 100644 --- a/test/extensions/upstreams/http/tcp/upstream_request_test.cc +++ b/test/extensions/upstreams/http/tcp/upstream_request_test.cc @@ -11,7 +11,6 @@ #include "test/mocks/common.h" #include "test/mocks/router/mocks.h" #include "test/mocks/router/router_filter_interface.h" -#include "test/mocks/server/factory_context.h" #include "test/mocks/server/instance.h" #include "test/mocks/tcp/mocks.h" #include "test/test_common/utility.h" diff --git a/test/extensions/upstreams/http/udp/BUILD b/test/extensions/upstreams/http/udp/BUILD index cb60783dd62b1..0863dd0cdb31a 100644 --- a/test/extensions/upstreams/http/udp/BUILD +++ b/test/extensions/upstreams/http/udp/BUILD @@ -26,8 +26,6 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/router:router_filter_interface", "//test/mocks/router:router_mocks", - "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/upstreams/http/udp/upstream_request_test.cc b/test/extensions/upstreams/http/udp/upstream_request_test.cc index 24121817b1857..13aa250367890 100644 --- a/test/extensions/upstreams/http/udp/upstream_request_test.cc +++ b/test/extensions/upstreams/http/udp/upstream_request_test.cc @@ -17,8 +17,6 @@ #include "test/mocks/common.h" #include "test/mocks/router/mocks.h" #include "test/mocks/router/router_filter_interface.h" -#include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/test_common/threadsafe_singleton_injector.h" #include "test/test_common/utility.h" diff --git a/test/integration/fake_upstream.h b/test/integration/fake_upstream.h index 277189bdfcb81..c64e751d94edd 100644 --- a/test/integration/fake_upstream.h +++ b/test/integration/fake_upstream.h @@ -38,7 +38,6 @@ #include "test/mocks/http/header_validator.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/listener_factory_context.h" #if defined(ENVOY_ENABLE_QUIC) diff --git a/test/server/BUILD b/test/server/BUILD index aa0539636b11d..577fd3bf4d9e2 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -71,7 +71,6 @@ envoy_cc_test( "//test/common/upstream:utility_lib", "//test/mocks/network:network_mocks", "//test/mocks/server:factory_context_mocks", - "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", @@ -194,6 +193,7 @@ envoy_cc_test( "//source/common/stats:stats_lib", "//source/server:hot_restart_lib", "//source/server:hot_restarting_child", + "//test/mocks/api:api_mocks", "//test/mocks/network:network_mocks", "//test/mocks/server:server_mocks", "//test/test_common:threadsafe_singleton_injector_lib", diff --git a/test/server/admin/BUILD b/test/server/admin/BUILD index e3bcbf81d16c3..1322d6dbf0d1a 100644 --- a/test/server/admin/BUILD +++ b/test/server/admin/BUILD @@ -78,9 +78,12 @@ envoy_cc_test( srcs = envoy_select_admin_functionality(["admin_filter_test.cc"]), rbe_pool = "6gig", deps = [ + "//source/common/buffer:buffer_lib", "//source/server/admin:admin_lib", - "//test/mocks/server:instance_mocks", + "//test/mocks/http:http_mocks", + "//test/mocks/server:admin_mocks", "//test/test_common:environment_lib", + "//test/test_common:utility_lib", ], ) diff --git a/test/server/admin/admin_filter_test.cc b/test/server/admin/admin_filter_test.cc index fbf6c93cd72dc..22e3ba1b5cb61 100644 --- a/test/server/admin/admin_filter_test.cc +++ b/test/server/admin/admin_filter_test.cc @@ -1,12 +1,16 @@ +#include "source/common/buffer/buffer_impl.h" #include "source/server/admin/admin.h" #include "source/server/admin/admin_filter.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/http/mocks.h" +#include "test/mocks/server/admin.h" #include "test/test_common/environment.h" +#include "test/test_common/utility.h" #include "gmock/gmock.h" #include "gtest/gtest.h" +using testing::_; using testing::ByMove; using testing::InSequence; using testing::NiceMock; @@ -23,7 +27,6 @@ class AdminFilterTest : public testing::TestWithParam admin_; - Stats::IsolatedStoreImpl listener_scope_; AdminFilter filter_; NiceMock callbacks_; Http::TestRequestHeaderMapImpl request_headers_; diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index a1b2aa1791921..87de10c0602a4 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -21,8 +21,8 @@ envoy_cc_test( "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", "//test/mocks/server:admin_mocks", - "//test/mocks/server:instance_mocks", "//test/mocks/server:options_mocks", + "//test/mocks/server:server_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", ], diff --git a/test/server/config_validation/cluster_manager_test.cc b/test/server/config_validation/cluster_manager_test.cc index 67c200e5088d3..ad6ca064ae537 100644 --- a/test/server/config_validation/cluster_manager_test.cc +++ b/test/server/config_validation/cluster_manager_test.cc @@ -12,8 +12,8 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/admin.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/options.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/utility.h" namespace Envoy { diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc index c916ebd031643..9fd281ee61885 100644 --- a/test/server/configuration_impl_test.cc +++ b/test/server/configuration_impl_test.cc @@ -19,7 +19,6 @@ #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" #include "test/mocks/server/factory_context.h" -#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/server/hot_restarting_child_test.cc b/test/server/hot_restarting_child_test.cc index 874a06b42e222..bdfdb389e9b3d 100644 --- a/test/server/hot_restarting_child_test.cc +++ b/test/server/hot_restarting_child_test.cc @@ -5,8 +5,8 @@ #include "source/server/hot_restarting_child.h" #include "source/server/hot_restarting_parent.h" +#include "test/mocks/api/mocks.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/instance.h" #include "test/mocks/server/listener_manager.h" #include "test/server/hot_restart_udp_forwarding_test_helper.h" #include "test/server/utility.h" diff --git a/test/tools/router_check/router.h b/test/tools/router_check/router.h index be6d25b27d350..13b9ecdc5b858 100644 --- a/test/tools/router_check/router.h +++ b/test/tools/router_check/router.h @@ -15,7 +15,7 @@ #include "source/common/stats/symbol_table.h" #include "source/common/stream_info/stream_info_impl.h" -#include "test/mocks/server/instance.h" +#include "test/mocks/server/server_factory_context.h" #include "test/test_common/global.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h"