From f17dc43876708e79cb11d6c34350f0b768d1b66a Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Mon, 13 Jul 2020 13:48:57 +0000 Subject: [PATCH 1/2] resolve dependencies Signed-off-by: Muge Chen --- test/extensions/transport_sockets/alts/BUILD | 3 ++- .../transport_sockets/alts/alts_integration_test.cc | 3 ++- test/extensions/transport_sockets/alts/config_test.cc | 2 +- test/extensions/transport_sockets/tls/BUILD | 6 +++++- test/extensions/transport_sockets/tls/context_impl_test.cc | 4 +++- test/extensions/transport_sockets/tls/ssl_certs_test.h | 2 +- test/extensions/transport_sockets/tls/ssl_socket_test.cc | 4 +++- 7 files changed, 17 insertions(+), 7 deletions(-) diff --git a/test/extensions/transport_sockets/alts/BUILD b/test/extensions/transport_sockets/alts/BUILD index d2e0f2998f071..155d6a24b2a75 100644 --- a/test/extensions/transport_sockets/alts/BUILD +++ b/test/extensions/transport_sockets/alts/BUILD @@ -17,10 +17,11 @@ envoy_extension_cc_test( srcs = ["config_test.cc"], extension_name = "envoy.transport_sockets.alts", deps = [ + "//source/common/singleton:manager_impl_lib", "//source/extensions/transport_sockets/alts:config", "//test/mocks/event:event_mocks", "//test/mocks/network:network_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:transport_socket_factory_context_mocks", ], ) diff --git a/test/extensions/transport_sockets/alts/alts_integration_test.cc b/test/extensions/transport_sockets/alts/alts_integration_test.cc index eca7bbf6f7a01..609d70b73b3b4 100644 --- a/test/extensions/transport_sockets/alts/alts_integration_test.cc +++ b/test/extensions/transport_sockets/alts/alts_integration_test.cc @@ -21,7 +21,8 @@ #include "test/integration/integration.h" #include "test/integration/server.h" #include "test/integration/utility.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" + #include "test/test_common/network_utility.h" #include "test/test_common/utility.h" diff --git a/test/extensions/transport_sockets/alts/config_test.cc b/test/extensions/transport_sockets/alts/config_test.cc index 6e1ae044c4698..a3c233ad78224 100644 --- a/test/extensions/transport_sockets/alts/config_test.cc +++ b/test/extensions/transport_sockets/alts/config_test.cc @@ -3,7 +3,7 @@ #include "extensions/transport_sockets/alts/config.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/test/extensions/transport_sockets/tls/BUILD b/test/extensions/transport_sockets/tls/BUILD index 2e2586354fb95..0eed6c1c04548 100644 --- a/test/extensions/transport_sockets/tls/BUILD +++ b/test/extensions/transport_sockets/tls/BUILD @@ -46,6 +46,8 @@ envoy_cc_test( "//source/extensions/transport_sockets/tls/private_key:private_key_manager_lib", "//test/extensions/transport_sockets/tls/test_data:cert_infos", "//test/mocks/buffer:buffer_mocks", + "//test/mocks/init:init_mocks", + "//test/mocks/local_info:local_info_mocks", "//test/mocks/network:network_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/server:server_mocks", @@ -79,9 +81,11 @@ envoy_cc_test( "//source/extensions/transport_sockets/tls:context_config_lib", "//source/extensions/transport_sockets/tls:context_lib", "//test/extensions/transport_sockets/tls/test_data:cert_infos", + "//test/mocks/init:init_mocks", + "//test/mocks/local_info:local_info_mocks", "//test/mocks/runtime:runtime_mocks", "//test/mocks/secret:secret_mocks", - "//test/mocks/server:server_mocks", + "//test/mocks/server:transport_socket_factory_context_mocks", "//test/mocks/ssl:ssl_mocks", "//test/test_common:environment_lib", "//test/test_common:simulated_time_system_lib", diff --git a/test/extensions/transport_sockets/tls/context_impl_test.cc b/test/extensions/transport_sockets/tls/context_impl_test.cc index 468e22f0bd265..e2aa37477fa22 100644 --- a/test/extensions/transport_sockets/tls/context_impl_test.cc +++ b/test/extensions/transport_sockets/tls/context_impl_test.cc @@ -19,8 +19,10 @@ #include "test/extensions/transport_sockets/tls/test_data/no_san_cert_info.h" #include "test/extensions/transport_sockets/tls/test_data/san_dns3_cert_info.h" #include "test/extensions/transport_sockets/tls/test_data/san_ip_cert_info.h" +#include "test/mocks/init/mocks.h" +#include "test/mocks/local_info/mocks.h" #include "test/mocks/secret/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/test_common/environment.h" #include "test/test_common/simulated_time_system.h" diff --git a/test/extensions/transport_sockets/tls/ssl_certs_test.h b/test/extensions/transport_sockets/tls/ssl_certs_test.h index d6d450ca748d4..843273acfcfae 100644 --- a/test/extensions/transport_sockets/tls/ssl_certs_test.h +++ b/test/extensions/transport_sockets/tls/ssl_certs_test.h @@ -1,6 +1,6 @@ #pragma once -#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/simulated_time_system.h" diff --git a/test/extensions/transport_sockets/tls/ssl_socket_test.cc b/test/extensions/transport_sockets/tls/ssl_socket_test.cc index fc84d1e61e1b9..29705379547ab 100644 --- a/test/extensions/transport_sockets/tls/ssl_socket_test.cc +++ b/test/extensions/transport_sockets/tls/ssl_socket_test.cc @@ -32,9 +32,11 @@ #include "test/extensions/transport_sockets/tls/test_data/selfsigned_ecdsa_p256_cert_info.h" #include "test/extensions/transport_sockets/tls/test_private_key_method_provider.h" #include "test/mocks/buffer/mocks.h" +#include "test/mocks/init/mocks.h" +#include "test/mocks/local_info/mocks.h" #include "test/mocks/network/mocks.h" #include "test/mocks/secret/mocks.h" -#include "test/mocks/server/mocks.h" +#include "test/mocks/server/transport_socket_factory_context.h" #include "test/mocks/ssl/mocks.h" #include "test/mocks/stats/mocks.h" #include "test/test_common/environment.h" From dccf861704c8f52fbb303cf235bf86a6ad57289a Mon Sep 17 00:00:00 2001 From: Muge Chen Date: Tue, 14 Jul 2020 01:47:54 +0000 Subject: [PATCH 2/2] Kick CI Signed-off-by: Muge Chen