diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index cdfb7d42b72bc..07d6c38216f50 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -20,7 +20,8 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//source/common/upstream:cds_api_lib", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -36,6 +37,13 @@ envoy_cc_test( ], deps = [ ":test_cluster_manager", + "//test/mocks/upstream:cds_api_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", + "//test/mocks/upstream:cluster_real_priority_set_mocks", + "//test/mocks/upstream:cluster_update_callbacks_mocks", + "//test/mocks/upstream:health_checker_mocks", + "//test/mocks/upstream:load_balancer_context_mock", + "//test/mocks/upstream:thread_aware_load_balancer_mocks", "@envoy_api//envoy/admin/v3:pkg_cc_proto", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -48,7 +56,8 @@ envoy_cc_test( srcs = ["cluster_update_tracker_test.cc"], deps = [ "//source/common/upstream:cluster_update_tracker_lib", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", ], ) @@ -88,7 +97,8 @@ envoy_cc_test( "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:health_checker_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -118,7 +128,7 @@ envoy_cc_benchmark_binary( "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -146,12 +156,18 @@ envoy_cc_test( "//source/common/upstream:health_checker_lib", "//source/common/upstream:upstream_lib", "//test/common/http:common_lib", + "//test/mocks:common_lib", "//test/mocks/access_log:access_log_mocks", "//test/mocks/api:api_mocks", + "//test/mocks/http:http_mocks", "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", + "//test/mocks/upstream:health_check_event_logger_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:transport_socket_match_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -178,7 +194,7 @@ envoy_cc_test( "//source/common/upstream:host_utility_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", ], ) @@ -191,8 +207,12 @@ envoy_cc_test( "//source/common/upstream:load_balancer_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", + "//test/mocks:common_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:load_balancer_context_mock", + "//test/mocks/upstream:priority_set_mocks", "//test/test_common:logging_lib", "//test/test_common:test_runtime_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -210,7 +230,9 @@ envoy_cc_test( "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:priority_set_mocks", "@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", @@ -226,7 +248,8 @@ envoy_cc_test( "//test/mocks/event:event_mocks", "//test/mocks/grpc:grpc_mocks", "//test/mocks/local_info:local_info_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -248,7 +271,9 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_factory_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -277,7 +302,7 @@ envoy_cc_test( "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/thread_local:thread_local_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -302,7 +327,7 @@ envoy_cc_test( "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -319,10 +344,14 @@ envoy_cc_test( "//source/common/upstream:outlier_detection_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", + "//test/mocks:common_lib", "//test/mocks/access_log:access_log_mocks", "//test/mocks/event:event_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", + "//test/mocks/upstream:host_mocks", + "//test/mocks/upstream:host_set_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -365,8 +394,11 @@ envoy_cc_test( "//source/common/upstream:ring_hash_lb_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", + "//test/mocks:common_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) @@ -377,7 +409,10 @@ envoy_cc_test( deps = [ ":utility_lib", "//source/common/upstream:maglev_lb_lib", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks:common_lib", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) @@ -394,7 +429,7 @@ envoy_cc_benchmark_binary( "//source/common/upstream:ring_hash_lb_lib", "//source/common/upstream:upstream_lib", "//test/common/upstream:utility_lib", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", "//test/test_common:printers_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -417,10 +452,15 @@ envoy_cc_test( "//source/common/upstream:subset_lb_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", + "//test/mocks:common_lib", "//test/mocks/access_log:access_log_mocks", "//test/mocks/filesystem:filesystem_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:host_mocks", + "//test/mocks/upstream:host_set_mocks", + "//test/mocks/upstream:load_balancer_mocks", + "//test/mocks/upstream:priority_set_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -472,7 +512,10 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:server_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_info_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:health_checker_mocks", + "//test/mocks/upstream:priority_set_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", ], @@ -530,7 +573,6 @@ envoy_cc_test_library( "//test/mocks/server:instance_mocks", "//test/mocks/tcp:tcp_mocks", "//test/mocks/thread_local:thread_local_mocks", - "//test/mocks/upstream:upstream_mocks", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:threadsafe_singleton_injector_lib", @@ -568,7 +610,6 @@ envoy_cc_test( "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:upstream_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", diff --git a/test/common/upstream/cds_api_impl_test.cc b/test/common/upstream/cds_api_impl_test.cc index 388fd9ed5ca82..42d83aa1fcaa2 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -13,7 +13,8 @@ #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/cluster_priority_set.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index affa3fed62b36..b2b674d6ae7b5 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -5,6 +5,13 @@ #include "envoy/config/core/v3/base.pb.h" #include "test/common/upstream/test_cluster_manager.h" +#include "test/mocks/upstream/cds_api.h" +#include "test/mocks/upstream/cluster_priority_set.h" +#include "test/mocks/upstream/cluster_real_priority_set.h" +#include "test/mocks/upstream/cluster_update_callbacks.h" +#include "test/mocks/upstream/health_checker.h" +#include "test/mocks/upstream/load_balancer_context.h" +#include "test/mocks/upstream/thread_aware_load_balancer.h" namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/cluster_update_tracker_test.cc b/test/common/upstream/cluster_update_tracker_test.cc index 3d3dc9c56e5bb..fd47cd28f6c32 100644 --- a/test/common/upstream/cluster_update_tracker_test.cc +++ b/test/common/upstream/cluster_update_tracker_test.cc @@ -1,6 +1,7 @@ #include "common/upstream/cluster_update_tracker.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/thread_local_cluster.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/upstream/eds_speed_test.cc b/test/common/upstream/eds_speed_test.cc index 3aab5a54f9910..84f2bf924a639 100644 --- a/test/common/upstream/eds_speed_test.cc +++ b/test/common/upstream/eds_speed_test.cc @@ -24,7 +24,7 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" #include "benchmark/benchmark.h" diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc index 144d29ad78a0e..043865f1052a0 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -21,7 +21,8 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/health_checker.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index f2f5e59c77e95..35e690c99acd8 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -18,7 +18,9 @@ #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/cluster_info_factory.h" +#include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/health_checker_impl_test.cc b/test/common/upstream/health_checker_impl_test.cc index b20b8b56be235..6c70af1e9a557 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -23,10 +23,16 @@ #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" #include "test/mocks/api/mocks.h" +#include "test/mocks/common.h" +#include "test/mocks/http/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/protobuf/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/cluster_priority_set.h" +#include "test/mocks/upstream/health_check_event_logger.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/transport_socket_match.h" #include "test/test_common/printers.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/upstream/host_utility_test.cc b/test/common/upstream/host_utility_test.cc index 47950e24205ac..6ee52395864c7 100644 --- a/test/common/upstream/host_utility_test.cc +++ b/test/common/upstream/host_utility_test.cc @@ -3,7 +3,7 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" #include "gtest/gtest.h" diff --git a/test/common/upstream/load_balancer_benchmark.cc b/test/common/upstream/load_balancer_benchmark.cc index bb491a788a161..dde2a5598ff03 100644 --- a/test/common/upstream/load_balancer_benchmark.cc +++ b/test/common/upstream/load_balancer_benchmark.cc @@ -11,7 +11,7 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" #include "benchmark/benchmark.h" diff --git a/test/common/upstream/load_balancer_impl_test.cc b/test/common/upstream/load_balancer_impl_test.cc index ed89540e2968a..422cdd8710a6f 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -11,8 +11,12 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" +#include "test/mocks/common.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/load_balancer_context.h" +#include "test/mocks/upstream/priority_set.h" #include "test/test_common/logging.h" #include "test/test_common/test_runtime.h" diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index 0f86debac3b88..77a8f7d7004ca 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -15,7 +15,9 @@ #include "test/common/upstream/utility.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/priority_set.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc index 2fd28c3806619..111e7356a064b 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -8,7 +8,8 @@ #include "test/mocks/event/mocks.h" #include "test/mocks/grpc/mocks.h" #include "test/mocks/local_info/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/cluster_priority_set.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/logical_dns_cluster_test.cc b/test/common/upstream/logical_dns_cluster_test.cc index 54404aab2c5f6..349697415c98f 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -24,7 +24,7 @@ #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/thread_local/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/common/upstream/maglev_lb_test.cc b/test/common/upstream/maglev_lb_test.cc index 25456820dd4d8..2e532073808d7 100644 --- a/test/common/upstream/maglev_lb_test.cc +++ b/test/common/upstream/maglev_lb_test.cc @@ -5,7 +5,10 @@ #include "common/upstream/maglev_lb.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/common.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/priority_set.h" namespace Envoy { namespace Upstream { diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc index 6e920a6e63707..87e408d521da4 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -24,7 +24,7 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index 74a96a074fc87..4170ceedcedbf 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -14,9 +14,13 @@ #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" +#include "test/mocks/common.h" #include "test/mocks/event/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/cluster_priority_set.h" +#include "test/mocks/upstream/host.h" +#include "test/mocks/upstream/host_set.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/ring_hash_lb_test.cc b/test/common/upstream/ring_hash_lb_test.cc index 9c9413233e024..4ceb362e240e2 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -11,8 +11,11 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" +#include "test/mocks/common.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/priority_set.h" #include "absl/container/node_hash_map.h" #include "gmock/gmock.h" diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index e9acf9f407bca..962de5d4c50ba 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -15,9 +15,14 @@ #include "test/common/upstream/utility.h" #include "test/mocks/access_log/mocks.h" +#include "test/mocks/common.h" #include "test/mocks/filesystem/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/host.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/load_balancer.h" +#include "test/mocks/upstream/priority_set.h" #include "absl/types/optional.h" #include "gmock/gmock.h" diff --git a/test/common/upstream/test_cluster_manager.h b/test/common/upstream/test_cluster_manager.h index 20edfaa9b59be..0ddd30765b1bc 100644 --- a/test/common/upstream/test_cluster_manager.h +++ b/test/common/upstream/test_cluster_manager.h @@ -39,7 +39,6 @@ #include "test/mocks/server/instance.h" #include "test/mocks/tcp/mocks.h" #include "test/mocks/thread_local/mocks.h" -#include "test/mocks/upstream/mocks.h" #include "test/test_common/registry.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index a0707d9cad2b0..e61ae42ebc4ee 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -33,7 +33,10 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/health_checker.h" +#include "test/mocks/upstream/priority_set.h" #include "test/test_common/registry.h" #include "test/test_common/utility.h" diff --git a/test/extensions/clusters/aggregate/BUILD b/test/extensions/clusters/aggregate/BUILD index a787865c1f7b6..7934812b8d2f4 100644 --- a/test/extensions/clusters/aggregate/BUILD +++ b/test/extensions/clusters/aggregate/BUILD @@ -43,6 +43,7 @@ envoy_extension_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", "//test/mocks/ssl:ssl_mocks", + "//test/mocks/upstream:cluster_update_callbacks_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", diff --git a/test/extensions/clusters/aggregate/cluster_update_test.cc b/test/extensions/clusters/aggregate/cluster_update_test.cc index cf80d8599b7fc..2cacf24696961 100644 --- a/test/extensions/clusters/aggregate/cluster_update_test.cc +++ b/test/extensions/clusters/aggregate/cluster_update_test.cc @@ -13,6 +13,7 @@ #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" #include "test/mocks/ssl/mocks.h" +#include "test/mocks/upstream/cluster_update_callbacks.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h"