From 90142db62d034e2488938e629b825164e5cfbd04 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Mon, 13 Jul 2020 13:30:08 +0000 Subject: [PATCH 1/2] refactor dependencies Signed-off-by: Muge Chen --- test/server/BUILD | 43 +++++++++++++------ test/server/admin/BUILD | 4 +- test/server/admin/admin_filter_test.cc | 2 +- test/server/admin/admin_instance.h | 2 +- test/server/api_listener_test.cc | 5 ++- test/server/config_validation/BUILD | 4 +- .../config_validation/config_fuzz_test.cc | 2 +- test/server/config_validation/server_test.cc | 3 +- test/server/configuration_impl_test.cc | 2 +- test/server/connection_handler_test.cc | 3 +- test/server/drain_manager_impl_test.cc | 2 +- test/server/filter_chain_benchmark_test.cc | 2 +- test/server/filter_chain_manager_impl_test.cc | 3 +- test/server/guarddog_impl_test.cc | 2 +- test/server/hot_restart_impl_test.cc | 2 +- test/server/hot_restarting_parent_test.cc | 3 +- test/server/lds_api_test.cc | 15 ++++--- test/server/listener_manager_impl_test.h | 7 ++- test/server/server_fuzz_test.cc | 3 +- test/server/server_test.cc | 6 ++- test/server/worker_impl_test.cc | 4 +- 21 files changed, 80 insertions(+), 39 deletions(-) diff --git a/test/server/BUILD b/test/server/BUILD index 09446f8f0c306..6802c4d73281c 100644 --- a/test/server/BUILD +++ b/test/server/BUILD @@ -22,7 +22,10 @@ envoy_cc_test( ":utility_lib", "//source/server:listener_manager_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:listener_component_factory_mocks", + "//test/mocks/server:worker_factory_mocks", + "//test/mocks/server:worker_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], @@ -55,7 +58,7 @@ envoy_cc_test( "//test/common/upstream:utility_lib", "//test/mocks:common_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", @@ -69,13 +72,14 @@ envoy_cc_test( srcs = ["connection_handler_test.cc"], deps = [ "//source/common/common:utility_lib", + "//source/common/config:utility_lib", "//source/common/network:address_lib", "//source/common/network:connection_balancer_lib", "//source/common/stats:stats_lib", "//source/server:active_raw_udp_listener_config", "//source/server:connection_handler_lib", + "//test/mocks/api:api_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", "//test/test_common:network_utility_lib", "//test/test_common:threadsafe_singleton_injector_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -88,7 +92,7 @@ envoy_cc_test( srcs = ["drain_manager_impl_test.cc"], deps = [ "//source/server:drain_manager_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "@envoy_api//envoy/config/listener/v3:pkg_cc_proto", ], ) @@ -129,7 +133,7 @@ envoy_cc_test( "//source/common/stats:stats_lib", "//source/server:guarddog_lib", "//test/mocks:common_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:main_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:simulated_time_system_lib", "//test/test_common:utility_lib", @@ -187,8 +191,10 @@ envoy_cc_test( "//source/common/protobuf:utility_lib", "//source/server:lds_api_lib", "//test/mocks/config:config_mocks", + "//test/mocks/init:init_mocks", "//test/mocks/protobuf:protobuf_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:listener_manager_mocks", + "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", "//test/test_common:utility_lib", "@envoy_api//envoy/config/core/v3:pkg_cc_proto", @@ -206,7 +212,12 @@ envoy_cc_test_library( "//source/server:listener_manager_lib", "//test/mocks/init:init_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:drain_manager_mocks", + "//test/mocks/server:guard_dog_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:listener_component_factory_mocks", + "//test/mocks/server:worker_factory_mocks", + "//test/mocks/server:worker_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", "//test/test_common:test_runtime_lib", @@ -290,7 +301,8 @@ envoy_cc_test( "//source/server:filter_chain_manager_lib", "//source/server:listener_manager_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:drain_manager_mocks", + "//test/mocks/server:factory_context_mocks", "//test/test_common:environment_lib", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", @@ -309,7 +321,8 @@ envoy_cc_fuzz_test( "//source/server:proto_descriptors_lib", "//source/server:server_lib", "//test/integration:integration_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:options_mocks", + "//test/mocks/server:hot_restart_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:environment_lib", "//test/test_common:test_time_lib", @@ -361,7 +374,11 @@ envoy_cc_test( "//test/common/config:dummy_config_proto_cc_proto", "//test/common/stats:stat_test_utility_lib", "//test/integration:integration_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:bootstrap_extension_factory_mocks", + "//test/mocks/server:hot_restart_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:options_mocks", + "//test/mocks/server:overload_manager_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:registry_lib", "//test/test_common:simulated_time_system_lib", @@ -401,7 +418,9 @@ envoy_cc_test( "//source/common/event:dispatcher_lib", "//source/server:worker_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:guard_dog_mocks", + "//test/mocks/server:instance_mocks", + "//test/mocks/server:overload_manager_mocks", "//test/mocks/thread_local:thread_local_mocks", "//test/test_common:utility_lib", ], @@ -419,7 +438,7 @@ envoy_cc_benchmark_binary( "//source/server:filter_chain_manager_lib", "//test/test_common:environment_lib", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:factory_context_mocks", # tranport socket config registration "//source/extensions/transport_sockets/tls:config", ], diff --git a/test/server/admin/BUILD b/test/server/admin/BUILD index 75e3fc35f8e5b..b2af4c15f6f0d 100644 --- a/test/server/admin/BUILD +++ b/test/server/admin/BUILD @@ -16,7 +16,7 @@ envoy_cc_test_library( deps = [ "//source/server/admin:admin_lib", "//test/mocks/runtime:runtime_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", "//test/test_common:network_utility_lib", ], @@ -54,7 +54,7 @@ envoy_cc_test( srcs = ["admin_filter_test.cc"], deps = [ "//source/server/admin:admin_filter_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:instance_mocks", "//test/test_common:environment_lib", ], ) diff --git a/test/server/admin/admin_filter_test.cc b/test/server/admin/admin_filter_test.cc index 07b5f9b6c98c7..524bafedb4751 100644 --- a/test/server/admin/admin_filter_test.cc +++ b/test/server/admin/admin_filter_test.cc @@ -1,6 +1,6 @@ #include "server/admin/admin_filter.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "gmock/gmock.h" diff --git a/test/server/admin/admin_instance.h b/test/server/admin/admin_instance.h index b6231ee856a9a..7092d973c00e1 100644 --- a/test/server/admin/admin_instance.h +++ b/test/server/admin/admin_instance.h @@ -4,7 +4,7 @@ #include "test/mocks/http/mocks.h" #include "test/mocks/runtime/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" diff --git a/test/server/api_listener_test.cc b/test/server/api_listener_test.cc index f229823c59c32..aec3e64d2bf73 100644 --- a/test/server/api_listener_test.cc +++ b/test/server/api_listener_test.cc @@ -6,7 +6,10 @@ #include "server/listener_manager_impl.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/listener_component_factory.h" +#include "test/mocks/server/worker.h" +#include "test/mocks/server/worker_factory.h" #include "test/server/utility.h" #include "test/test_common/utility.h" diff --git a/test/server/config_validation/BUILD b/test/server/config_validation/BUILD index 617e54334dfc5..aea82929b91de 100644 --- a/test/server/config_validation/BUILD +++ b/test/server/config_validation/BUILD @@ -68,7 +68,7 @@ envoy_cc_test( "//source/extensions/transport_sockets/tls:config", "//source/server/config_validation:server_lib", "//test/integration:integration_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:options_mocks", "//test/mocks/stats:stats_mocks", "//test/test_common:environment_lib", "//test/test_common:registry_lib", @@ -99,7 +99,7 @@ envoy_cc_fuzz_test( "//source/server/config_validation:server_lib", "//source/server:proto_descriptors_lib", "//test/integration:integration_lib", - "//test/mocks/server:server_mocks", + "//test/mocks/server:options_mocks", "//test/test_common:environment_lib", ] + select({ "//bazel:windows_x86_64": envoy_all_extensions(WINDOWS_SKIP_TARGETS), diff --git a/test/server/config_validation/config_fuzz_test.cc b/test/server/config_validation/config_fuzz_test.cc index bd40a453634a9..9dc0ef8a4b2ca 100644 --- a/test/server/config_validation/config_fuzz_test.cc +++ b/test/server/config_validation/config_fuzz_test.cc @@ -10,7 +10,7 @@ #include "test/fuzz/fuzz_runner.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/options.h" #include "test/test_common/environment.h" namespace Envoy { diff --git a/test/server/config_validation/server_test.cc b/test/server/config_validation/server_test.cc index 4bd903a65fb19..c1e6de23ec488 100644 --- a/test/server/config_validation/server_test.cc +++ b/test/server/config_validation/server_test.cc @@ -5,10 +5,11 @@ #include "server/config_validation/server.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/options.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/registry.h" +#include "test/test_common/test_time.h" namespace Envoy { namespace Server { diff --git a/test/server/configuration_impl_test.cc b/test/server/configuration_impl_test.cc index 6806d8d2a639e..cd7f2ce5c7e46 100644 --- a/test/server/configuration_impl_test.cc +++ b/test/server/configuration_impl_test.cc @@ -18,7 +18,7 @@ #include "test/common/upstream/utility.h" #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/server/connection_handler_test.cc b/test/server/connection_handler_test.cc index a7f942f95d42f..148874e612e35 100644 --- a/test/server/connection_handler_test.cc +++ b/test/server/connection_handler_test.cc @@ -6,6 +6,7 @@ #include "envoy/stats/scope.h" #include "common/common/utility.h" +#include "common/config/utility.h" #include "common/network/address_impl.h" #include "common/network/connection_balancer_impl.h" #include "common/network/io_socket_handle_impl.h" @@ -14,9 +15,9 @@ #include "server/connection_handler_impl.h" +#include "test/mocks/api/mocks.h" #include "test/mocks/common.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" #include "test/test_common/network_utility.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/server/drain_manager_impl_test.cc b/test/server/drain_manager_impl_test.cc index 9afeba1b79556..160080b34b1b9 100644 --- a/test/server/drain_manager_impl_test.cc +++ b/test/server/drain_manager_impl_test.cc @@ -4,7 +4,7 @@ #include "server/drain_manager_impl.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/server/filter_chain_benchmark_test.cc b/test/server/filter_chain_benchmark_test.cc index 819932e968f97..bda0e1d81b602 100644 --- a/test/server/filter_chain_benchmark_test.cc +++ b/test/server/filter_chain_benchmark_test.cc @@ -12,7 +12,7 @@ #include "extensions/transport_sockets/well_known_names.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" diff --git a/test/server/filter_chain_manager_impl_test.cc b/test/server/filter_chain_manager_impl_test.cc index 4779dc32576ea..4b78f2a70d88d 100644 --- a/test/server/filter_chain_manager_impl_test.cc +++ b/test/server/filter_chain_manager_impl_test.cc @@ -25,7 +25,8 @@ #include "extensions/transport_sockets/tls/ssl_socket.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/drain_manager.h" +#include "test/mocks/server/factory_context.h" #include "test/server/utility.h" #include "test/test_common/environment.h" #include "test/test_common/registry.h" diff --git a/test/server/guarddog_impl_test.cc b/test/server/guarddog_impl_test.cc index 067ee8403aafc..2ab5e94332e73 100644 --- a/test/server/guarddog_impl_test.cc +++ b/test/server/guarddog_impl_test.cc @@ -11,7 +11,7 @@ #include "server/guarddog_impl.h" #include "test/mocks/common.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/main.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_time.h" diff --git a/test/server/hot_restart_impl_test.cc b/test/server/hot_restart_impl_test.cc index 8237c2ba9aaf5..1d127c2572c42 100644 --- a/test/server/hot_restart_impl_test.cc +++ b/test/server/hot_restart_impl_test.cc @@ -8,7 +8,7 @@ #include "test/mocks/api/hot_restart.h" #include "test/mocks/api/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/hot_restart.h" #include "test/test_common/logging.h" #include "test/test_common/threadsafe_singleton_injector.h" diff --git a/test/server/hot_restarting_parent_test.cc b/test/server/hot_restarting_parent_test.cc index e178bb9b2ff39..80ce667bb50d2 100644 --- a/test/server/hot_restarting_parent_test.cc +++ b/test/server/hot_restarting_parent_test.cc @@ -4,7 +4,8 @@ #include "server/hot_restarting_parent.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/listener_manager.h" #include "gtest/gtest.h" diff --git a/test/server/lds_api_test.cc b/test/server/lds_api_test.cc index 3b15585cc2d43..f4c5aee7b72c2 100644 --- a/test/server/lds_api_test.cc +++ b/test/server/lds_api_test.cc @@ -9,18 +9,21 @@ #include "server/lds_api.h" #include "test/mocks/config/mocks.h" +#include "test/mocks/init/mocks.h" #include "test/mocks/protobuf/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/listener_manager.h" +#include "test/mocks/upstream/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/utility.h" #include "gmock/gmock.h" -using testing::_; -using testing::InSequence; -using testing::Invoke; -using testing::Return; -using testing::Throw; +using ::testing::_; +using ::testing::InSequence; +using ::testing::Invoke; +using ::testing::NiceMock; +using ::testing::Return; +using ::testing::Throw; namespace Envoy { namespace Server { diff --git a/test/server/listener_manager_impl_test.h b/test/server/listener_manager_impl_test.h index d1f3256fd4a4a..747859f669a12 100644 --- a/test/server/listener_manager_impl_test.h +++ b/test/server/listener_manager_impl_test.h @@ -12,7 +12,12 @@ #include "server/listener_manager_impl.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/drain_manager.h" +#include "test/mocks/server/guard_dog.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/listener_component_factory.h" +#include "test/mocks/server/worker.h" +#include "test/mocks/server/worker_factory.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h" #include "test/test_common/test_runtime.h" diff --git a/test/server/server_fuzz_test.cc b/test/server/server_fuzz_test.cc index d070444fdac83..8c6e7bb7cc22a 100644 --- a/test/server/server_fuzz_test.cc +++ b/test/server/server_fuzz_test.cc @@ -13,7 +13,8 @@ #include "test/common/runtime/utility.h" #include "test/fuzz/fuzz_runner.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/hot_restart.h" +#include "test/mocks/server/options.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/test_time.h" diff --git a/test/server/server_test.cc b/test/server/server_test.cc index 8f99b100ab557..a34d924239bcd 100644 --- a/test/server/server_test.cc +++ b/test/server/server_test.cc @@ -18,7 +18,11 @@ #include "test/common/config/dummy_config.pb.h" #include "test/common/stats/stat_test_utility.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/bootstrap_extension_factory.h" +#include "test/mocks/server/hot_restart.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/options.h" +#include "test/mocks/server/overload_manager.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/registry.h" diff --git a/test/server/worker_impl_test.cc b/test/server/worker_impl_test.cc index 4a7c560c33cb7..6fd4291f2d9a2 100644 --- a/test/server/worker_impl_test.cc +++ b/test/server/worker_impl_test.cc @@ -6,7 +6,9 @@ #include "server/worker_impl.h" #include "test/mocks/network/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/guard_dog.h" +#include "test/mocks/server/instance.h" +#include "test/mocks/server/overload_manager.h" #include "test/mocks/thread_local/mocks.h" #include "test/test_common/utility.h" From faf8d456bbc5741f76354b3a7bb4ed6932b49809 Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Tue, 14 Jul 2020 16:42:21 +0000 Subject: [PATCH 2/2] Kick CI Signed-off-by: Muge Chen