From b2a5c43a0a9fb9e2b7ac75116b21379893700e50 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Fri, 16 Dec 2022 10:01:05 -0800
Subject: [PATCH] LB policy config tests: move to lb_policy subdir (#31905)

* LB policy config tests: move to lb_policy subdir

* generate_projects.sh

* buildifier
---
 CMakeLists.txt                                |  6 +-
 build_autogenerated.yaml                      | 12 +++-
 test/core/client_channel/BUILD                | 45 ---------------
 test/core/client_channel/lb_policy/BUILD      | 56 +++++++++++++++++++
 ...outlier_detection_lb_config_parser_test.cc |  0
 .../rls_lb_config_parser_test.cc              |  0
 ...xds_override_host_lb_config_parser_test.cc |  0
 tools/run_tests/generated/tests.json          | 12 ++--
 8 files changed, 74 insertions(+), 57 deletions(-)
 rename test/core/client_channel/{ => lb_policy}/outlier_detection_lb_config_parser_test.cc (100%)
 rename test/core/client_channel/{ => lb_policy}/rls_lb_config_parser_test.cc (100%)
 rename test/core/client_channel/{ => lb_policy}/xds_override_host_lb_config_parser_test.cc (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af99d85c4d8..ad0f5df748b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15449,7 +15449,7 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(outlier_detection_lb_config_parser_test
-  test/core/client_channel/outlier_detection_lb_config_parser_test.cc
+  test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
   third_party/googletest/googletest/src/gtest-all.cc
   third_party/googletest/googlemock/src/gmock-all.cc
 )
@@ -17281,7 +17281,7 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(rls_lb_config_parser_test
-  test/core/client_channel/rls_lb_config_parser_test.cc
+  test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
   third_party/googletest/googletest/src/gtest-all.cc
   third_party/googletest/googlemock/src/gmock-all.cc
 )
@@ -24335,7 +24335,7 @@ endif()
 if(gRPC_BUILD_TESTS)
 
 add_executable(xds_override_host_lb_config_parser_test
-  test/core/client_channel/xds_override_host_lb_config_parser_test.cc
+  test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
   third_party/googletest/googletest/src/gtest-all.cc
   third_party/googletest/googlemock/src/gmock-all.cc
 )
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 7a2f1a95e30..1ee83a3fb37 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -9351,9 +9351,10 @@ targets:
   headers:
   - test/core/util/scoped_env_var.h
   src:
-  - test/core/client_channel/outlier_detection_lb_config_parser_test.cc
+  - test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: outlier_detection_test
   gtest: true
   build: test
@@ -9364,6 +9365,7 @@ targets:
   - test/core/client_channel/lb_policy/outlier_detection_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: overload_test
   gtest: true
   build: test
@@ -9517,6 +9519,7 @@ targets:
   - test/core/client_channel/lb_policy/pick_first_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: pid_controller_test
   gtest: true
   build: test
@@ -10222,9 +10225,10 @@ targets:
   language: c++
   headers: []
   src:
-  - test/core/client_channel/rls_lb_config_parser_test.cc
+  - test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: secure_auth_context_test
   gtest: true
   build: test
@@ -13197,9 +13201,10 @@ targets:
   language: c++
   headers: []
   src:
-  - test/core/client_channel/xds_override_host_lb_config_parser_test.cc
+  - test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: xds_override_host_test
   gtest: true
   build: test
@@ -13210,6 +13215,7 @@ targets:
   - test/core/client_channel/lb_policy/xds_override_host_test.cc
   deps:
   - grpc_test_util
+  uses_polling: false
 - name: xds_ring_hash_end2end_test
   gtest: true
   build: test
diff --git a/test/core/client_channel/BUILD b/test/core/client_channel/BUILD
index 1d70b79b98d..ec58b53d221 100644
--- a/test/core/client_channel/BUILD
+++ b/test/core/client_channel/BUILD
@@ -89,48 +89,3 @@ grpc_cc_test(
         "//test/core/util:grpc_test_util",
     ],
 )
-
-grpc_cc_test(
-    name = "rls_lb_config_parser_test",
-    srcs = ["rls_lb_config_parser_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    deps = [
-        "//:grpc",
-        "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
-    ],
-)
-
-grpc_cc_test(
-    name = "outlier_detection_lb_config_parser_test",
-    srcs = ["outlier_detection_lb_config_parser_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    deps = [
-        "//:grpc",
-        "//src/core:channel_args",
-        "//test/core/util:grpc_test_util",
-        "//test/core/util:scoped_env_var",
-    ],
-)
-
-grpc_cc_test(
-    name = "xds_override_host_lb_config_parser_test",
-    srcs = ["xds_override_host_lb_config_parser_test.cc"],
-    external_deps = [
-        "gtest",
-    ],
-    language = "C++",
-    tags = ["no_test_ios"],
-    deps = [
-        "//:grpc",
-        "//test/core/util:grpc_test_util",
-    ],
-)
diff --git a/test/core/client_channel/lb_policy/BUILD b/test/core/client_channel/lb_policy/BUILD
index 4540a6d9999..a2c69886152 100644
--- a/test/core/client_channel/lb_policy/BUILD
+++ b/test/core/client_channel/lb_policy/BUILD
@@ -42,6 +42,8 @@ grpc_cc_test(
     srcs = ["pick_first_test.cc"],
     external_deps = ["gtest"],
     language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
     deps = [
         ":lb_policy_test_lib",
         "//src/core:channel_args",
@@ -50,11 +52,30 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "outlier_detection_lb_config_parser_test",
+    srcs = ["outlier_detection_lb_config_parser_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc",
+        "//src/core:channel_args",
+        "//test/core/util:grpc_test_util",
+        "//test/core/util:scoped_env_var",
+    ],
+)
+
 grpc_cc_test(
     name = "outlier_detection_test",
     srcs = ["outlier_detection_test.cc"],
     external_deps = ["gtest"],
     language = "C++",
+    uses_polling = False,
     deps = [
         ":lb_policy_test_lib",
         "//src/core:channel_args",
@@ -63,11 +84,29 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "xds_override_host_lb_config_parser_test",
+    srcs = ["xds_override_host_lb_config_parser_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc",
+        "//test/core/util:grpc_test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "xds_override_host_test",
     srcs = ["xds_override_host_test.cc"],
     external_deps = ["gtest"],
     language = "C++",
+    uses_event_engine = False,
+    uses_polling = False,
     deps = [
         ":lb_policy_test_lib",
         "//src/core:grpc_lb_policy_xds_override_host",
@@ -75,6 +114,23 @@ grpc_cc_test(
     ],
 )
 
+grpc_cc_test(
+    name = "rls_lb_config_parser_test",
+    srcs = ["rls_lb_config_parser_test.cc"],
+    external_deps = [
+        "gtest",
+    ],
+    language = "C++",
+    tags = ["no_test_ios"],
+    uses_event_engine = False,
+    uses_polling = False,
+    deps = [
+        "//:grpc",
+        "//src/core:channel_args",
+        "//test/core/util:grpc_test_util",
+    ],
+)
+
 grpc_cc_test(
     name = "static_stride_scheduler_test",
     srcs = ["static_stride_scheduler_test.cc"],
diff --git a/test/core/client_channel/outlier_detection_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
similarity index 100%
rename from test/core/client_channel/outlier_detection_lb_config_parser_test.cc
rename to test/core/client_channel/lb_policy/outlier_detection_lb_config_parser_test.cc
diff --git a/test/core/client_channel/rls_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
similarity index 100%
rename from test/core/client_channel/rls_lb_config_parser_test.cc
rename to test/core/client_channel/lb_policy/rls_lb_config_parser_test.cc
diff --git a/test/core/client_channel/xds_override_host_lb_config_parser_test.cc b/test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
similarity index 100%
rename from test/core/client_channel/xds_override_host_lb_config_parser_test.cc
rename to test/core/client_channel/lb_policy/xds_override_host_lb_config_parser_test.cc
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 746f6b5f622..f4d39b6401f 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -5069,7 +5069,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -5093,7 +5093,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -5259,7 +5259,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -5921,7 +5921,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -8665,7 +8665,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],
@@ -8689,7 +8689,7 @@
       "posix",
       "windows"
     ],
-    "uses_polling": true
+    "uses_polling": false
   },
   {
     "args": [],