From b2f2c55ab11e584dab03931e5b15201c8f778985 Mon Sep 17 00:00:00 2001 From: foreseeable Date: Tue, 14 Jul 2020 20:09:21 +0000 Subject: [PATCH] test: refactor header inclusion to speed up building (for test/integration/...) (#12053) Commit Message: refactor header inclusion to speed up building Additional Description: Risk Level: low Testing: exsiting tests Docs Changes: N/A Release Notes: no Related Issues: #10917 Signed-off-by: Muge Chen Signed-off-by: scheler --- test/extensions/transport_sockets/alts/BUILD | 1 + test/integration/BUILD | 5 +++-- test/integration/integration.h | 4 +++- test/integration/ssl_utility.cc | 2 +- test/integration/xfcc_integration_test.h | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index 386c25ace615..edfa523ba12f 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -89,6 +89,7 @@ envoy_extension_cc_test( "//test/integration:http_integration_lib", "//test/mocks/runtime:runtime_mocks", "//test/mocks/secret:secret_mocks", + "//test/mocks/server:server_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/transport_socket/alts/v2alpha:pkg_cc_proto", ], diff --git a/test/integration/BUILD b/test/integration/BUILD index a8ed5cb5dbcc..2efec82ce37b 100644 --- a/test/integration/BUILD +++ b/test/integration/BUILD @@ -624,6 +624,7 @@ envoy_cc_test_library( "//source/extensions/transport_sockets/raw_buffer:config", "//source/extensions/transport_sockets/tap:config", "//source/extensions/transport_sockets/tls:config", + "//source/extensions/transport_sockets/tls:context_lib", "//source/server:connection_handler_lib", "//source/server:drain_manager_lib", "//source/server:hot_restart_nop_lib", @@ -635,7 +636,7 @@ envoy_cc_test_library( "//test/common/upstream:utility_lib", "//test/config:utility_lib", "//test/mocks/buffer:buffer_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:transport_socket_factory_context_mocks", "//test/mocks/stats:stats_mocks", "//test/mocks/upstream:upstream_mocks", "//test/test_common:environment_lib", @@ -1097,7 +1098,7 @@ envoy_cc_test( ":http_integration_lib", "//source/common/http:header_map_lib", "//source/extensions/transport_sockets/tls:config", - "//test/mocks/server:server_mocks", + "//test/mocks/server:transport_socket_factory_context_mocks", "//test/test_common:utility_lib", "@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto", "@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg_cc_proto", diff --git a/test/integration/integration.h b/test/integration/integration.h index dbf30d912bb4..0d0081711f93 100644 --- a/test/integration/integration.h +++ b/test/integration/integration.h @@ -13,13 +13,15 @@ #include "common/config/version_converter.h" #include "common/http/codec_client.h" +#include "extensions/transport_sockets/tls/context_manager_impl.h" + #include "test/common/grpc/grpc_client_integration.h" #include "test/config/utility.h" #include "test/integration/fake_upstream.h" #include "test/integration/server.h" #include "test/integration/utility.h" #include "test/mocks/buffer/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" #include "test/test_common/printers.h" diff --git a/test/integration/ssl_utility.cc b/test/integration/ssl_utility.cc index 14c1a0bf85c8..aab3dd5d4adf 100644 --- a/test/integration/ssl_utility.cc +++ b/test/integration/ssl_utility.cc @@ -12,7 +12,7 @@ #include "test/config/utility.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "test/test_common/environment.h" #include "test/test_common/network_utility.h" diff --git a/test/integration/xfcc_integration_test.h b/test/integration/xfcc_integration_test.h index 538a1bc86d97..6e4997f8b0dc 100644 --- a/test/integration/xfcc_integration_test.h +++ b/test/integration/xfcc_integration_test.h @@ -8,7 +8,7 @@ #include "test/config/integration/certs/clientcert_hash.h" #include "test/integration/http_integration.h" #include "test/integration/server.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "absl/strings/ascii.h" #include "absl/strings/str_replace.h"