From e6f2e165aaa1ac55f397f86da3e972e121a38b8f Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Fri, 21 Aug 2020 19:53:25 +0000 Subject: [PATCH 01/13] refactor deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 80 ++++++++++++++----- test/common/upstream/cds_api_impl_test.cc | 4 +- .../upstream/cluster_update_tracker_test.cc | 4 +- test/common/upstream/eds_speed_test.cc | 3 +- test/common/upstream/eds_test.cc | 4 +- test/common/upstream/hds_test.cc | 5 +- .../upstream/health_checker_impl_test.cc | 8 +- test/common/upstream/host_utility_test.cc | 3 +- .../upstream/load_balancer_benchmark.cc | 3 +- .../upstream/load_balancer_impl_test.cc | 8 +- .../upstream/load_balancer_simulation_test.cc | 6 +- .../upstream/load_stats_reporter_test.cc | 4 +- .../upstream/logical_dns_cluster_test.cc | 3 +- test/common/upstream/maglev_lb_test.cc | 6 +- .../upstream/original_dst_cluster_test.cc | 3 +- .../upstream/outlier_detection_impl_test.cc | 6 +- test/common/upstream/ring_hash_lb_test.cc | 6 +- test/common/upstream/subset_lb_test.cc | 7 +- test/common/upstream/upstream_impl_test.cc | 6 +- 19 files changed, 131 insertions(+), 38 deletions(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index cdfb7d42b72bc..c1db8f7b605f3 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -20,7 +20,9 @@ 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_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -48,7 +50,9 @@ 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:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", ], ) @@ -88,7 +92,9 @@ 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:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_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 +124,9 @@ 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/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -151,7 +159,9 @@ envoy_cc_test( "//test/mocks/network:network_mocks", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", "//test/test_common:utility_lib", @@ -178,7 +188,9 @@ 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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", ], ) @@ -192,7 +204,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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:logging_lib", "//test/test_common:test_runtime_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -210,7 +224,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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_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 +242,9 @@ 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_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/endpoint/v3:pkg_cc_proto", @@ -248,7 +266,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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -277,7 +297,9 @@ 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/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_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 +324,9 @@ 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:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -322,7 +346,9 @@ envoy_cc_test( "//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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", @@ -366,7 +392,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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) @@ -377,7 +405,9 @@ envoy_cc_test( deps = [ ":utility_lib", "//source/common/upstream:maglev_lb_lib", - "//test/mocks/upstream:upstream_mocks", + "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], ) @@ -394,7 +424,9 @@ 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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:printers_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -420,7 +452,9 @@ envoy_cc_test( "//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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", ], @@ -472,7 +506,9 @@ 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_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", ], @@ -530,7 +566,9 @@ 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/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:threadsafe_singleton_injector_lib", @@ -568,7 +606,9 @@ 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:cluster_mocks", + "//test/mocks/upstream:thread_local_cluster_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..77ceb92f711fc 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -13,7 +13,9 @@ #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/priority_set.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/cluster_update_tracker_test.cc b/test/common/upstream/cluster_update_tracker_test.cc index 3d3dc9c56e5bb..7ef754281ef16 100644 --- a/test/common/upstream/cluster_update_tracker_test.cc +++ b/test/common/upstream/cluster_update_tracker_test.cc @@ -1,6 +1,8 @@ #include "common/upstream/cluster_update_tracker.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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..76cd6fe6dd064 100644 --- a/test/common/upstream/eds_speed_test.cc +++ b/test/common/upstream/eds_speed_test.cc @@ -24,7 +24,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.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..7f3adeacd2c6c 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -21,7 +21,9 @@ #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.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..dc4f0ca8fdb2a 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -18,7 +18,10 @@ #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.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..93efc42bd5ba2 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -26,7 +26,13 @@ #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.h" +#include "test/mocks/upstream/cluster_info.h" +#include "test/mocks/upstream/health_check_event_logger.h" +#include "test/mocks/upstream/host.h" +#include "test/mocks/upstream/host_set.h" +#include "test/mocks/upstream/priority_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..8717c4d092d3c 100644 --- a/test/common/upstream/host_utility_test.cc +++ b/test/common/upstream/host_utility_test.cc @@ -3,7 +3,8 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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..f922b7db7dc89 100644 --- a/test/common/upstream/load_balancer_benchmark.cc +++ b/test/common/upstream/load_balancer_benchmark.cc @@ -11,7 +11,8 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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..547f4b4604bb1 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -12,7 +12,13 @@ #include "test/common/upstream/utility.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/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..a6549dfa1e392 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -15,7 +15,11 @@ #include "test/common/upstream/utility.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/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..f28bca32ae701 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -8,7 +8,9 @@ #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.h" +#include "test/mocks/upstream/cluster_manager.h" +#include "test/mocks/upstream/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..ea09f4149d27e 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -24,7 +24,8 @@ #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.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..71b5feaee65d5 100644 --- a/test/common/upstream/maglev_lb_test.cc +++ b/test/common/upstream/maglev_lb_test.cc @@ -5,7 +5,11 @@ #include "common/upstream/maglev_lb.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/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..f6992290dc0f9 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -24,7 +24,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.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..8d4411b0edc14 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -16,7 +16,11 @@ #include "test/mocks/access_log/mocks.h" #include "test/mocks/event/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/priority_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..acf26b87b19ac 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -12,7 +12,11 @@ #include "test/common/upstream/utility.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/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..d30fdcfbffff4 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -17,7 +17,12 @@ #include "test/mocks/access_log/mocks.h" #include "test/mocks/filesystem/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/mocks.h" +#include "test/mocks/upstream/cluster.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/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index a0707d9cad2b0..c9b83fed35808 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -33,7 +33,11 @@ #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.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" From 32e5f8e555d43735a5ac4ab46b92af187b223b3e Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Fri, 21 Aug 2020 20:54:19 +0000 Subject: [PATCH 02/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 89 +++++++++---------- .../upstream/cluster_update_tracker_test.cc | 1 - test/common/upstream/eds_speed_test.cc | 1 - test/common/upstream/eds_test.cc | 1 - .../upstream/health_checker_impl_test.cc | 6 +- test/common/upstream/host_utility_test.cc | 1 - .../upstream/load_balancer_benchmark.cc | 1 - .../upstream/load_balancer_impl_test.cc | 4 +- .../upstream/load_balancer_simulation_test.cc | 2 - .../upstream/load_stats_reporter_test.cc | 3 +- .../upstream/logical_dns_cluster_test.cc | 1 - test/common/upstream/maglev_lb_test.cc | 3 +- .../upstream/original_dst_cluster_test.cc | 1 - .../upstream/outlier_detection_impl_test.cc | 4 +- test/common/upstream/ring_hash_lb_test.cc | 3 +- test/common/upstream/subset_lb_test.cc | 2 +- test/common/upstream/upstream_impl_test.cc | 1 - 17 files changed, 53 insertions(+), 71 deletions(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index c1db8f7b605f3..0aa1f1974a441 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -51,8 +51,6 @@ envoy_cc_test( deps = [ "//source/common/upstream:cluster_update_tracker_lib", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", ], ) @@ -93,8 +91,7 @@ envoy_cc_test( "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -125,8 +122,6 @@ envoy_cc_benchmark_binary( "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -154,14 +149,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -188,9 +187,7 @@ envoy_cc_test( "//source/common/upstream:host_utility_lib", "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", + "//test/mocks/upstream:cluster_info_mocks", ], ) @@ -203,10 +200,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -224,9 +223,9 @@ envoy_cc_test( "//source/common/upstream:upstream_includes", "//source/common/upstream:upstream_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -243,8 +242,7 @@ envoy_cc_test( "//test/mocks/grpc:grpc_mocks", "//test/mocks/local_info:local_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -266,9 +264,9 @@ envoy_cc_test( "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", + "//test/mocks/upstream:cluster_info_factory_mocks", + "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -298,8 +296,6 @@ envoy_cc_test( "//test/mocks/ssl:ssl_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -325,8 +321,6 @@ envoy_cc_test( "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -343,12 +337,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -391,10 +387,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", ], ) @@ -405,9 +402,10 @@ envoy_cc_test( deps = [ ":utility_lib", "//source/common/upstream:maglev_lb_lib", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", ], ) @@ -424,9 +422,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", + "//test/mocks/upstream:cluster_info_mocks", "//test/test_common:printers_lib", "@envoy_api//envoy/config/cluster/v3:pkg_cc_proto", ], @@ -449,12 +445,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", ], @@ -506,9 +505,10 @@ envoy_cc_test( "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:server_mocks", "//test/mocks/ssl:ssl_mocks", + "//test/mocks/upstream:cluster_info_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", + "//test/mocks/upstream:health_checker_mocks", + "//test/mocks/upstream:priority_set_mocks", "//test/test_common:registry_lib", "//test/test_common:utility_lib", ], @@ -566,9 +566,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:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_mocks", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:threadsafe_singleton_injector_lib", diff --git a/test/common/upstream/cluster_update_tracker_test.cc b/test/common/upstream/cluster_update_tracker_test.cc index 7ef754281ef16..fd47cd28f6c32 100644 --- a/test/common/upstream/cluster_update_tracker_test.cc +++ b/test/common/upstream/cluster_update_tracker_test.cc @@ -1,6 +1,5 @@ #include "common/upstream/cluster_update_tracker.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/thread_local_cluster.h" diff --git a/test/common/upstream/eds_speed_test.cc b/test/common/upstream/eds_speed_test.cc index 76cd6fe6dd064..84f2bf924a639 100644 --- a/test/common/upstream/eds_speed_test.cc +++ b/test/common/upstream/eds_speed_test.cc @@ -24,7 +24,6 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/eds_test.cc b/test/common/upstream/eds_test.cc index 7f3adeacd2c6c..043865f1052a0 100644 --- a/test/common/upstream/eds_test.cc +++ b/test/common/upstream/eds_test.cc @@ -21,7 +21,6 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/health_checker.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 93efc42bd5ba2..6c70af1e9a557 100644 --- a/test/common/upstream/health_checker_impl_test.cc +++ b/test/common/upstream/health_checker_impl_test.cc @@ -23,15 +23,15 @@ #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/cluster.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.h" #include "test/mocks/upstream/host_set.h" -#include "test/mocks/upstream/priority_set.h" #include "test/mocks/upstream/transport_socket_match.h" #include "test/test_common/printers.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/common/upstream/host_utility_test.cc b/test/common/upstream/host_utility_test.cc index 8717c4d092d3c..6ee52395864c7 100644 --- a/test/common/upstream/host_utility_test.cc +++ b/test/common/upstream/host_utility_test.cc @@ -3,7 +3,6 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/cluster.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 f922b7db7dc89..dde2a5598ff03 100644 --- a/test/common/upstream/load_balancer_benchmark.cc +++ b/test/common/upstream/load_balancer_benchmark.cc @@ -11,7 +11,6 @@ #include "common/upstream/upstream_impl.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/cluster.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 547f4b4604bb1..422cdd8710a6f 100644 --- a/test/common/upstream/load_balancer_impl_test.cc +++ b/test/common/upstream/load_balancer_impl_test.cc @@ -11,12 +11,10 @@ #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/cluster.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/load_balancer_context.h" #include "test/mocks/upstream/priority_set.h" #include "test/test_common/logging.h" diff --git a/test/common/upstream/load_balancer_simulation_test.cc b/test/common/upstream/load_balancer_simulation_test.cc index a6549dfa1e392..77a8f7d7004ca 100644 --- a/test/common/upstream/load_balancer_simulation_test.cc +++ b/test/common/upstream/load_balancer_simulation_test.cc @@ -15,9 +15,7 @@ #include "test/common/upstream/utility.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/upstream/cluster.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/priority_set.h" diff --git a/test/common/upstream/load_stats_reporter_test.cc b/test/common/upstream/load_stats_reporter_test.cc index f28bca32ae701..111e7356a064b 100644 --- a/test/common/upstream/load_stats_reporter_test.cc +++ b/test/common/upstream/load_stats_reporter_test.cc @@ -8,9 +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/cluster.h" #include "test/mocks/upstream/cluster_manager.h" -#include "test/mocks/upstream/priority_set.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 ea09f4149d27e..349697415c98f 100644 --- a/test/common/upstream/logical_dns_cluster_test.cc +++ b/test/common/upstream/logical_dns_cluster_test.cc @@ -24,7 +24,6 @@ #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/thread_local/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/maglev_lb_test.cc b/test/common/upstream/maglev_lb_test.cc index 71b5feaee65d5..2e532073808d7 100644 --- a/test/common/upstream/maglev_lb_test.cc +++ b/test/common/upstream/maglev_lb_test.cc @@ -5,9 +5,8 @@ #include "common/upstream/maglev_lb.h" #include "test/common/upstream/utility.h" -#include "test/mocks/upstream/cluster.h" +#include "test/mocks/common.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/priority_set.h" diff --git a/test/common/upstream/original_dst_cluster_test.cc b/test/common/upstream/original_dst_cluster_test.cc index f6992290dc0f9..87e408d521da4 100644 --- a/test/common/upstream/original_dst_cluster_test.cc +++ b/test/common/upstream/original_dst_cluster_test.cc @@ -24,7 +24,6 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/test_common/utility.h" diff --git a/test/common/upstream/outlier_detection_impl_test.cc b/test/common/upstream/outlier_detection_impl_test.cc index 8d4411b0edc14..4170ceedcedbf 100644 --- a/test/common/upstream/outlier_detection_impl_test.cc +++ b/test/common/upstream/outlier_detection_impl_test.cc @@ -14,13 +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/cluster.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/mocks/upstream/priority_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 acf26b87b19ac..4ceb362e240e2 100644 --- a/test/common/upstream/ring_hash_lb_test.cc +++ b/test/common/upstream/ring_hash_lb_test.cc @@ -11,10 +11,9 @@ #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/cluster.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/priority_set.h" diff --git a/test/common/upstream/subset_lb_test.cc b/test/common/upstream/subset_lb_test.cc index d30fdcfbffff4..962de5d4c50ba 100644 --- a/test/common/upstream/subset_lb_test.cc +++ b/test/common/upstream/subset_lb_test.cc @@ -15,9 +15,9 @@ #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/cluster.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/common/upstream/upstream_impl_test.cc b/test/common/upstream/upstream_impl_test.cc index c9b83fed35808..e61ae42ebc4ee 100644 --- a/test/common/upstream/upstream_impl_test.cc +++ b/test/common/upstream/upstream_impl_test.cc @@ -33,7 +33,6 @@ #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" #include "test/mocks/ssl/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_manager.h" #include "test/mocks/upstream/health_checker.h" From 68d7fd4701f848e843c14b289de008451833b4d7 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 02:28:01 +0000 Subject: [PATCH 03/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 6 +----- test/common/upstream/cds_api_impl_test.cc | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 0aa1f1974a441..078ec3f6b898b 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -21,8 +21,7 @@ envoy_cc_test( "//source/common/upstream:cds_api_lib", "//test/mocks/protobuf:protobuf_mocks", "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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", @@ -603,9 +602,6 @@ envoy_cc_test( "//test/mocks/server:admin_mocks", "//test/mocks/server:instance_mocks", "//test/mocks/ssl:ssl_mocks", - "//test/mocks/upstream:cluster_manager_mocks", - "//test/mocks/upstream:cluster_mocks", - "//test/mocks/upstream:thread_local_cluster_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 77ceb92f711fc..42d83aa1fcaa2 100644 --- a/test/common/upstream/cds_api_impl_test.cc +++ b/test/common/upstream/cds_api_impl_test.cc @@ -13,9 +13,8 @@ #include "test/common/upstream/utility.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_manager.h" -#include "test/mocks/upstream/priority_set.h" +#include "test/mocks/upstream/cluster_priority_set.h" #include "test/test_common/printers.h" #include "test/test_common/utility.h" From 4649cc1b9868f786b293c1a5933cb08e154d872c Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 04:18:30 +0000 Subject: [PATCH 04/13] refactor Signed-off-by: Muge Chen --- test/common/upstream/test_cluster_manager.h | 1 - 1 file changed, 1 deletion(-) 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" From 0d3eaabc7e0baa58420cd5a1753fcf63071bed54 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 04:54:19 +0000 Subject: [PATCH 05/13] fix ci Signed-off-by: Muge Chen --- test/extensions/clusters/aggregate/BUILD | 1 + test/extensions/clusters/aggregate/cluster_update_test.cc | 1 + 2 files changed, 2 insertions(+) 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" From 692c12b10c9cc4531f8a482b2971f6c8a1a95320 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 06:10:42 +0000 Subject: [PATCH 06/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 3 +++ test/common/upstream/cluster_manager_impl_test.cc | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 078ec3f6b898b..2afeba7905c5f 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -37,6 +37,9 @@ envoy_cc_test( ], deps = [ ":test_cluster_manager", + "//test/mocks/upstream:cds_api_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", diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index affa3fed62b36..90ee2c48d7f85 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -5,6 +5,10 @@ #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/load_balancer_context.h" +#include "test/mocks/upstream/thread_aware_load_balancer.h" + namespace Envoy { namespace Upstream { From 2cb7848e578394663d85c631838d0d857ac20bf4 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 06:15:28 +0000 Subject: [PATCH 07/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 1 + test/common/upstream/cluster_manager_impl_test.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 2afeba7905c5f..5507baa7a3c8e 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -38,6 +38,7 @@ envoy_cc_test( deps = [ ":test_cluster_manager", "//test/mocks/upstream:cds_api_mocks", + "//test/mocks/upstream:cluster_update_callbacks_mocks", "//test/mocks/upstream:load_balancer_context_mock", "//test/mocks/upstream:thread_aware_load_balancer_mocks", "@envoy_api//envoy/admin/v3:pkg_cc_proto", diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 90ee2c48d7f85..d873508692860 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -6,6 +6,7 @@ #include "test/common/upstream/test_cluster_manager.h" #include "test/mocks/upstream/cds_api.h" +#include "test/mocks/upstream/cluster_update_callbacks.h" #include "test/mocks/upstream/load_balancer_context.h" #include "test/mocks/upstream/thread_aware_load_balancer.h" From b055aabc36b23507e891b418075b3ee6d493cd00 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 06:22:18 +0000 Subject: [PATCH 08/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 1 + test/common/upstream/cluster_manager_impl_test.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 5507baa7a3c8e..10c03e7a49b2a 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -39,6 +39,7 @@ envoy_cc_test( ":test_cluster_manager", "//test/mocks/upstream:cds_api_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", diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index d873508692860..553b07798519a 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -7,10 +7,10 @@ #include "test/common/upstream/test_cluster_manager.h" #include "test/mocks/upstream/cds_api.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 { namespace { From 1e80e987b84fd8f3ed785a9301b63b13b6e98858 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 21:41:23 +0000 Subject: [PATCH 09/13] fix deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 1 + test/common/upstream/cluster_manager_impl_test.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 10c03e7a49b2a..c14e708ba203e 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -38,6 +38,7 @@ envoy_cc_test( deps = [ ":test_cluster_manager", "//test/mocks/upstream:cds_api_mocks", + "//test/mocks/upstream:cluster_priority_set_mocks", "//test/mocks/upstream:cluster_update_callbacks_mocks", "//test/mocks/upstream:health_checker_mocks", "//test/mocks/upstream:load_balancer_context_mock", diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 553b07798519a..3ea4ecd6fa3f7 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -6,6 +6,7 @@ #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_update_callbacks.h" #include "test/mocks/upstream/health_checker.h" #include "test/mocks/upstream/load_balancer_context.h" From fc5b9662eaf3608491d086e1beb2d4e9ce018704 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Sun, 23 Aug 2020 23:50:22 +0000 Subject: [PATCH 10/13] fix ci Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 1 + test/common/upstream/cluster_manager_impl_test.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index c14e708ba203e..7a36885211559 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -39,6 +39,7 @@ envoy_cc_test( ":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", diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 3ea4ecd6fa3f7..23843909251d4 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -7,11 +7,11 @@ #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 { namespace { From 30144381e2d1327d1b7fde2b87ed85ae59cf05b4 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Mon, 24 Aug 2020 00:17:57 +0000 Subject: [PATCH 11/13] fix format Signed-off-by: Muge Chen --- test/common/upstream/cluster_manager_impl_test.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/test/common/upstream/cluster_manager_impl_test.cc b/test/common/upstream/cluster_manager_impl_test.cc index 23843909251d4..b2b674d6ae7b5 100644 --- a/test/common/upstream/cluster_manager_impl_test.cc +++ b/test/common/upstream/cluster_manager_impl_test.cc @@ -12,6 +12,7 @@ #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 { namespace { From 05abdf752ad7d981a0384468a3425a8ddcbdfbcc Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Thu, 27 Aug 2020 19:38:22 +0000 Subject: [PATCH 12/13] fix transitive deps Signed-off-by: Muge Chen --- test/common/upstream/BUILD | 1 + test/common/upstream/hds_test.cc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/upstream/BUILD b/test/common/upstream/BUILD index 7a36885211559..07d6c38216f50 100644 --- a/test/common/upstream/BUILD +++ b/test/common/upstream/BUILD @@ -57,6 +57,7 @@ envoy_cc_test( deps = [ "//source/common/upstream:cluster_update_tracker_lib", "//test/mocks/upstream:cluster_manager_mocks", + "//test/mocks/upstream:thread_local_cluster_mocks", ], ) diff --git a/test/common/upstream/hds_test.cc b/test/common/upstream/hds_test.cc index dc4f0ca8fdb2a..35e690c99acd8 100644 --- a/test/common/upstream/hds_test.cc +++ b/test/common/upstream/hds_test.cc @@ -18,7 +18,6 @@ #include "test/mocks/protobuf/mocks.h" #include "test/mocks/server/admin.h" #include "test/mocks/server/instance.h" -#include "test/mocks/upstream/cluster.h" #include "test/mocks/upstream/cluster_info.h" #include "test/mocks/upstream/cluster_info_factory.h" #include "test/mocks/upstream/cluster_manager.h" From ceed0d0ba2c4721a6cbc9463f4469cd4142c6aaf Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Thu, 27 Aug 2020 23:36:17 +0000 Subject: [PATCH 13/13] Kick CI Signed-off-by: Muge Chen