Skip to content

tests: Narrow test mock includes more generally (diwydu) #45037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phlax merged 2 commits into from
May 14, 2026
Merged

tests: Narrow test mock includes more generally (diwydu) #45037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8585f60
tests: Narrow test mock includes more generally
phlax May 12, 2026
04239ff
feedback
phlax May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contrib/generic_proxy/filters/network/test/codecs/kafka/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion contrib/generic_proxy/filters/network/test/codecs/kafka/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include <memory>

#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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/hyperscan/matching/input_matchers/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/hyperscan/matching/input_matchers/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/hyperscan/regex_engines/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion contrib/hyperscan/regex_engines/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion contrib/peak_ewma/load_balancing_policies/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion contrib/peak_ewma/load_balancing_policies/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion contrib/rocketmq_proxy/filters/network/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
1 change: 0 additions & 1 deletion contrib/rocketmq_proxy/filters/network/test/conn_manager_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion contrib/stat_sinks/wasm_filter/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
1 change: 0 additions & 1 deletion contrib/stat_sinks/wasm_filter/test/config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion ...common/extensions/filters/http/network_configuration/network_configuration_filter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/config/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/common/config/config_provider_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions test/common/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/conn_manager_utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/hcm_router_fuzz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
phlax marked this conversation as resolved.
#include "test/test_common/registry.h"
#include "test/test_common/test_runtime.h"

Expand Down
2 changes: 1 addition & 1 deletion test/common/http/http1/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/http1/codec_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/http/utility_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/io/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion test/common/io/io_uring_worker_factory_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion test/common/matcher/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 1 addition & 2 deletions test/common/matcher/actions/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion test/common/matcher/actions/string_returning_action_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/matcher/matcher_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions test/common/network/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 0 additions & 2 deletions test/common/network/filter_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion test/common/network/udp_fuzz.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion test/common/network/udp_listener_impl_batch_writer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion test/common/quic/active_quic_listener_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/common/rds/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/common/rds/rds_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
15 changes: 7 additions & 8 deletions test/common/router/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
],
)
Expand All @@ -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",
Expand Down Expand Up @@ -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",
],
)
Expand Down Expand Up @@ -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",
Expand Down
Loading
Loading