test: refactor header inclusion to speed up building (for test/extens…

…ions/[upstream|common|tracer]/...) (#12049)

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 <mugechen@google.com>

test/extensions/common/tap/BUILD

@@ -25,7 +25,8 @@ envoy_cc_test(
  srcs = ["admin_test.cc"],
  deps = [
  "//source/extensions/common/tap:admin",
- "//test/mocks/server:server_mocks",
+ "//test/mocks/server:admin_mocks",
+ "//test/mocks/server:admin_stream_mocks",
  "@envoy_api//envoy/config/tap/v3:pkg_cc_proto",
  ],
 )

test/extensions/common/tap/admin_test.cc

@@ -2,7 +2,8 @@
 
 #include "extensions/common/tap/admin.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/admin.h"
+#include "test/mocks/server/admin_stream.h"
 
 #include "gtest/gtest.h"
 

test/extensions/tracers/datadog/config_test.cc

@@ -4,7 +4,8 @@
 
 #include "extensions/tracers/datadog/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

test/extensions/tracers/dynamic_ot/config_test.cc

@@ -4,7 +4,8 @@
 
 #include "extensions/tracers/dynamic_ot/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 #include "test/test_common/environment.h"
 
 #include "fmt/printf.h"

test/extensions/tracers/lightstep/config_test.cc

@@ -4,7 +4,8 @@
 
 #include "extensions/tracers/lightstep/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

test/extensions/tracers/opencensus/config_test.cc

@@ -5,7 +5,8 @@
 
 #include "extensions/tracers/opencensus/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

test/extensions/tracers/xray/BUILD

@@ -27,7 +27,8 @@ envoy_extension_cc_test(
  "//test/mocks/http:http_mocks",
  "//test/mocks/local_info:local_info_mocks",
  "//test/mocks/runtime:runtime_mocks",
- "//test/mocks/server:server_mocks",
+ "//test/mocks/server:instance_mocks",
+ "//test/mocks/server:tracer_factory_context_mocks",
  "//test/mocks/stats:stats_mocks",
  "//test/mocks/thread_local:thread_local_mocks",
  "//test/mocks/tracing:tracing_mocks",
@@ -43,7 +44,9 @@ envoy_extension_cc_test(
  extension_name = "envoy.tracers.xray",
  deps = [
  "//source/extensions/tracers/xray:config",
- "//test/mocks/server:server_mocks",
+ "//test/mocks/server:instance_mocks",
+ "//test/mocks/server:tracer_factory_context_mocks",
+ "//test/mocks/server:tracer_factory_mocks",
  "//test/test_common:environment_lib",
  "//test/test_common:utility_lib",
  "@envoy_api//envoy/config/trace/v3:pkg_cc_proto",

test/extensions/tracers/xray/config_test.cc

@@ -5,7 +5,9 @@
 
 #include "extensions/tracers/xray/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/instance.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 #include "test/test_common/environment.h"
 
 #include "gmock/gmock.h"

test/extensions/tracers/xray/tracer_test.cc

@@ -10,7 +10,7 @@
 #include "extensions/tracers/xray/tracer.h"
 #include "extensions/tracers/xray/xray_configuration.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/instance.h"
 #include "test/mocks/tracing/mocks.h"
 #include "test/test_common/environment.h"
 #include "test/test_common/network_utility.h"

test/extensions/tracers/xray/xray_tracer_impl_test.cc

@@ -5,7 +5,9 @@
 #include "extensions/tracers/xray/xray_tracer_impl.h"
 
 #include "test/mocks/runtime/mocks.h"
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/instance.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 #include "test/mocks/thread_local/mocks.h"
 #include "test/mocks/tracing/mocks.h"
 #include "test/test_common/utility.h"

test/extensions/tracers/zipkin/BUILD

@@ -52,7 +52,8 @@ envoy_extension_cc_test(
  extension_name = "envoy.tracers.zipkin",
  deps = [
  "//source/extensions/tracers/zipkin:config",
- "//test/mocks/server:server_mocks",
+ "//test/mocks/server:tracer_factory_context_mocks",
+ "//test/mocks/server:tracer_factory_mocks",
  "//test/test_common:utility_lib",
  "@envoy_api//envoy/config/trace/v3:pkg_cc_proto",
  ],

test/extensions/tracers/zipkin/config_test.cc

@@ -5,7 +5,8 @@
 
 #include "extensions/tracers/zipkin/config.h"
 
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/tracer_factory.h"
+#include "test/mocks/server/tracer_factory_context.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"

test/extensions/upstreams/http/tcp/BUILD

@@ -22,7 +22,8 @@ envoy_cc_test(
  "//test/mocks/http:http_mocks",
  "//test/mocks/network:network_mocks",
  "//test/mocks/router:router_mocks",
- "//test/mocks/server:server_mocks",
+ "//test/mocks/server:factory_context_mocks",
+ "//test/mocks/server:instance_mocks",
  "//test/mocks/upstream:upstream_mocks",
  "//test/test_common:environment_lib",
  "//test/test_common:simulated_time_system_lib",

test/extensions/upstreams/http/tcp/upstream_request_test.cc

@@ -10,7 +10,8 @@
 #include "test/mocks/common.h"
 #include "test/mocks/http/mocks.h"
 #include "test/mocks/router/mocks.h"
-#include "test/mocks/server/mocks.h"
+#include "test/mocks/server/factory_context.h"
+#include "test/mocks/server/instance.h"
 #include "test/mocks/tcp/mocks.h"
 #include "test/test_common/utility.h"