diff --git a/BUILD b/BUILD index f7171059fab..f3ac7c6ef3a 100644 --- a/BUILD +++ b/BUILD @@ -2917,17 +2917,22 @@ grpc_cc_library( "src/core/lib/event_engine/slice_buffer.cc", ], hdrs = [ + "include/grpc/event_engine/slice.h", + "include/grpc/event_engine/slice_buffer.h", "src/core/lib/event_engine/handle_containers.h", ], external_deps = [ "absl/container:flat_hash_set", "absl/hash", + "absl/strings", + "absl/utility", ], deps = [ "event_engine_base_hdrs", "gpr", "gpr_platform", "slice", + "slice_buffer", "slice_refcount", ], ) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae053afc655..eeaebbe4332 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9178,7 +9178,6 @@ target_link_libraries(endpoint_config_test ${_gRPC_PROTOBUF_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} grpc - grpc_test_util_unsecure ) @@ -17931,6 +17930,14 @@ endif() if(gRPC_BUILD_TESTS) add_executable(test_core_event_engine_slice_buffer_test + src/core/lib/event_engine/resolved_address.cc + src/core/lib/event_engine/slice.cc + src/core/lib/event_engine/slice_buffer.cc + src/core/lib/gpr/murmur_hash.cc + src/core/lib/slice/slice.cc + src/core/lib/slice/slice_buffer.cc + src/core/lib/slice/slice_refcount.cc + src/core/lib/slice/slice_string_helpers.cc test/core/event_engine/slice_buffer_test.cc third_party/googletest/googletest/src/gtest-all.cc third_party/googletest/googlemock/src/gmock-all.cc @@ -17958,8 +17965,12 @@ target_include_directories(test_core_event_engine_slice_buffer_test target_link_libraries(test_core_event_engine_slice_buffer_test ${_gRPC_PROTOBUF_LIBRARIES} ${_gRPC_ALLTARGETS_LIBRARIES} - grpc - grpc_test_util_unsecure + absl::flat_hash_set + absl::any_invocable + absl::hash + absl::statusor + absl::utility + gpr ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 71d60c38fe1..1810d6152af 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5565,7 +5565,6 @@ targets: - test/core/event_engine/endpoint_config_test.cc deps: - grpc - - grpc_test_util_unsecure uses_polling: false - name: endpoint_pair_test gtest: true @@ -9841,12 +9840,32 @@ targets: gtest: true build: test language: c++ - headers: [] + headers: + - src/core/lib/event_engine/handle_containers.h + - src/core/lib/gpr/murmur_hash.h + - src/core/lib/slice/slice.h + - src/core/lib/slice/slice_buffer.h + - src/core/lib/slice/slice_internal.h + - src/core/lib/slice/slice_refcount.h + - src/core/lib/slice/slice_refcount_base.h + - src/core/lib/slice/slice_string_helpers.h src: + - src/core/lib/event_engine/resolved_address.cc + - src/core/lib/event_engine/slice.cc + - src/core/lib/event_engine/slice_buffer.cc + - src/core/lib/gpr/murmur_hash.cc + - src/core/lib/slice/slice.cc + - src/core/lib/slice/slice_buffer.cc + - src/core/lib/slice/slice_refcount.cc + - src/core/lib/slice/slice_string_helpers.cc - test/core/event_engine/slice_buffer_test.cc deps: - - grpc - - grpc_test_util_unsecure + - absl/container:flat_hash_set + - absl/functional:any_invocable + - absl/hash:hash + - absl/status:statusor + - absl/utility:utility + - gpr - name: test_core_gpr_time_test gtest: true build: test diff --git a/src/core/lib/gpr/murmur_hash.h b/src/core/lib/gpr/murmur_hash.h index 8004889a9a5..f62ada946a2 100644 --- a/src/core/lib/gpr/murmur_hash.h +++ b/src/core/lib/gpr/murmur_hash.h @@ -22,6 +22,7 @@ #include #include +#include /* compute the hash of key (length len) */ uint32_t gpr_murmur_hash3(const void* key, size_t len, uint32_t seed); diff --git a/src/core/lib/gpr/string.h b/src/core/lib/gpr/string.h index 333756094e2..b5ec416f83e 100644 --- a/src/core/lib/gpr/string.h +++ b/src/core/lib/gpr/string.h @@ -21,8 +21,8 @@ #include -#include #include +#include #include diff --git a/src/core/lib/json/json_object_loader.h b/src/core/lib/json/json_object_loader.h index 8825040cd6c..095e8860982 100644 --- a/src/core/lib/json/json_object_loader.h +++ b/src/core/lib/json/json_object_loader.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include "absl/meta/type_traits.h" diff --git a/test/core/address_utils/parse_address_test.cc b/test/core/address_utils/parse_address_test.cc index 9f3fd054c3c..53dcad1e6c6 100644 --- a/test/core/address_utils/parse_address_test.cc +++ b/test/core/address_utils/parse_address_test.cc @@ -17,21 +17,21 @@ */ #include "src/core/lib/address_utils/parse_address.h" - -#include #ifdef GRPC_HAVE_UNIX_SOCKET #include #endif -#include +#include +#include "absl/status/status.h" #include "absl/strings/match.h" +#include "gtest/gtest.h" #include #include -#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/port.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "test/core/util/test_config.h" diff --git a/test/core/address_utils/parse_address_with_named_scope_id_test.cc b/test/core/address_utils/parse_address_with_named_scope_id_test.cc index 060d944972a..8253fba034d 100644 --- a/test/core/address_utils/parse_address_with_named_scope_id_test.cc +++ b/test/core/address_utils/parse_address_with_named_scope_id_test.cc @@ -16,26 +16,33 @@ * */ +#include #include +#include +#include #include + +#include #ifdef GRPC_HAVE_UNIX_SOCKET #include #endif -#include +#include +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "gtest/gtest.h" #include #include #include "src/core/lib/address_utils/parse_address.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/iomgr/socket_utils.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" static void test_grpc_parse_ipv6_parity_with_getaddrinfo( diff --git a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc index 2cecb09b2e7..f8caf91e077 100644 --- a/test/core/address_utils/sockaddr_utils_fuzzer_test.cc +++ b/test/core/address_utils/sockaddr_utils_fuzzer_test.cc @@ -14,14 +14,18 @@ // limitations under the License. // -#include #include #include -#include +#include + +#include "absl/status/statusor.h" + +#include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/uri/uri_parser.h" bool squelch = true; diff --git a/test/core/address_utils/sockaddr_utils_test.cc b/test/core/address_utils/sockaddr_utils_test.cc index 150050e13c8..6ac8c19bde9 100644 --- a/test/core/address_utils/sockaddr_utils_test.cc +++ b/test/core/address_utils/sockaddr_utils_test.cc @@ -19,15 +19,24 @@ #include "src/core/lib/address_utils/sockaddr_utils.h" #include +#include #include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "gtest/gtest.h" + +#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/resolved_address.h" #ifdef GRPC_HAVE_UNIX_SOCKET #include #endif +#include + #include -#include -#include #include #include "src/core/lib/address_utils/parse_address.h" diff --git a/test/core/avl/avl_fuzzer.cc b/test/core/avl/avl_fuzzer.cc index 7fb5f74f72e..a71df5e0297 100644 --- a/test/core/avl/avl_fuzzer.cc +++ b/test/core/avl/avl_fuzzer.cc @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +#include +#include +#include + #include "src/core/lib/avl/avl.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/avl/avl_fuzzer.pb.h" diff --git a/test/core/avl/avl_test.cc b/test/core/avl/avl_test.cc index 820583609d1..e1c983628ce 100644 --- a/test/core/avl/avl_test.cc +++ b/test/core/avl/avl_test.cc @@ -14,7 +14,7 @@ #include "src/core/lib/avl/avl.h" -#include +#include "gtest/gtest.h" namespace grpc_core { diff --git a/test/core/backoff/backoff_test.cc b/test/core/backoff/backoff_test.cc index dad640872b7..ca4bb04adcf 100644 --- a/test/core/backoff/backoff_test.cc +++ b/test/core/backoff/backoff_test.cc @@ -20,7 +20,9 @@ #include -#include +#include "gtest/gtest.h" + +#include #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index c406e30300b..1312fce964a 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -18,25 +18,31 @@ #include "test/core/bad_client/bad_client.h" +#include #include -#include +#include #include -#include +#include #include +#include -#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/gpr/murmur_hash.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/resource_quota/api.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" #define MIN_HTTP2_FRAME_SIZE 9 diff --git a/test/core/bad_client/bad_client.h b/test/core/bad_client/bad_client.h index fcd998e1b28..936d897e918 100644 --- a/test/core/bad_client/bad_client.h +++ b/test/core/bad_client/bad_client.h @@ -19,11 +19,11 @@ #ifndef GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H #define GRPC_TEST_CORE_BAD_CLIENT_BAD_CLIENT_H -#include +#include +#include #include - -#include "test/core/util/test_config.h" +#include #define GRPC_BAD_CLIENT_REGISTERED_METHOD "/registered/bar" #define GRPC_BAD_CLIENT_REGISTERED_HOST "localhost" diff --git a/test/core/bad_client/tests/bad_streaming_id.cc b/test/core/bad_client/tests/bad_streaming_id.cc index 10e9a563e2a..ea3ec6e22e7 100644 --- a/test/core/bad_client/tests/bad_streaming_id.cc +++ b/test/core/bad_client/tests/bad_streaming_id.cc @@ -16,14 +16,14 @@ * */ -#include - #include -#include +#include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" #define HEADER_FRAME_ID_1 \ "\x00\x00\xc9\x01\x05\x00\x00\x00\x01" /* headers: generated from \ diff --git a/test/core/bad_client/tests/badreq.cc b/test/core/bad_client/tests/badreq.cc index 6996864556c..387037ed187 100644 --- a/test/core/bad_client/tests/badreq.cc +++ b/test/core/bad_client/tests/badreq.cc @@ -16,13 +16,12 @@ * */ -#include - #include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" -#include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \ diff --git a/test/core/bad_client/tests/connection_prefix.cc b/test/core/bad_client/tests/connection_prefix.cc index 7b3f432a8c8..a6a76359070 100644 --- a/test/core/bad_client/tests/connection_prefix.cc +++ b/test/core/bad_client/tests/connection_prefix.cc @@ -16,8 +16,12 @@ * */ +#include +#include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" static void verifier(grpc_server* server, grpc_completion_queue* cq, void* /*registered_method*/) { diff --git a/test/core/bad_client/tests/duplicate_header.cc b/test/core/bad_client/tests/duplicate_header.cc index 0f3815d7e7d..4ecd7025089 100644 --- a/test/core/bad_client/tests/duplicate_header.cc +++ b/test/core/bad_client/tests/duplicate_header.cc @@ -16,13 +16,17 @@ * */ +#include #include #include +#include +#include +#include -#include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \ diff --git a/test/core/bad_client/tests/head_of_line_blocking.cc b/test/core/bad_client/tests/head_of_line_blocking.cc index 049ebe147be..230d2d129db 100644 --- a/test/core/bad_client/tests/head_of_line_blocking.cc +++ b/test/core/bad_client/tests/head_of_line_blocking.cc @@ -16,14 +16,19 @@ * */ +#include #include +#include + +#include #include #include +#include -#include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" static const char prefix[] = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" diff --git a/test/core/bad_client/tests/headers.cc b/test/core/bad_client/tests/headers.cc index a921ffc80ff..58c62f90df5 100644 --- a/test/core/bad_client/tests/headers.cc +++ b/test/core/bad_client/tests/headers.cc @@ -16,8 +16,12 @@ * */ +#include +#include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \ diff --git a/test/core/bad_client/tests/initial_settings_frame.cc b/test/core/bad_client/tests/initial_settings_frame.cc index f1b6c331cd7..fcbccd6563f 100644 --- a/test/core/bad_client/tests/initial_settings_frame.cc +++ b/test/core/bad_client/tests/initial_settings_frame.cc @@ -16,8 +16,12 @@ * */ +#include +#include + #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" #define PFX_STR "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" #define ONE_SETTING_HDR "\x00\x00\x06\x04\x00\x00\x00\x00\x00" diff --git a/test/core/bad_client/tests/large_metadata.cc b/test/core/bad_client/tests/large_metadata.cc index 9423dc3f6d3..074ea9c53ea 100644 --- a/test/core/bad_client/tests/large_metadata.cc +++ b/test/core/bad_client/tests/large_metadata.cc @@ -18,16 +18,19 @@ #include +#include +#include +#include + #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" -#include -#include +#include +#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" -#include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" // The large-metadata headers that we're adding for this test are not // actually appended to this in a single string, since the string would diff --git a/test/core/bad_client/tests/out_of_bounds.cc b/test/core/bad_client/tests/out_of_bounds.cc index 2bb2a0e6018..4c350d22910 100644 --- a/test/core/bad_client/tests/out_of_bounds.cc +++ b/test/core/bad_client/tests/out_of_bounds.cc @@ -20,10 +20,12 @@ #include -#include +#include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" #define APPEND_BUFFER(string, to_append) \ ((string).append((to_append), sizeof(to_append) - 1)) diff --git a/test/core/bad_client/tests/server_registered_method.cc b/test/core/bad_client/tests/server_registered_method.cc index 852824a68b7..fbb0f5a4775 100644 --- a/test/core/bad_client/tests/server_registered_method.cc +++ b/test/core/bad_client/tests/server_registered_method.cc @@ -16,11 +16,16 @@ * */ -#include +#include + +#include +#include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \ diff --git a/test/core/bad_client/tests/simple_request.cc b/test/core/bad_client/tests/simple_request.cc index 3316a5315e6..b2dadc587cd 100644 --- a/test/core/bad_client/tests/simple_request.cc +++ b/test/core/bad_client/tests/simple_request.cc @@ -16,13 +16,16 @@ * */ -#include +#include #include +#include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" #include "test/core/end2end/cq_verifier.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \ diff --git a/test/core/bad_client/tests/unknown_frame.cc b/test/core/bad_client/tests/unknown_frame.cc index 7e389f079fe..136236203f7 100644 --- a/test/core/bad_client/tests/unknown_frame.cc +++ b/test/core/bad_client/tests/unknown_frame.cc @@ -20,10 +20,12 @@ #include -#include +#include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" static void verifier(grpc_server* server, grpc_completion_queue* cq, void* /*registered_method*/) { diff --git a/test/core/bad_client/tests/window_overflow.cc b/test/core/bad_client/tests/window_overflow.cc index 1ec89a43a05..005a869fdd0 100644 --- a/test/core/bad_client/tests/window_overflow.cc +++ b/test/core/bad_client/tests/window_overflow.cc @@ -16,13 +16,18 @@ * */ +#include #include +#include + #include #include +#include #include "src/core/lib/surface/server.h" #include "test/core/bad_client/bad_client.h" +#include "test/core/util/test_config.h" #define PFX_STR \ "\x00\x00\x00\x04\x01\x00\x00\x00\x00" \ diff --git a/test/core/bad_connection/close_fd_test.cc b/test/core/bad_connection/close_fd_test.cc index e4c4fe2c798..e7d0179beac 100644 --- a/test/core/bad_connection/close_fd_test.cc +++ b/test/core/bad_connection/close_fd_test.cc @@ -21,22 +21,37 @@ * an RPC call is in progress. * */ +#include +#include + +#include "absl/status/statusor.h" + +#include +#include +#include + #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport_fwd.h" + +struct test_ctx; // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP -#include #include #include #include -#include #include #include #include -#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/iomgr/endpoint_pair.h" diff --git a/test/core/bad_ssl/bad_ssl_test.cc b/test/core/bad_ssl/bad_ssl_test.cc index b511bf439a0..741a39f80ab 100644 --- a/test/core/bad_ssl/bad_ssl_test.cc +++ b/test/core/bad_ssl/bad_ssl_test.cc @@ -16,18 +16,23 @@ * */ +#include #include #include +#include + #include #include +#include +#include +#include #include #include #include -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" diff --git a/test/core/bad_ssl/server_common.cc b/test/core/bad_ssl/server_common.cc index d3e1a341a92..f3bd867569e 100644 --- a/test/core/bad_ssl/server_common.cc +++ b/test/core/bad_ssl/server_common.cc @@ -21,6 +21,7 @@ #include #include +#include #include "test/core/util/cmdline.h" #include "test/core/util/test_config.h" diff --git a/test/core/bad_ssl/servers/alpn.cc b/test/core/bad_ssl/servers/alpn.cc index 975065d5855..dc773fd504d 100644 --- a/test/core/bad_ssl/servers/alpn.cc +++ b/test/core/bad_ssl/servers/alpn.cc @@ -22,9 +22,11 @@ #include #include +#include #include #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/bad_ssl/server_common.h" diff --git a/test/core/bad_ssl/servers/cert.cc b/test/core/bad_ssl/servers/cert.cc index 3951aabe8d6..6737a318b8a 100644 --- a/test/core/bad_ssl/servers/cert.cc +++ b/test/core/bad_ssl/servers/cert.cc @@ -16,12 +16,12 @@ * */ -#include - #include #include +#include #include +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/bad_ssl/server_common.h" diff --git a/test/core/channel/call_finalization_test.cc b/test/core/channel/call_finalization_test.cc index 61d92c5f563..aa0a7282c58 100644 --- a/test/core/channel/call_finalization_test.cc +++ b/test/core/channel/call_finalization_test.cc @@ -14,8 +14,16 @@ #include "src/core/lib/channel/call_finalization.h" -#include +#include +#include +#include "absl/strings/str_cat.h" +#include "gtest/gtest.h" + +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "test/core/promise/test_context.h" diff --git a/test/core/channel/channel_args_test.cc b/test/core/channel/channel_args_test.cc index 178a72f3c96..4657c77fa25 100644 --- a/test/core/channel/channel_args_test.cc +++ b/test/core/channel/channel_args_test.cc @@ -20,20 +20,17 @@ #include -#include +#include "gtest/gtest.h" +#include #include -#include -#include +#include #include -#include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/surface/channel.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/channel/channel_stack_builder_test.cc b/test/core/channel/channel_stack_builder_test.cc index fb89c84bfda..90ee4a86d01 100644 --- a/test/core/channel/channel_stack_builder_test.cc +++ b/test/core/channel/channel_stack_builder_test.cc @@ -21,17 +21,20 @@ #include #include -#include +#include +#include "absl/status/status.h" +#include "gtest/gtest.h" + +#include #include -#include #include -#include #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" #include "test/core/util/test_config.h" diff --git a/test/core/channel/channel_stack_test.cc b/test/core/channel/channel_stack_test.cc index fb753c75063..aaa2de792ad 100644 --- a/test/core/channel/channel_stack_test.cc +++ b/test/core/channel/channel_stack_test.cc @@ -18,16 +18,15 @@ #include "src/core/lib/channel/channel_stack.h" -#include +#include -#include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include #include -#include -#include -#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" static grpc_error_handle channel_init_func(grpc_channel_element* elem, diff --git a/test/core/channel/channel_trace_test.cc b/test/core/channel/channel_trace_test.cc index 68121580330..636d5a5ad82 100644 --- a/test/core/channel/channel_trace_test.cc +++ b/test/core/channel/channel_trace_test.cc @@ -19,21 +19,18 @@ #include "src/core/lib/channel/channel_trace.h" #include -#include -#include +#include +#include "gtest/gtest.h" + +#include #include -#include -#include -#include +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz.h" -#include "src/core/lib/channel/channelz_registry.h" -#include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/surface/channel.h" #include "test/core/util/test_config.h" #include "test/cpp/util/channel_trace_proto_helper.h" diff --git a/test/core/channel/channelz_registry_test.cc b/test/core/channel/channelz_registry_test.cc index d393c8bf368..c4e5af9d7bf 100644 --- a/test/core/channel/channelz_registry_test.cc +++ b/test/core/channel/channelz_registry_test.cc @@ -19,22 +19,13 @@ #include "src/core/lib/channel/channelz_registry.h" #include -#include -#include +#include +#include -#include -#include -#include -#include +#include "gtest/gtest.h" -#include "src/core/lib/channel/channel_trace.h" #include "src/core/lib/channel/channelz.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/json/json.h" -#include "src/core/lib/surface/channel.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/channel/channelz_test.cc b/test/core/channel/channelz_test.cc index 592432a73f5..15e0096640a 100644 --- a/test/core/channel/channelz_test.cc +++ b/test/core/channel/channelz_test.cc @@ -19,16 +19,21 @@ #include "src/core/lib/channel/channelz.h" #include -#include -#include +#include +#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "gtest/gtest.h" + +#include #include #include -#include -#include +#include -#include "src/core/lib/channel/channel_trace.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channelz_registry.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" diff --git a/test/core/channel/minimal_stack_is_minimal_test.cc b/test/core/channel/minimal_stack_is_minimal_test.cc index 517a75877e9..efc342de5d7 100644 --- a/test/core/channel/minimal_stack_is_minimal_test.cc +++ b/test/core/channel/minimal_stack_is_minimal_test.cc @@ -29,22 +29,27 @@ * configurations and assess whether such a change is correct and desirable. */ +#include #include -#include "absl/strings/str_cat.h" -#include "absl/strings/str_format.h" +#include +#include +#include + #include "absl/strings/str_join.h" #include -#include -#include +#include +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel_init.h" #include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport_fwd.h" #include "src/core/lib/transport/transport_impl.h" #include "test/core/util/test_config.h" diff --git a/test/core/channel/status_util_test.cc b/test/core/channel/status_util_test.cc index 1d64bf19957..0fffc934fa8 100644 --- a/test/core/channel/status_util_test.cc +++ b/test/core/channel/status_util_test.cc @@ -18,7 +18,7 @@ #include "src/core/lib/channel/status_util.h" -#include +#include "gtest/gtest.h" namespace grpc_core { namespace internal { diff --git a/test/core/client_channel/client_channel_test.cc b/test/core/client_channel/client_channel_test.cc index dea6ed0963f..3508cfa1515 100644 --- a/test/core/client_channel/client_channel_test.cc +++ b/test/core/client_channel/client_channel_test.cc @@ -18,9 +18,11 @@ #include "src/core/ext/filters/client_channel/client_channel.h" -#include -#include +#include "gtest/gtest.h" +#include + +#include "src/core/ext/filters/client_channel/subchannel_pool_interface.h" #include "src/core/lib/channel/channel_args.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/http_proxy_mapper_test.cc b/test/core/client_channel/http_proxy_mapper_test.cc index b756e6d26ae..b7bceabe997 100644 --- a/test/core/client_channel/http_proxy_mapper_test.cc +++ b/test/core/client_channel/http_proxy_mapper_test.cc @@ -16,7 +16,12 @@ // // -#include +#include + +#include "absl/types/optional.h" +#include "gtest/gtest.h" + +#include #include "src/core/ext/filters/client_channel/http_proxy.h" #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/client_channel/resolvers/binder_resolver_test.cc b/test/core/client_channel/resolvers/binder_resolver_test.cc index 0de1544572e..f5f7f98272e 100644 --- a/test/core/client_channel/resolvers/binder_resolver_test.cc +++ b/test/core/client_channel/resolvers/binder_resolver_test.cc @@ -12,24 +12,35 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/lib/resolver/resolver.h" +#include "src/core/lib/resolver/resolver_factory.h" +#include "src/core/lib/resolver/server_address.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" #ifdef GRPC_HAVE_UNIX_SOCKET +#include #include -#include - #include -#include #include -#include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resolver/resolver_registry.h" diff --git a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc index 3c9e7722a19..85f33bf6838 100644 --- a/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_cooldown_test.cc @@ -16,28 +16,49 @@ * */ -#include +#include + #include #include +#include +#include +#include -#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" +#include #include -#include +#include +#include #include +#include +#include #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" -#include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/lib/resolver/resolver.h" +#include "src/core/lib/resolver/resolver_factory.h" #include "src/core/lib/resolver/resolver_registry.h" #include "src/core/lib/resolver/server_address.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" constexpr int kMinResolutionPeriodMs = 1000; diff --git a/test/core/client_channel/resolvers/dns_resolver_test.cc b/test/core/client_channel/resolvers/dns_resolver_test.cc index 61a42044ee1..0f8b786a169 100644 --- a/test/core/client_channel/resolvers/dns_resolver_test.cc +++ b/test/core/client_channel/resolvers/dns_resolver_test.cc @@ -16,21 +16,30 @@ * */ -#include +#include +#include +#include -#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" -#include #include -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/filters/client_channel/resolver/dns/dns_resolver_selection.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/resolver/resolver.h" +#include "src/core/lib/resolver/resolver_factory.h" #include "src/core/lib/resolver/resolver_registry.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/client_channel/resolvers/fake_resolver_test.cc b/test/core/client_channel/resolvers/fake_resolver_test.cc index ef6bf857243..6ad97e2ae12 100644 --- a/test/core/client_channel/resolvers/fake_resolver_test.cc +++ b/test/core/client_channel/resolvers/fake_resolver_test.cc @@ -18,25 +18,36 @@ #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" +#include #include +#include +#include #include +#include +#include -#include - +#include "absl/container/inlined_vector.h" +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "gtest/gtest.h" -#include +#include #include +#include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/work_serializer.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/resolved_address.h" +#include "src/core/lib/resolver/resolver_factory.h" #include "src/core/lib/resolver/resolver_registry.h" #include "src/core/lib/resolver/server_address.h" -#include "src/core/lib/security/credentials/fake/fake_credentials.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" class ResultHandler : public grpc_core::Resolver::ResultHandler { diff --git a/test/core/client_channel/resolvers/google_c2p_resolver_test.cc b/test/core/client_channel/resolvers/google_c2p_resolver_test.cc index 9e96b62e777..2419eac64be 100644 --- a/test/core/client_channel/resolvers/google_c2p_resolver_test.cc +++ b/test/core/client_channel/resolvers/google_c2p_resolver_test.cc @@ -14,31 +14,24 @@ // limitations under the License. // -#include +#include + +#include #include -#include -#include -#include +#include #include - -#include +#include #include "absl/strings/str_format.h" +#include "gtest/gtest.h" #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include +#include +#include #include "src/core/lib/gprpp/env.h" -#include "src/core/lib/gprpp/thd.h" #include "test/core/util/fake_udp_and_tcp_server.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc index 80ffd9584cd..0ae2a19122e 100644 --- a/test/core/client_channel/resolvers/sockaddr_resolver_test.cc +++ b/test/core/client_channel/resolvers/sockaddr_resolver_test.cc @@ -16,20 +16,27 @@ * */ -#include +#include +#include +#include -#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" -#include -#include #include -#include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/gprpp/work_serializer.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/port.h" +#include "src/core/lib/resolver/resolver.h" +#include "src/core/lib/resolver/resolver_factory.h" #include "src/core/lib/resolver/resolver_registry.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/util/test_config.h" static std::shared_ptr* g_work_serializer; diff --git a/test/core/client_channel/retry_throttle_test.cc b/test/core/client_channel/retry_throttle_test.cc index febbf06ff9a..307695d0aaa 100644 --- a/test/core/client_channel/retry_throttle_test.cc +++ b/test/core/client_channel/retry_throttle_test.cc @@ -18,7 +18,7 @@ #include "src/core/ext/filters/client_channel/retry_throttle.h" -#include +#include "gtest/gtest.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/rls_lb_config_parser_test.cc b/test/core/client_channel/rls_lb_config_parser_test.cc index e6df5e74f7f..07ffa68b56a 100644 --- a/test/core/client_channel/rls_lb_config_parser_test.cc +++ b/test/core/client_channel/rls_lb_config_parser_test.cc @@ -14,12 +14,17 @@ // limitations under the License. // -#include -#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include -#include "src/core/lib/gprpp/env.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/service_config/service_config_impl.h" #include "test/core/util/test_config.h" diff --git a/test/core/client_channel/service_config_test.cc b/test/core/client_channel/service_config_test.cc index 03b4c972879..9328fb2c306 100644 --- a/test/core/client_channel/service_config_test.cc +++ b/test/core/client_channel/service_config_test.cc @@ -18,22 +18,36 @@ #include "src/core/lib/service_config/service_config.h" -#include -#include - +#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "absl/types/optional.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include +#include #include "src/core/ext/filters/client_channel/resolver_result_parsing.h" #include "src/core/ext/filters/client_channel/retry_service_config.h" #include "src/core/ext/filters/message_size/message_size_filter.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/status_util.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/string.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/service_config/service_config_impl.h" #include "src/core/lib/service_config/service_config_parser.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/client_idle/idle_filter_state_test.cc b/test/core/client_idle/idle_filter_state_test.cc index ff7f23a5656..31f02542cea 100644 --- a/test/core/client_idle/idle_filter_state_test.cc +++ b/test/core/client_idle/idle_filter_state_test.cc @@ -14,13 +14,13 @@ #include "src/core/ext/filters/channel_idle/idle_filter_state.h" -#include - #include #include #include +#include +#include -#include +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc index 73e39f5cc7a..31a579657ba 100644 --- a/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc +++ b/test/core/compiler_bugs/miscompile_with_no_unique_address_test.cc @@ -14,7 +14,7 @@ #include -#include +#include "gtest/gtest.h" // Make a template argument to test which bit pattern remains in A's destructor // to try and detect similar bugs in non-MSAN builds (none have been detected diff --git a/test/core/compression/args_utils.cc b/test/core/compression/args_utils.cc index ca875c5abaa..de965aeba31 100644 --- a/test/core/compression/args_utils.cc +++ b/test/core/compression/args_utils.cc @@ -16,9 +16,12 @@ #include +#include "absl/types/optional.h" + #include #include +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/gpr/useful.h" diff --git a/test/core/compression/args_utils.h b/test/core/compression/args_utils.h index 8702e604a77..d6b73b13b35 100644 --- a/test/core/compression/args_utils.h +++ b/test/core/compression/args_utils.h @@ -15,7 +15,8 @@ #ifndef GRPC_TEST_CORE_COMPRESSION_ARGS_UTILS_H_H #define GRPC_TEST_CORE_COMPRESSION_ARGS_UTILS_H_H -#include "src/core/lib/channel/channel_args.h" +#include +#include // TODO(ctiller): when we do the channel args migration, just delete this. const grpc_channel_args* diff --git a/test/core/compression/compression_test.cc b/test/core/compression/compression_test.cc index 71f29485675..2dde22874f5 100644 --- a/test/core/compression/compression_test.cc +++ b/test/core/compression/compression_test.cc @@ -16,13 +16,14 @@ * */ +#include #include -#include -#include +#include "gtest/gtest.h" #include #include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/compression/message_compress_fuzzer.cc b/test/core/compression/message_compress_fuzzer.cc index 58f6489d29b..19925ae4457 100644 --- a/test/core/compression/message_compress_fuzzer.cc +++ b/test/core/compression/message_compress_fuzzer.cc @@ -16,14 +16,15 @@ * */ -#include #include #include +#include #include +#include +#include #include "src/core/lib/compression/message_compress.h" -#include "src/core/lib/security/credentials/credentials.h" bool squelch = true; diff --git a/test/core/compression/message_compress_test.cc b/test/core/compression/message_compress_test.cc index faf7204c496..17872496861 100644 --- a/test/core/compression/message_compress_test.cc +++ b/test/core/compression/message_compress_test.cc @@ -18,13 +18,14 @@ #include "src/core/lib/compression/message_compress.h" +#include #include #include -#include +#include "gtest/gtest.h" #include -#include +#include #include #include "src/core/lib/gpr/murmur_hash.h" diff --git a/test/core/compression/message_decompress_fuzzer.cc b/test/core/compression/message_decompress_fuzzer.cc index 916ec0cd925..e95a44e9f91 100644 --- a/test/core/compression/message_decompress_fuzzer.cc +++ b/test/core/compression/message_decompress_fuzzer.cc @@ -16,14 +16,15 @@ * */ -#include #include #include +#include #include +#include +#include #include "src/core/lib/compression/message_compress.h" -#include "src/core/lib/security/credentials/credentials.h" bool squelch = true; diff --git a/test/core/config/core_configuration_test.cc b/test/core/config/core_configuration_test.cc index 3e7542023f9..90383a8bca2 100644 --- a/test/core/config/core_configuration_test.cc +++ b/test/core/config/core_configuration_test.cc @@ -14,8 +14,10 @@ #include "src/core/lib/config/core_configuration.h" +#include #include #include +#include #include diff --git a/test/core/debug/stats_test.cc b/test/core/debug/stats_test.cc index c168f605cc7..89d71d96275 100644 --- a/test/core/debug/stats_test.cc +++ b/test/core/debug/stats_test.cc @@ -18,16 +18,18 @@ #include "src/core/lib/debug/stats.h" -#include +#include +#include +#include #include #include #include +#include +#include -#include +#include "gtest/gtest.h" #include -#include -#include #include "test/core/util/test_config.h" diff --git a/test/core/event_engine/BUILD b/test/core/event_engine/BUILD index 89ad1751743..13459139550 100644 --- a/test/core/event_engine/BUILD +++ b/test/core/event_engine/BUILD @@ -24,9 +24,13 @@ grpc_package( grpc_cc_test( name = "common_closures_test", srcs = ["common_closures_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/functional:any_invocable", + "gtest", + ], deps = [ "//:common_event_engine_closures", + "//:event_engine_base_hdrs", "//:gpr_platform", "//:notification", ], @@ -50,10 +54,7 @@ grpc_cc_test( grpc_cc_test( name = "thread_pool_test", srcs = ["thread_pool_test.cc"], - external_deps = [ - "absl/synchronization", - "gtest", - ], + external_deps = ["gtest"], deps = [ "//:event_engine_thread_pool", "//:gpr", @@ -64,20 +65,29 @@ grpc_cc_test( grpc_cc_test( name = "endpoint_config_test", srcs = ["endpoint_config_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/types:optional", + "gtest", + ], language = "C++", uses_polling = False, deps = [ "//:gpr_platform", "//:grpc", - "//test/core/util:grpc_test_util_unsecure", ], ) grpc_cc_test( name = "default_engine_methods_test", srcs = ["default_engine_methods_test.cc"], - external_deps = ["gtest"], + external_deps = [ + "absl/functional:any_invocable", + "absl/memory", + "absl/status", + "absl/status:statusor", + "absl/time", + "gtest", + ], deps = [ "//:default_event_engine", "//:event_engine_base_hdrs", @@ -104,11 +114,10 @@ grpc_cc_test( srcs = ["slice_buffer_test.cc"], external_deps = ["gtest"], deps = [ - "//:event_engine_base_hdrs", + "//:event_engine_common", + "//:gpr", "//:gpr_platform", - "//:grpc", "//:slice", - "//test/core/util:grpc_test_util_unsecure", ], ) @@ -116,9 +125,9 @@ grpc_cc_library( name = "test_init", srcs = ["test_init.cc"], hdrs = ["test_init.h"], - external_deps = ["absl/strings"], - deps = [ - "//:event_engine_base_hdrs", - "//:gpr", + external_deps = [ + "absl/status", + "absl/strings", ], + deps = ["//:gpr"], ) diff --git a/test/core/event_engine/common_closures_test.cc b/test/core/event_engine/common_closures_test.cc index 8ec76bb772b..cf2663d73c7 100644 --- a/test/core/event_engine/common_closures_test.cc +++ b/test/core/event_engine/common_closures_test.cc @@ -16,7 +16,10 @@ #include "src/core/lib/event_engine/common_closures.h" -#include +#include "absl/functional/any_invocable.h" +#include "gtest/gtest.h" + +#include #include "src/core/lib/gprpp/notification.h" diff --git a/test/core/event_engine/default_engine_methods_test.cc b/test/core/event_engine/default_engine_methods_test.cc index b77e4956796..bcd12236201 100644 --- a/test/core/event_engine/default_engine_methods_test.cc +++ b/test/core/event_engine/default_engine_methods_test.cc @@ -13,16 +13,25 @@ // limitations under the License. #include +#include +#include #include +#include -#include -#include +#include "absl/functional/any_invocable.h" +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" +#include "gtest/gtest.h" +#include #include +#include #include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/sync.h" #include "test/core/util/test_config.h" namespace { diff --git a/test/core/event_engine/endpoint_config_test.cc b/test/core/event_engine/endpoint_config_test.cc index c80aba84531..10b639235b3 100644 --- a/test/core/event_engine/endpoint_config_test.cc +++ b/test/core/event_engine/endpoint_config_test.cc @@ -13,15 +13,11 @@ // limitations under the License. #include -#include -#include - -#include -#include +#include "absl/types/optional.h" +#include "gtest/gtest.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" -#include "test/core/util/test_config.h" using ::grpc_event_engine::experimental::ChannelArgsEndpointConfig; diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc index 41dabe544ea..7a48e61572f 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.cc @@ -14,11 +14,16 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" -#include +#include +#include #include +#include +#include #include +#include +#include #include "src/core/lib/gprpp/time.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" diff --git a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h index a18bc613e62..6b910b976ad 100644 --- a/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h +++ b/test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h @@ -18,10 +18,17 @@ #include #include #include +#include +#include +#include "absl/base/thread_annotations.h" #include "absl/functional/any_invocable.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include #include +#include #include #include "src/core/lib/gprpp/sync.h" diff --git a/test/core/event_engine/posix/event_poller_posix_test.cc b/test/core/event_engine/posix/event_poller_posix_test.cc index 3718eedaa36..5d71f342dc8 100644 --- a/test/core/event_engine/posix/event_poller_posix_test.cc +++ b/test/core/event_engine/posix/event_poller_posix_test.cc @@ -12,41 +12,52 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + +#include +#include +#include #include -#include +#include +#include +#include +#include #include "absl/functional/any_invocable.h" +#include "absl/memory/memory.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" + +#include #include "src/core/lib/event_engine/poller.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/port.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_EV -#include #include #include #include #include -#include #include -#include #include -#include #include -#include #include #include "absl/status/status.h" -#include #include #include #include -#include #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/test/core/event_engine/posix/lock_free_event_test.cc b/test/core/event_engine/posix/lock_free_event_test.cc index 4a31ff2f3f0..9c042374b82 100644 --- a/test/core/event_engine/posix/lock_free_event_test.cc +++ b/test/core/event_engine/posix/lock_free_event_test.cc @@ -12,13 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - +#include +#include #include +#include +#include + +#include "absl/functional/any_invocable.h" +#include "absl/status/status.h" +#include "absl/time/time.h" +#include "gtest/gtest.h" -#include -#include +#include #include "src/core/lib/event_engine/default_event_engine.h" #include "src/core/lib/event_engine/posix_engine/event_poller.h" diff --git a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc index daafacc68e9..b2e259e1a4c 100644 --- a/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc +++ b/test/core/event_engine/posix/tcp_posix_socket_utils_test.cc @@ -12,9 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include +#include + +#include #include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" + +#include +#include #include "src/core/lib/iomgr/port.h" @@ -29,12 +40,10 @@ #include #endif -#include #include #include #include -#include #include "src/core/lib/event_engine/posix_engine/tcp_socket_utils.h" #include "src/core/lib/gpr/useful.h" diff --git a/test/core/event_engine/posix/timer_heap_test.cc b/test/core/event_engine/posix/timer_heap_test.cc index d79ea49e2c8..1b0e90e47a3 100644 --- a/test/core/event_engine/posix/timer_heap_test.cc +++ b/test/core/event_engine/posix/timer_heap_test.cc @@ -18,14 +18,19 @@ #include "src/core/lib/event_engine/posix_engine/timer_heap.h" +#include #include -#include -#include -#include +#include +#include +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include #include "src/core/lib/event_engine/posix_engine/timer.h" -#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/bitset.h" using testing::Contains; diff --git a/test/core/event_engine/posix/timer_list_test.cc b/test/core/event_engine/posix/timer_list_test.cc index 0c2cb6e6818..c216e9ef886 100644 --- a/test/core/event_engine/posix/timer_list_test.cc +++ b/test/core/event_engine/posix/timer_list_test.cc @@ -16,14 +16,15 @@ * */ -#include - #include #include +#include -#include -#include +#include "absl/types/optional.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include #include #include "src/core/lib/event_engine/posix_engine/timer.h" diff --git a/test/core/event_engine/posix/timer_manager_test.cc b/test/core/event_engine/posix/timer_manager_test.cc index 77c744283ff..ca9e367e735 100644 --- a/test/core/event_engine/posix/timer_manager_test.cc +++ b/test/core/event_engine/posix/timer_manager_test.cc @@ -14,16 +14,17 @@ #include "src/core/lib/event_engine/posix_engine/timer_manager.h" -#include - +#include #include -#include -#include #include -#include +#include "absl/functional/any_invocable.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" +#include "gtest/gtest.h" #include +#include #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/posix_engine/timer.h" diff --git a/test/core/event_engine/posix/traced_buffer_list_test.cc b/test/core/event_engine/posix/traced_buffer_list_test.cc index 26be24095e8..95db104d4f5 100644 --- a/test/core/event_engine/posix/traced_buffer_list_test.cc +++ b/test/core/event_engine/posix/traced_buffer_list_test.cc @@ -14,9 +14,9 @@ #include "src/core/lib/event_engine/posix_engine/traced_buffer_list.h" -#include +#include -#include +#include "gtest/gtest.h" #include @@ -25,6 +25,8 @@ #ifdef GRPC_LINUX_ERRQUEUE +#include + #define NUM_ELEM 5 namespace grpc_event_engine { diff --git a/test/core/event_engine/posix/wakeup_fd_posix_test.cc b/test/core/event_engine/posix/wakeup_fd_posix_test.cc index 38113aa1e5a..112a3fecfd8 100644 --- a/test/core/event_engine/posix/wakeup_fd_posix_test.cc +++ b/test/core/event_engine/posix/wakeup_fd_posix_test.cc @@ -14,13 +14,10 @@ #include "src/core/lib/event_engine/posix_engine/wakeup_fd_posix.h" -#include -#include +#include -#include - -#include -#include +#include "absl/status/statusor.h" +#include "gtest/gtest.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_eventfd.h" #include "src/core/lib/event_engine/posix_engine/wakeup_fd_pipe.h" diff --git a/test/core/event_engine/slice_buffer_test.cc b/test/core/event_engine/slice_buffer_test.cc index b18fd985dda..5330795581f 100644 --- a/test/core/event_engine/slice_buffer_test.cc +++ b/test/core/event_engine/slice_buffer_test.cc @@ -14,14 +14,17 @@ #include -#include -#include +#include -#include -#include +#include + +#include "gtest/gtest.h" -#include "src/core/lib/slice/slice.h" -#include "test/core/util/test_config.h" +#include +#include +#include +#include +#include using ::grpc_event_engine::experimental::Slice; using ::grpc_event_engine::experimental::SliceBuffer; diff --git a/test/core/event_engine/smoke_test.cc b/test/core/event_engine/smoke_test.cc index 3c5d0ce79b4..731f960c4e2 100644 --- a/test/core/event_engine/smoke_test.cc +++ b/test/core/event_engine/smoke_test.cc @@ -13,8 +13,10 @@ // limitations under the License. #include -#include -#include +#include + +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include #include diff --git a/test/core/event_engine/test_init.cc b/test/core/event_engine/test_init.cc index 95cea74c928..341cb4ae3f8 100644 --- a/test/core/event_engine/test_init.cc +++ b/test/core/event_engine/test_init.cc @@ -17,8 +17,6 @@ #include "absl/strings/str_cat.h" -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_init.h b/test/core/event_engine/test_init.h index 4bee10574fa..56bce40f9f2 100644 --- a/test/core/event_engine/test_init.h +++ b/test/core/event_engine/test_init.h @@ -13,11 +13,12 @@ // limitations under the License. #include +#include "absl/status/status.h" +#include "absl/strings/string_view.h" + #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_INIT_H -#include - namespace grpc_event_engine { namespace experimental { diff --git a/test/core/event_engine/test_suite/client_test.cc b/test/core/event_engine/test_suite/client_test.cc index dc9f8a7a842..5269562512e 100644 --- a/test/core/event_engine/test_suite/client_test.cc +++ b/test/core/event_engine/test_suite/client_test.cc @@ -12,14 +12,23 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include +#include #include #include #include +#include +#include #include +#include "absl/memory/memory.h" #include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include "gtest/gtest.h" #include @@ -30,6 +39,7 @@ #include "src/core/lib/gprpp/notification.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "test/core/event_engine/test_suite/event_engine_test.h" #include "test/core/event_engine/test_suite/event_engine_test_utils.h" #include "test/core/util/port.h" diff --git a/test/core/event_engine/test_suite/dns_test.cc b/test/core/event_engine/test_suite/dns_test.cc index 81054e1d5c3..a9bed9adf17 100644 --- a/test/core/event_engine/test_suite/dns_test.cc +++ b/test/core/event_engine/test_suite/dns_test.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/event_engine/test_suite/event_engine_test.h" diff --git a/test/core/event_engine/test_suite/event_engine_test.h b/test/core/event_engine/test_suite/event_engine_test.h index 27197486704..1e74792e852 100644 --- a/test/core/event_engine/test_suite/event_engine_test.h +++ b/test/core/event_engine/test_suite/event_engine_test.h @@ -14,11 +14,13 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_H #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_EVENT_ENGINE_TEST_H +#include +#include + #include #include - -#include "src/core/lib/gprpp/sync.h" +#include extern std::function< std::unique_ptr()>* diff --git a/test/core/event_engine/test_suite/event_engine_test_utils.cc b/test/core/event_engine/test_suite/event_engine_test_utils.cc index 7f68036dd8a..f403a05913c 100644 --- a/test/core/event_engine/test_suite/event_engine_test_utils.cc +++ b/test/core/event_engine/test_suite/event_engine_test_utils.cc @@ -14,30 +14,31 @@ #include "test/core/event_engine/test_suite/event_engine_test_utils.h" -#include #include #include #include +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" -#include "absl/synchronization/mutex.h" -#include #include #include +#include #include #include -#include #include #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/notification.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/uri/uri_parser.h" +// IWYU pragma: no_include + using Endpoint = ::grpc_event_engine::experimental::EventEngine::Endpoint; using Listener = ::grpc_event_engine::experimental::EventEngine::Listener; diff --git a/test/core/event_engine/test_suite/event_engine_test_utils.h b/test/core/event_engine/test_suite/event_engine_test_utils.h index ab68aae3f88..6cc9096059a 100644 --- a/test/core/event_engine/test_suite/event_engine_test_utils.h +++ b/test/core/event_engine/test_suite/event_engine_test_utils.h @@ -19,15 +19,18 @@ #include #include #include +#include #include +#include #include "absl/status/status.h" #include "absl/status/statusor.h" #include -#include +#include #include "src/core/lib/gprpp/notification.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/resource_quota/memory_quota.h" using EventEngineFactory = std::function< diff --git a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc index e428912743b..075f113afcf 100644 --- a/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc +++ b/test/core/event_engine/test_suite/fuzzing_event_engine_test.cc @@ -14,12 +14,15 @@ #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" +#include #include #include -#include "absl/time/clock.h" +#include -#include +#include "absl/memory/memory.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/event_engine/test_suite/event_engine_test.h" diff --git a/test/core/event_engine/test_suite/oracle_event_engine_posix.cc b/test/core/event_engine/test_suite/oracle_event_engine_posix.cc index 4459c201e81..df9a55a7ce5 100644 --- a/test/core/event_engine/test_suite/oracle_event_engine_posix.cc +++ b/test/core/event_engine/test_suite/oracle_event_engine_posix.cc @@ -15,17 +15,18 @@ #include "test/core/event_engine/test_suite/oracle_event_engine_posix.h" #include -#include +#include #include +#include #include #include #include #include +#include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" -#include "absl/synchronization/mutex.h" #include "absl/time/clock.h" #include "absl/time/time.h" diff --git a/test/core/event_engine/test_suite/oracle_event_engine_posix.h b/test/core/event_engine/test_suite/oracle_event_engine_posix.h index 35c8bab225b..bfad0b3cbc9 100644 --- a/test/core/event_engine/test_suite/oracle_event_engine_posix.h +++ b/test/core/event_engine/test_suite/oracle_event_engine_posix.h @@ -15,19 +15,24 @@ #ifndef GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_ORACLE_EVENT_ENGINE_POSIX_H_ #define GRPC_TEST_CORE_EVENT_ENGINE_TEST_SUITE_ORACLE_EVENT_ENGINE_POSIX_H_ -#include #include #include -#include #include +#include +#include "absl/base/thread_annotations.h" +#include "absl/functional/any_invocable.h" #include "absl/status/status.h" #include "absl/status/statusor.h" +#include #include +#include #include #include +#include "src/core/lib/gprpp/notification.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" #include "test/core/event_engine/test_suite/event_engine_test_utils.h" diff --git a/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc b/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc index c4e2d53ffc9..e0544e72c1b 100644 --- a/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc +++ b/test/core/event_engine/test_suite/oracle_event_engine_posix_test.cc @@ -13,6 +13,10 @@ // limitations under the License. #include "test/core/event_engine/test_suite/oracle_event_engine_posix.h" +#include + +#include "absl/memory/memory.h" + #include "test/core/event_engine/test_suite/event_engine_test.h" #include "test/core/util/test_config.h" diff --git a/test/core/event_engine/test_suite/posix_event_engine_test.cc b/test/core/event_engine/test_suite/posix_event_engine_test.cc index a023717338b..89e7959caed 100644 --- a/test/core/event_engine/test_suite/posix_event_engine_test.cc +++ b/test/core/event_engine/test_suite/posix_event_engine_test.cc @@ -11,7 +11,13 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include +#include + +#include + +#include "absl/memory/memory.h" + +#include #include "src/core/lib/event_engine/posix_engine/posix_engine.h" #include "test/core/event_engine/test_suite/event_engine_test.h" diff --git a/test/core/event_engine/test_suite/server_test.cc b/test/core/event_engine/test_suite/server_test.cc index 74944539d4d..7f58ffbdc3c 100644 --- a/test/core/event_engine/test_suite/server_test.cc +++ b/test/core/event_engine/test_suite/server_test.cc @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/event_engine/test_suite/event_engine_test.h" diff --git a/test/core/event_engine/test_suite/timer_test.cc b/test/core/event_engine/test_suite/timer_test.cc index 02e0d110e98..535d50cb0ad 100644 --- a/test/core/event_engine/test_suite/timer_test.cc +++ b/test/core/event_engine/test_suite/timer_test.cc @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include +#include +#include #include #include +#include -#include -#include - +#include "absl/base/thread_annotations.h" #include "absl/functional/bind_front.h" +#include "absl/time/clock.h" #include "absl/time/time.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include #include diff --git a/test/core/event_engine/test_suite/windows_event_engine_test.cc b/test/core/event_engine/test_suite/windows_event_engine_test.cc index fc6d931fdcf..2af3a3e8e27 100644 --- a/test/core/event_engine/test_suite/windows_event_engine_test.cc +++ b/test/core/event_engine/test_suite/windows_event_engine_test.cc @@ -11,11 +11,6 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include - -#include "src/core/lib/event_engine/windows/windows_engine.h" -#include "test/core/event_engine/test_suite/event_engine_test.h" -#include "test/core/util/test_config.h" #ifdef GPR_WINDOWS diff --git a/test/core/event_engine/thread_pool_test.cc b/test/core/event_engine/thread_pool_test.cc index 08b490480c3..cec0c94bd6e 100644 --- a/test/core/event_engine/thread_pool_test.cc +++ b/test/core/event_engine/thread_pool_test.cc @@ -14,13 +14,11 @@ #include "src/core/lib/event_engine/thread_pool.h" -#include +#include + #include #include -#include - -#include "absl/synchronization/notification.h" #include "gtest/gtest.h" #include diff --git a/test/core/event_engine/work_queue/work_queue_fuzzer.cc b/test/core/event_engine/work_queue/work_queue_fuzzer.cc index 56f9ec82f56..31cbf2117de 100644 --- a/test/core/event_engine/work_queue/work_queue_fuzzer.cc +++ b/test/core/event_engine/work_queue/work_queue_fuzzer.cc @@ -13,9 +13,15 @@ // limitations under the License. #include +#include + #include +#include + +#include "absl/functional/any_invocable.h" +#include "absl/types/optional.h" -#include "absl/container/flat_hash_map.h" +#include #include "src/core/lib/event_engine/common_closures.h" #include "src/core/lib/event_engine/work_queue.h" diff --git a/test/core/event_engine/work_queue/work_queue_test.cc b/test/core/event_engine/work_queue/work_queue_test.cc index 2eb1463b1ad..777554e7ea3 100644 --- a/test/core/event_engine/work_queue/work_queue_test.cc +++ b/test/core/event_engine/work_queue/work_queue_test.cc @@ -16,10 +16,17 @@ #include "src/core/lib/event_engine/work_queue.h" #include +#include -#include +#include "absl/functional/any_invocable.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" +#include "gtest/gtest.h" + +#include #include "src/core/lib/event_engine/common_closures.h" +#include "src/core/lib/gprpp/time.h" #include "test/core/util/test_config.h" namespace { diff --git a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc index f4c94c2da63..1b1a0b335f4 100644 --- a/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc +++ b/test/core/ext/filters/rbac/rbac_service_config_parser_test.cc @@ -14,10 +14,17 @@ #include "src/core/ext/filters/rbac/rbac_service_config_parser.h" -#include -#include -#include +#include +#include "absl/status/status.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/service_config/service_config.h" #include "src/core/lib/service_config/service_config_impl.h" #include "test/core/util/test_config.h" diff --git a/test/core/filters/client_auth_filter_test.cc b/test/core/filters/client_auth_filter_test.cc index 1d3929a07cd..8424fed487f 100644 --- a/test/core/filters/client_auth_filter_test.cc +++ b/test/core/filters/client_auth_filter_test.cc @@ -12,15 +12,45 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include -#include - +#include + +#include +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "gtest/gtest.h" + +#include +#include +#include +#include +#include + +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/context.h" +#include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/poll.h" #include "src/core/lib/promise/promise.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/lib/security/security_connector/fake/fake_security_connector.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/transport/auth_filters.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" #include "test/core/promise/test_context.h" // TODO(roth): Need to add a lot more tests here. I created this file diff --git a/test/core/filters/client_authority_filter_test.cc b/test/core/filters/client_authority_filter_test.cc index 4d85e4de94f..3c20e716791 100644 --- a/test/core/filters/client_authority_filter_test.cc +++ b/test/core/filters/client_authority_filter_test.cc @@ -14,9 +14,22 @@ #include "src/core/ext/filters/http/client_authority_filter.h" -#include +#include +#include "absl/status/status.h" +#include "absl/strings/string_view.h" +#include "absl/types/variant.h" +#include "gtest/gtest.h" + +#include +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/promise/poll.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/lib/transport/metadata_batch.h" #include "test/core/promise/test_context.h" namespace grpc_core { diff --git a/test/core/filters/filter_fuzzer.cc b/test/core/filters/filter_fuzzer.cc index 4a97ebed930..692dff214e2 100644 --- a/test/core/filters/filter_fuzzer.cc +++ b/test/core/filters/filter_fuzzer.cc @@ -12,24 +12,81 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include + +#include +#include +#include #include +#include +#include +#include +#include +#include "absl/base/thread_annotations.h" #include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" +#include "absl/types/variant.h" + +#include +#include +#include +#include +#include +#include #include "src/core/ext/filters/channel_idle/channel_idle_filter.h" #include "src/core/ext/filters/http/client/http_client_filter.h" #include "src/core/ext/filters/http/client_authority_filter.h" #include "src/core/ext/filters/http/server/http_server_filter.h" +#include "src/core/lib/channel/call_finalization.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" +#include "src/core/lib/channel/context.h" +#include "src/core/lib/channel/promise_based_filter.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/env.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/gprpp/sync.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/timer_manager.h" +#include "src/core/lib/promise/activity.h" +#include "src/core/lib/promise/arena_promise.h" +#include "src/core/lib/promise/context.h" +#include "src/core/lib/promise/latch.h" +#include "src/core/lib/promise/poll.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" +#include "src/core/lib/security/authorization/authorization_engine.h" +#include "src/core/lib/security/authorization/authorization_policy_provider.h" +#include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/grpc_server_authz_filter.h" +#include "src/core/lib/security/context/security_context.h" +#include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/security/transport/auth_filters.h" +#include "src/core/lib/slice/slice.h" +#include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/handshaker.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_fwd.h" #include "src/core/lib/transport/transport_impl.h" +#include "src/core/tsi/transport_security_interface.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/filters/filter_fuzzer.pb.h" diff --git a/test/core/fling/client.cc b/test/core/fling/client.cc index 97241049f1c..36e0e5f71c3 100644 --- a/test/core/fling/client.cc +++ b/test/core/fling/client.cc @@ -19,8 +19,12 @@ #include #include +#include #include #include +#include +#include +#include #include #include diff --git a/test/core/fling/fling_test.cc b/test/core/fling/fling_test.cc index 659169415a4..a96757e1cdc 100644 --- a/test/core/fling/fling_test.cc +++ b/test/core/fling/fling_test.cc @@ -23,7 +23,6 @@ #include "absl/strings/str_cat.h" -#include #include #include "src/core/lib/gprpp/host_port.h" diff --git a/test/core/fling/server.cc b/test/core/fling/server.cc index 3092afc4522..794d9b2baac 100644 --- a/test/core/fling/server.cc +++ b/test/core/fling/server.cc @@ -17,19 +17,23 @@ */ #include -#include +#include #include -#include #include +#include #include #include +#include +#include +#include #ifndef _WIN32 /* This is for _exit() below, which is temporary. */ #include #endif -#include +#include + #include #include diff --git a/test/core/gpr/alloc_test.cc b/test/core/gpr/alloc_test.cc index d085f5e9060..d36ed9fb033 100644 --- a/test/core/gpr/alloc_test.cc +++ b/test/core/gpr/alloc_test.cc @@ -16,12 +16,12 @@ * */ +#include #include -#include +#include "gtest/gtest.h" #include -#include #include "test/core/util/test_config.h" diff --git a/test/core/gpr/cpu_test.cc b/test/core/gpr/cpu_test.cc index f4e2f9d1b1a..bd3d45b49d7 100644 --- a/test/core/gpr/cpu_test.cc +++ b/test/core/gpr/cpu_test.cc @@ -21,14 +21,15 @@ gpr_cpu_current_cpu() */ +#include #include #include -#include +#include "gtest/gtest.h" +#include #include #include -#include #include #include diff --git a/test/core/gpr/env_test.cc b/test/core/gpr/env_test.cc index fe67d92e239..e8ad3c48a65 100644 --- a/test/core/gpr/env_test.cc +++ b/test/core/gpr/env_test.cc @@ -18,15 +18,10 @@ #include "src/core/lib/gprpp/env.h" -#include -#include +#include "gtest/gtest.h" -#include - -#include #include -#include "src/core/lib/gpr/string.h" #include "test/core/util/test_config.h" #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/gpr/log_test.cc b/test/core/gpr/log_test.cc index c8b402f64d2..2033ef67afe 100644 --- a/test/core/gpr/log_test.cc +++ b/test/core/gpr/log_test.cc @@ -16,14 +16,12 @@ * */ -#include #include #include #include -#include "src/core/lib/gprpp/global_config.h" #include "test/core/util/test_config.h" static bool log_func_reached = false; diff --git a/test/core/gpr/murmur_hash_test.cc b/test/core/gpr/murmur_hash_test.cc index a2168a6f047..305ebfd691f 100644 --- a/test/core/gpr/murmur_hash_test.cc +++ b/test/core/gpr/murmur_hash_test.cc @@ -18,12 +18,12 @@ #include "src/core/lib/gpr/murmur_hash.h" +#include #include #include #include -#include #include "test/core/util/test_config.h" diff --git a/test/core/gpr/spinlock_test.cc b/test/core/gpr/spinlock_test.cc index cd5ab96a2ac..3d73bc3498e 100644 --- a/test/core/gpr/spinlock_test.cc +++ b/test/core/gpr/spinlock_test.cc @@ -20,14 +20,13 @@ #include "src/core/lib/gpr/spinlock.h" +#include #include -#include -#include +#include "gtest/gtest.h" +#include #include -#include -#include #include #include "src/core/lib/gprpp/thd.h" diff --git a/test/core/gpr/string_test.cc b/test/core/gpr/string_test.cc index 524ddd16d5d..3432e986b86 100644 --- a/test/core/gpr/string_test.cc +++ b/test/core/gpr/string_test.cc @@ -20,13 +20,11 @@ #include #include -#include #include -#include +#include "gtest/gtest.h" #include -#include #include #include "test/core/util/test_config.h" diff --git a/test/core/gpr/sync_test.cc b/test/core/gpr/sync_test.cc index 0e5add88507..2c193703edc 100644 --- a/test/core/gpr/sync_test.cc +++ b/test/core/gpr/sync_test.cc @@ -18,13 +18,13 @@ /* Test of gpr synchronization support. */ +#include #include -#include -#include +#include "gtest/gtest.h" +#include #include -#include #include #include diff --git a/test/core/gpr/time_test.cc b/test/core/gpr/time_test.cc index bb34008bc5d..18f9f18c201 100644 --- a/test/core/gpr/time_test.cc +++ b/test/core/gpr/time_test.cc @@ -19,15 +19,12 @@ /* Test of gpr time support. */ #include -#include #include -#include #include -#include +#include "gtest/gtest.h" -#include -#include +#include #include #include "test/core/util/test_config.h" diff --git a/test/core/gpr/useful_test.cc b/test/core/gpr/useful_test.cc index 40ceca55d2e..c0cc989e49c 100644 --- a/test/core/gpr/useful_test.cc +++ b/test/core/gpr/useful_test.cc @@ -20,7 +20,11 @@ #include "src/core/lib/gpr/useful.h" -#include +#include + +#include + +#include "gtest/gtest.h" namespace grpc_core { diff --git a/test/core/gprpp/bitset_test.cc b/test/core/gprpp/bitset_test.cc index 3e463ed2d42..58a23f628c1 100644 --- a/test/core/gprpp/bitset_test.cc +++ b/test/core/gprpp/bitset_test.cc @@ -15,8 +15,9 @@ #include "src/core/lib/gprpp/bitset.h" #include +#include -#include +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/chunked_vector_fuzzer.cc b/test/core/gprpp/chunked_vector_fuzzer.cc index ab34c765328..c3961132cfc 100644 --- a/test/core/gprpp/chunked_vector_fuzzer.cc +++ b/test/core/gprpp/chunked_vector_fuzzer.cc @@ -12,9 +12,21 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include + +#include +#include +#include +#include #include +#include +#include + #include "src/core/lib/gprpp/chunked_vector.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/resource_quota/arena.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/gprpp/chunked_vector_fuzzer.pb.h" diff --git a/test/core/gprpp/chunked_vector_test.cc b/test/core/gprpp/chunked_vector_test.cc index a7410b5d5f9..ec872c7ec7a 100644 --- a/test/core/gprpp/chunked_vector_test.cc +++ b/test/core/gprpp/chunked_vector_test.cc @@ -14,8 +14,15 @@ #include "src/core/lib/gprpp/chunked_vector.h" -#include +#include +#include +#include "gtest/gtest.h" + +#include + +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/resource_quota/memory_quota.h" #include "src/core/lib/resource_quota/resource_quota.h" namespace grpc_core { diff --git a/test/core/gprpp/dual_ref_counted_test.cc b/test/core/gprpp/dual_ref_counted_test.cc index 329af39a839..917fac0d290 100644 --- a/test/core/gprpp/dual_ref_counted_test.cc +++ b/test/core/gprpp/dual_ref_counted_test.cc @@ -16,10 +16,7 @@ #include "src/core/lib/gprpp/dual_ref_counted.h" -#include - -#include -#include +#include "gtest/gtest.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/examine_stack_test.cc b/test/core/gprpp/examine_stack_test.cc index 2bffa08cc6e..b274fbc8cac 100644 --- a/test/core/gprpp/examine_stack_test.cc +++ b/test/core/gprpp/examine_stack_test.cc @@ -18,13 +18,9 @@ #include "src/core/lib/gprpp/examine_stack.h" -#include -#include - -#include - #include "absl/debugging/stacktrace.h" #include "absl/debugging/symbolize.h" +#include "gtest/gtest.h" #include diff --git a/test/core/gprpp/fork_test.cc b/test/core/gprpp/fork_test.cc index 55ff609877d..413b4af57d5 100644 --- a/test/core/gprpp/fork_test.cc +++ b/test/core/gprpp/fork_test.cc @@ -18,7 +18,12 @@ #include "src/core/lib/gprpp/fork.h" -#include +#include + +#include "gtest/gtest.h" + +#include +#include #include "src/core/lib/gprpp/thd.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/global_config_env_test.cc b/test/core/gprpp/global_config_env_test.cc index 722651ba91a..4510bece705 100644 --- a/test/core/gprpp/global_config_env_test.cc +++ b/test/core/gprpp/global_config_env_test.cc @@ -18,13 +18,9 @@ #include "src/core/lib/gprpp/global_config_env.h" -#include #include -#include - -#include -#include +#include "gtest/gtest.h" #include "src/core/lib/gprpp/env.h" #include "src/core/lib/gprpp/memory.h" diff --git a/test/core/gprpp/global_config_test.cc b/test/core/gprpp/global_config_test.cc index 419a629635f..47950b47d5e 100644 --- a/test/core/gprpp/global_config_test.cc +++ b/test/core/gprpp/global_config_test.cc @@ -18,15 +18,10 @@ #include "src/core/lib/gprpp/global_config.h" -#include #include -#include +#include "gtest/gtest.h" -#include -#include - -#include "src/core/lib/gprpp/env.h" #include "src/core/lib/gprpp/memory.h" GPR_GLOBAL_CONFIG_DECLARE_BOOL(bool_var); diff --git a/test/core/gprpp/host_port_test.cc b/test/core/gprpp/host_port_test.cc index 0f1853f8619..681eb6d407a 100644 --- a/test/core/gprpp/host_port_test.cc +++ b/test/core/gprpp/host_port_test.cc @@ -18,12 +18,7 @@ #include "src/core/lib/gprpp/host_port.h" -#include - -#include - -#include -#include +#include "gtest/gtest.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/match_test.cc b/test/core/gprpp/match_test.cc index f0ea8a0c233..c88b29fa7b0 100644 --- a/test/core/gprpp/match_test.cc +++ b/test/core/gprpp/match_test.cc @@ -14,7 +14,11 @@ #include "src/core/lib/gprpp/match.h" -#include +#include + +#include + +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/mpscq_test.cc b/test/core/gprpp/mpscq_test.cc index 161181f2e74..8d8d1e51306 100644 --- a/test/core/gprpp/mpscq_test.cc +++ b/test/core/gprpp/mpscq_test.cc @@ -21,11 +21,12 @@ #include #include -#include +#include "gtest/gtest.h" -#include +#include #include #include +#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/thd.h" diff --git a/test/core/gprpp/no_destruct_test.cc b/test/core/gprpp/no_destruct_test.cc index 1cda14a44f3..d0f9d19a4c9 100644 --- a/test/core/gprpp/no_destruct_test.cc +++ b/test/core/gprpp/no_destruct_test.cc @@ -18,7 +18,7 @@ #include -#include +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/notification_test.cc b/test/core/gprpp/notification_test.cc index bae987c52c9..d7bbddef7fd 100644 --- a/test/core/gprpp/notification_test.cc +++ b/test/core/gprpp/notification_test.cc @@ -14,12 +14,9 @@ #include "src/core/lib/gprpp/notification.h" -#include - -#include #include -#include +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/orphanable_test.cc b/test/core/gprpp/orphanable_test.cc index 853a0f0227c..d736d5a825b 100644 --- a/test/core/gprpp/orphanable_test.cc +++ b/test/core/gprpp/orphanable_test.cc @@ -18,9 +18,8 @@ #include "src/core/lib/gprpp/orphanable.h" -#include +#include "gtest/gtest.h" -#include "src/core/lib/gprpp/memory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/overload_test.cc b/test/core/gprpp/overload_test.cc index 2bbc3318cea..e7443a5be2c 100644 --- a/test/core/gprpp/overload_test.cc +++ b/test/core/gprpp/overload_test.cc @@ -14,7 +14,9 @@ #include "src/core/lib/gprpp/overload.h" -#include +#include + +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/ref_counted_ptr_test.cc b/test/core/gprpp/ref_counted_ptr_test.cc index daf4a237740..ed51851eace 100644 --- a/test/core/gprpp/ref_counted_ptr_test.cc +++ b/test/core/gprpp/ref_counted_ptr_test.cc @@ -18,12 +18,11 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" -#include +#include "gtest/gtest.h" #include #include "src/core/lib/gprpp/dual_ref_counted.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/ref_counted.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/ref_counted_test.cc b/test/core/gprpp/ref_counted_test.cc index cf2ad497e51..65df584def4 100644 --- a/test/core/gprpp/ref_counted_test.cc +++ b/test/core/gprpp/ref_counted_test.cc @@ -18,12 +18,14 @@ #include "src/core/lib/gprpp/ref_counted.h" +#include +#include #include +#include -#include -#include +#include "gmock/gmock.h" +#include "gtest/gtest.h" -#include "src/core/lib/gprpp/memory.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/single_set_ptr_test.cc b/test/core/gprpp/single_set_ptr_test.cc index 88f3a092b46..7844ed221bf 100644 --- a/test/core/gprpp/single_set_ptr_test.cc +++ b/test/core/gprpp/single_set_ptr_test.cc @@ -15,8 +15,9 @@ #include "src/core/lib/gprpp/single_set_ptr.h" #include +#include -#include +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/sorted_pack_test.cc b/test/core/gprpp/sorted_pack_test.cc index 4d8467e3fbc..ad4e911c813 100644 --- a/test/core/gprpp/sorted_pack_test.cc +++ b/test/core/gprpp/sorted_pack_test.cc @@ -14,10 +14,9 @@ #include "src/core/lib/gprpp/sorted_pack.h" -#include #include -#include +#include "gtest/gtest.h" using grpc_core::WithSortedPack; @@ -28,6 +27,7 @@ struct Int { template struct Cmp; + template struct Cmp, Int> { static constexpr bool kValue = A < B; diff --git a/test/core/gprpp/stat_test.cc b/test/core/gprpp/stat_test.cc index 6858e71393e..c39a25ba89e 100644 --- a/test/core/gprpp/stat_test.cc +++ b/test/core/gprpp/stat_test.cc @@ -17,19 +17,12 @@ #include "src/core/lib/gprpp/stat.h" #include -#include -#include -#include +#include "gtest/gtest.h" -#include -#include #include -#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/tmpfile.h" -#include "src/core/lib/iomgr/load_file.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc index 52218095d69..60c257f4a17 100644 --- a/test/core/gprpp/status_helper_test.cc +++ b/test/core/gprpp/status_helper_test.cc @@ -16,13 +16,15 @@ #include "src/core/lib/gprpp/status_helper.h" -#include -#include +#include #include "absl/status/status.h" #include "absl/strings/str_cat.h" +#include "absl/time/civil_time.h" #include "absl/time/clock.h" +#include "gmock/gmock.h" #include "google/rpc/status.upb.h" +#include "gtest/gtest.h" #include "upb/upb.hpp" namespace grpc_core { diff --git a/test/core/gprpp/table_test.cc b/test/core/gprpp/table_test.cc index a355a9cc8fa..672795256d5 100644 --- a/test/core/gprpp/table_test.cc +++ b/test/core/gprpp/table_test.cc @@ -17,9 +17,8 @@ #include #include -#include - #include "absl/types/optional.h" +#include "gtest/gtest.h" namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/thd_test.cc b/test/core/gprpp/thd_test.cc index 34c6103ca4f..0c4f1c3a6d1 100644 --- a/test/core/gprpp/thd_test.cc +++ b/test/core/gprpp/thd_test.cc @@ -20,12 +20,9 @@ #include "src/core/lib/gprpp/thd.h" -#include -#include +#include "gtest/gtest.h" -#include - -#include +#include #include #include diff --git a/test/core/gprpp/time_test.cc b/test/core/gprpp/time_test.cc index f1e4b783432..7eacf4863a8 100644 --- a/test/core/gprpp/time_test.cc +++ b/test/core/gprpp/time_test.cc @@ -16,7 +16,9 @@ #include -#include +#include "gtest/gtest.h" + +#include namespace grpc_core { namespace testing { diff --git a/test/core/gprpp/time_util_test.cc b/test/core/gprpp/time_util_test.cc index 0fbbce5bc08..b9d2516de24 100644 --- a/test/core/gprpp/time_util_test.cc +++ b/test/core/gprpp/time_util_test.cc @@ -16,13 +16,13 @@ #include "src/core/lib/gprpp/time_util.h" -#include -#include - -#include +#include +#include #include "absl/time/time.h" +#include "gtest/gtest.h" +#include #include TEST(TimeUtilTest, ToGprTimeSpecFromAbslDurationWithRegularValues) { diff --git a/test/core/gprpp/unique_type_name_test.cc b/test/core/gprpp/unique_type_name_test.cc index 22642fbbc13..bce147edd32 100644 --- a/test/core/gprpp/unique_type_name_test.cc +++ b/test/core/gprpp/unique_type_name_test.cc @@ -14,10 +14,12 @@ #include "src/core/lib/gprpp/unique_type_name.h" -#include -#include +#include +#include #include "absl/strings/str_format.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" namespace grpc_core { diff --git a/test/core/gprpp/validation_errors_test.cc b/test/core/gprpp/validation_errors_test.cc index 993838dec37..34e2a0cba5a 100644 --- a/test/core/gprpp/validation_errors_test.cc +++ b/test/core/gprpp/validation_errors_test.cc @@ -16,10 +16,7 @@ #include "src/core/lib/gprpp/validation_errors.h" -#include -#include - -#include +#include "gtest/gtest.h" #include "test/core/util/test_config.h" diff --git a/test/core/gprpp/work_serializer_test.cc b/test/core/gprpp/work_serializer_test.cc index 07be3c21b72..b3f25e4b805 100644 --- a/test/core/gprpp/work_serializer_test.cc +++ b/test/core/gprpp/work_serializer_test.cc @@ -18,22 +18,23 @@ #include "src/core/lib/gprpp/work_serializer.h" +#include + +#include #include #include - -#include +#include #include "absl/memory/memory.h" #include "absl/synchronization/barrier.h" +#include "gtest/gtest.h" #include -#include -#include +#include +#include -#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/notification.h" #include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/iomgr/executor.h" #include "test/core/util/test_config.h" namespace { diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc index c9428dfb373..633e5deb141 100644 --- a/test/core/handshake/client_ssl.cc +++ b/test/core/handshake/client_ssl.cc @@ -16,15 +16,25 @@ * */ -#include +#include +#include +#include +#include +#include + +#include "absl/base/thread_annotations.h" +#include "gtest/gtest.h" + +#include + +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" #include "test/core/util/test_config.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_TCP -#include #include #include #include @@ -39,14 +49,12 @@ #include #include -#include #include #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/load_file.h" -#include "test/core/util/port.h" #define SSL_CERT_PATH "src/core/tsi/test_creds/server1.pem" #define SSL_KEY_PATH "src/core/tsi/test_creds/server1.key" diff --git a/test/core/handshake/readahead_handshaker_server_ssl.cc b/test/core/handshake/readahead_handshaker_server_ssl.cc index 6b1c12d9453..d60c45910f7 100644 --- a/test/core/handshake/readahead_handshaker_server_ssl.cc +++ b/test/core/handshake/readahead_handshaker_server_ssl.cc @@ -16,30 +16,25 @@ * */ -#include -#include -#include -#include +#include -#include -#include -#include +#include "absl/memory/memory.h" +#include "gtest/gtest.h" #include -#include -#include -#include -#include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/transport/security_handshaker.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/tcp_server.h" +#include "src/core/lib/transport/handshaker.h" #include "src/core/lib/transport/handshaker_factory.h" #include "src/core/lib/transport/handshaker_registry.h" #include "test/core/handshake/server_ssl_common.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" /* The purpose of this test is to exercise the case when a diff --git a/test/core/handshake/server_ssl.cc b/test/core/handshake/server_ssl.cc index 08b21d25ffe..5148796304c 100644 --- a/test/core/handshake/server_ssl.cc +++ b/test/core/handshake/server_ssl.cc @@ -16,25 +16,9 @@ * */ -#include -#include -#include -#include +#include "gtest/gtest.h" -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "src/core/lib/iomgr/load_file.h" #include "test/core/handshake/server_ssl_common.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" TEST(ServerSslTest, MainTest) { diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc index 49a93157084..a168cf1651e 100644 --- a/test/core/handshake/server_ssl_common.cc +++ b/test/core/handshake/server_ssl_common.cc @@ -18,26 +18,34 @@ #include "test/core/handshake/server_ssl_common.h" -#include +#include +#include +#include +#include #include #include #include #include +#include #include +#include #include +#include "absl/base/thread_annotations.h" #include "absl/strings/str_cat.h" #include #include +#include #include #include #include #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/handshake/server_ssl_common.h b/test/core/handshake/server_ssl_common.h index c64a007327f..a23c2e11697 100644 --- a/test/core/handshake/server_ssl_common.h +++ b/test/core/handshake/server_ssl_common.h @@ -19,17 +19,6 @@ #ifndef GRPC_SERVER_SSL_COMMON_H #define GRPC_SERVER_SSL_COMMON_H -#include -#include -#include -#include -#include -#include - -#include "src/core/lib/iomgr/load_file.h" -#include "test/core/util/port.h" -#include "test/core/util/test_config.h" - bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, const char* alpn_expected); diff --git a/test/core/http/format_request_test.cc b/test/core/http/format_request_test.cc index da121952a29..f7e8cb7dd29 100644 --- a/test/core/http/format_request_test.cc +++ b/test/core/http/format_request_test.cc @@ -20,12 +20,10 @@ #include -#include - -#include -#include +#include "gtest/gtest.h" #include "src/core/lib/http/httpcli.h" +#include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" TEST(FormatRequestTest, FormatGetRequest) { diff --git a/test/core/http/httpcli_test.cc b/test/core/http/httpcli_test.cc index ae58e31d5f0..74ca3726642 100644 --- a/test/core/http/httpcli_test.cc +++ b/test/core/http/httpcli_test.cc @@ -19,23 +19,34 @@ #include "src/core/lib/http/httpcli.h" #include +#include -#include +#include +#include +#include +#include +#include + +#include #include +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include #include #include #include -#include #include +#include #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/time_util.h" -#include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/util/fake_udp_and_tcp_server.h" diff --git a/test/core/http/httpcli_test_util.cc b/test/core/http/httpcli_test_util.cc index f7937cf7cb2..f6d885cdbf5 100644 --- a/test/core/http/httpcli_test_util.cc +++ b/test/core/http/httpcli_test_util.cc @@ -20,19 +20,18 @@ #include -#include #include #include #include #include #include -#include +#include +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/util/port.h" #include "test/core/util/subprocess.h" -#include "test/core/util/test_config.h" namespace grpc_core { namespace testing { diff --git a/test/core/http/httpscli_test.cc b/test/core/http/httpscli_test.cc index 6fce2488d44..5aaefe23e07 100644 --- a/test/core/http/httpscli_test.cc +++ b/test/core/http/httpscli_test.cc @@ -18,28 +18,45 @@ #include -#include +#include +#include +#include +#include +#include +#include +#include + #include +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "absl/time/clock.h" +#include "absl/time/time.h" #include #include #include -#include #include +#include -#include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" -#include "src/core/lib/gprpp/env.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/time_util.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/httpcli_ssl_credentials.h" -#include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/polling_entity.h" +#include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/security/credentials/credentials.h" +#include "src/core/lib/uri/uri_parser.h" #include "test/core/http/httpcli_test_util.h" #include "test/core/util/fake_udp_and_tcp_server.h" -#include "test/core/util/port.h" #include "test/core/util/subprocess.h" #include "test/core/util/test_config.h" diff --git a/test/core/http/parser_test.cc b/test/core/http/parser_test.cc index 97f8e26135c..329c28417ee 100644 --- a/test/core/http/parser_test.cc +++ b/test/core/http/parser_test.cc @@ -23,13 +23,11 @@ #include -#include - +#include "absl/status/status.h" #include "absl/strings/str_format.h" +#include "gtest/gtest.h" -#include #include -#include #include "src/core/lib/gpr/useful.h" #include "test/core/util/slice_splitter.h" diff --git a/test/core/http/request_fuzzer.cc b/test/core/http/request_fuzzer.cc index 9798cfb33c7..1d8cec262b5 100644 --- a/test/core/http/request_fuzzer.cc +++ b/test/core/http/request_fuzzer.cc @@ -16,14 +16,14 @@ * */ -#include #include #include #include -#include +#include #include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/error.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/http/response_fuzzer.cc b/test/core/http/response_fuzzer.cc index cf82ccfe2ce..1f0b36ff481 100644 --- a/test/core/http/response_fuzzer.cc +++ b/test/core/http/response_fuzzer.cc @@ -20,9 +20,10 @@ #include #include -#include +#include #include "src/core/lib/http/parser.h" +#include "src/core/lib/iomgr/error.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/json/fuzzer.cc b/test/core/json/fuzzer.cc index 47b43c71c6e..6953da70bc9 100644 --- a/test/core/json/fuzzer.cc +++ b/test/core/json/fuzzer.cc @@ -16,11 +16,12 @@ * */ -#include #include #include -#include +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" + #include #include "src/core/lib/json/json.h" diff --git a/test/core/json/json_object_loader_test.cc b/test/core/json/json_object_loader_test.cc index 7092e451aa4..20d99b5af2c 100644 --- a/test/core/json/json_object_loader_test.cc +++ b/test/core/json/json_object_loader_test.cc @@ -14,12 +14,12 @@ #include "src/core/lib/json/json_object_loader.h" +#include #include -#include -#include - -#include "absl/strings/str_join.h" +#include "absl/status/status.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" diff --git a/test/core/json/json_test.cc b/test/core/json/json_test.cc index 6e6d6d07d6c..57028e92920 100644 --- a/test/core/json/json_test.cc +++ b/test/core/json/json_test.cc @@ -18,17 +18,14 @@ #include -#include -#include - +#include "absl/status/status.h" #include "absl/strings/match.h" +#include "absl/strings/str_cat.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" -#include #include -#include -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/nanopb/fuzzer_response.cc b/test/core/nanopb/fuzzer_response.cc index c4e85eb32e1..038f2331fa3 100644 --- a/test/core/nanopb/fuzzer_response.cc +++ b/test/core/nanopb/fuzzer_response.cc @@ -19,12 +19,8 @@ #include #include -#include "upb/upb.hpp" - #include -#include - -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" +#include bool squelch = true; bool leak_check = true; diff --git a/test/core/nanopb/fuzzer_serverlist.cc b/test/core/nanopb/fuzzer_serverlist.cc index 2c611ef984f..0a4dccc2ca9 100644 --- a/test/core/nanopb/fuzzer_serverlist.cc +++ b/test/core/nanopb/fuzzer_serverlist.cc @@ -20,9 +20,7 @@ #include #include -#include - -#include "src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h" +#include bool squelch = true; bool leak_check = true; diff --git a/test/core/network_benchmarks/low_level_ping_pong.cc b/test/core/network_benchmarks/low_level_ping_pong.cc index 683c85e29db..8087afcd587 100644 --- a/test/core/network_benchmarks/low_level_ping_pong.cc +++ b/test/core/network_benchmarks/low_level_ping_pong.cc @@ -25,10 +25,13 @@ */ #include -#include +#include #include #include #include +#include + +#include #ifdef __linux__ #include #endif diff --git a/test/core/server_config_selector/server_config_selector_test.cc b/test/core/server_config_selector/server_config_selector_test.cc index 69b03cb2278..df0b67f1ace 100644 --- a/test/core/server_config_selector/server_config_selector_test.cc +++ b/test/core/server_config_selector/server_config_selector_test.cc @@ -18,10 +18,10 @@ #include "src/core/ext/filters/server_config_selector/server_config_selector.h" -#include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include -#include #include "src/core/lib/channel/channel_args.h" #include "test/core/util/test_config.h" diff --git a/test/core/slice/b64_decode_fuzzer.cc b/test/core/slice/b64_decode_fuzzer.cc index cb3439af186..17965fc90c0 100644 --- a/test/core/slice/b64_decode_fuzzer.cc +++ b/test/core/slice/b64_decode_fuzzer.cc @@ -16,10 +16,11 @@ * */ -#include +#include #include #include +#include #include "src/core/lib/slice/b64.h" diff --git a/test/core/slice/b64_encode_fuzzer.cc b/test/core/slice/b64_encode_fuzzer.cc index 5b62fde5951..055ed7272e5 100644 --- a/test/core/slice/b64_encode_fuzzer.cc +++ b/test/core/slice/b64_encode_fuzzer.cc @@ -16,7 +16,7 @@ * */ -#include +#include #include #include diff --git a/test/core/slice/b64_test.cc b/test/core/slice/b64_test.cc index 11f903e59b3..a6b4b457548 100644 --- a/test/core/slice/b64_test.cc +++ b/test/core/slice/b64_test.cc @@ -18,14 +18,14 @@ #include "src/core/lib/slice/b64.h" +#include #include -#include +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" -#include #include #include -#include #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/slice/slice_internal.h" diff --git a/test/core/slice/c_slice_buffer_test.cc b/test/core/slice/c_slice_buffer_test.cc index c2895848ce5..7abb87ef083 100644 --- a/test/core/slice/c_slice_buffer_test.cc +++ b/test/core/slice/c_slice_buffer_test.cc @@ -16,11 +16,13 @@ * */ -#include +#include -#include +#include "gtest/gtest.h" + +#include #include -#include +#include #include "src/core/lib/slice/slice_internal.h" #include "test/core/util/test_config.h" diff --git a/test/core/slice/percent_decode_fuzzer.cc b/test/core/slice/percent_decode_fuzzer.cc index afaae3adf50..1942af01bb3 100644 --- a/test/core/slice/percent_decode_fuzzer.cc +++ b/test/core/slice/percent_decode_fuzzer.cc @@ -16,15 +16,13 @@ * */ -#include #include #include #include -#include -#include #include "src/core/lib/slice/percent_encoding.h" +#include "src/core/lib/slice/slice.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/slice/percent_encode_fuzzer.cc b/test/core/slice/percent_encode_fuzzer.cc index e145d1511bf..5fb8c47c9b8 100644 --- a/test/core/slice/percent_encode_fuzzer.cc +++ b/test/core/slice/percent_encode_fuzzer.cc @@ -16,15 +16,16 @@ * */ -#include #include #include +#include + #include -#include #include #include "src/core/lib/slice/percent_encoding.h" +#include "src/core/lib/slice/slice.h" bool squelch = true; bool leak_check = true; diff --git a/test/core/slice/percent_encoding_test.cc b/test/core/slice/percent_encoding_test.cc index 567365d3cb2..81777db8d93 100644 --- a/test/core/slice/percent_encoding_test.cc +++ b/test/core/slice/percent_encoding_test.cc @@ -18,9 +18,12 @@ #include "src/core/lib/slice/percent_encoding.h" -#include +#include + +#include + +#include "gtest/gtest.h" -#include #include #include diff --git a/test/core/slice/slice_buffer_test.cc b/test/core/slice/slice_buffer_test.cc index 2464f34af47..cc833555071 100644 --- a/test/core/slice/slice_buffer_test.cc +++ b/test/core/slice/slice_buffer_test.cc @@ -16,14 +16,17 @@ #include "src/core/lib/slice/slice_buffer.h" -#include -#include +#include -#include -#include +#include + +#include "gtest/gtest.h" + +#include +#include +#include #include "src/core/lib/slice/slice.h" -#include "test/core/util/test_config.h" using ::grpc_core::Slice; using ::grpc_core::SliceBuffer; diff --git a/test/core/slice/slice_string_helpers_test.cc b/test/core/slice/slice_string_helpers_test.cc index 9a563623b5c..f195bfef186 100644 --- a/test/core/slice/slice_string_helpers_test.cc +++ b/test/core/slice/slice_string_helpers_test.cc @@ -18,19 +18,12 @@ #include "src/core/lib/slice/slice_string_helpers.h" -#include -#include -#include -#include - -#include +#include "gtest/gtest.h" #include #include -#include #include "src/core/lib/gpr/string.h" -#include "src/core/lib/slice/slice_internal.h" #define LOG_TEST_NAME(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/slice/slice_test.cc b/test/core/slice/slice_test.cc index 3a51ebdc8a6..38254a43ab5 100644 --- a/test/core/slice/slice_test.cc +++ b/test/core/slice/slice_test.cc @@ -23,15 +23,17 @@ #include #include +#include +#include #include - -#include +#include +#include #include "absl/memory/memory.h" +#include "absl/strings/string_view.h" +#include "gtest/gtest.h" -#include #include -#include #include #include "src/core/lib/gprpp/memory.h" diff --git a/test/core/surface/byte_buffer_reader_test.cc b/test/core/surface/byte_buffer_reader_test.cc index 92aec811424..34f522d19cf 100644 --- a/test/core/surface/byte_buffer_reader_test.cc +++ b/test/core/surface/byte_buffer_reader_test.cc @@ -18,18 +18,15 @@ #include -#include +#include "gtest/gtest.h" #include #include +#include #include #include -#include #include -#include -#include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/surface/completion_queue_test.cc b/test/core/surface/completion_queue_test.cc index 153e1e22360..4c653bb3d94 100644 --- a/test/core/surface/completion_queue_test.cc +++ b/test/core/surface/completion_queue_test.cc @@ -18,18 +18,18 @@ #include "src/core/lib/surface/completion_queue.h" -#include +#include + +#include "absl/status/status.h" +#include "gtest/gtest.h" #include -#include #include +#include #include #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/sync.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" #include "test/core/util/test_config.h" #define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x) diff --git a/test/core/surface/completion_queue_threading_test.cc b/test/core/surface/completion_queue_threading_test.cc index d9f09b8192b..e87dc8f049d 100644 --- a/test/core/surface/completion_queue_threading_test.cc +++ b/test/core/surface/completion_queue_threading_test.cc @@ -16,17 +16,21 @@ * */ -#include +#include +#include + +#include "absl/status/status.h" +#include "gtest/gtest.h" #include #include #include +#include #include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/surface/completion_queue.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/concurrent_connectivity_test.cc b/test/core/surface/concurrent_connectivity_test.cc index cc6b525b1ac..ea3d68ccd27 100644 --- a/test/core/surface/concurrent_connectivity_test.cc +++ b/test/core/surface/concurrent_connectivity_test.cc @@ -16,31 +16,37 @@ * */ -#include -#include +#include +#include #include #include - -#include +#include #include "absl/strings/str_cat.h" +#include "gtest/gtest.h" #include #include #include #include +#include +#include -#include "src/core/lib/address_utils/sockaddr_utils.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/event_engine/channel_args_endpoint_config.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" -#include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" +#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/resource_quota/api.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/init_test.cc b/test/core/surface/init_test.cc index 173d01bbad8..2f896e8dc53 100644 --- a/test/core/surface/init_test.cc +++ b/test/core/surface/init_test.cc @@ -18,14 +18,17 @@ #include "src/core/lib/surface/init.h" -#include +#include +#include +#include "absl/time/clock.h" +#include "absl/time/time.h" +#include "gtest/gtest.h" + +#include #include -#include -#include #include "src/core/lib/event_engine/default_event_engine.h" -#include "src/core/lib/gprpp/notification.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/lame_client_test.cc b/test/core/surface/lame_client_test.cc index e6570294d5f..85db3ea19a0 100644 --- a/test/core/surface/lame_client_test.cc +++ b/test/core/surface/lame_client_test.cc @@ -16,17 +16,26 @@ * */ +#include #include -#include +#include "absl/status/status.h" +#include "gtest/gtest.h" #include +#include +#include +#include #include -#include +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/gprpp/orphanable.h" #include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/transport/connectivity_state.h" #include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/num_external_connectivity_watchers_test.cc b/test/core/surface/num_external_connectivity_watchers_test.cc index da9856d9430..bf37d2d55fa 100644 --- a/test/core/surface/num_external_connectivity_watchers_test.cc +++ b/test/core/surface/num_external_connectivity_watchers_test.cc @@ -16,17 +16,21 @@ * */ -#include +#include + +#include + +#include "gtest/gtest.h" #include #include -#include +#include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" -#include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/util/port.h" diff --git a/test/core/surface/secure_channel_create_test.cc b/test/core/surface/secure_channel_create_test.cc index 14031f33dca..48b9c2920bd 100644 --- a/test/core/surface/secure_channel_create_test.cc +++ b/test/core/surface/secure_channel_create_test.cc @@ -16,16 +16,16 @@ * */ -#include - -#include +#include "gtest/gtest.h" #include -#include -#include +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/resolver/resolver_registry.h" +#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "src/core/lib/security/security_connector/security_connector.h" #include "src/core/lib/surface/channel.h" diff --git a/test/core/surface/sequential_connectivity_test.cc b/test/core/surface/sequential_connectivity_test.cc index 996b7c7e5fc..3797b8476b2 100644 --- a/test/core/surface/sequential_connectivity_test.cc +++ b/test/core/surface/sequential_connectivity_test.cc @@ -16,20 +16,24 @@ * */ +#include + +#include +#include #include -#include +#include "gtest/gtest.h" #include #include -#include -#include +#include #include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/server_chttp2_test.cc b/test/core/surface/server_chttp2_test.cc index 01e9f267429..1ff7c411e7c 100644 --- a/test/core/surface/server_chttp2_test.cc +++ b/test/core/surface/server_chttp2_test.cc @@ -16,18 +16,17 @@ * */ -#include +#include + +#include "gtest/gtest.h" #include #include -#include -#include #include +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" -#include "src/core/tsi/fake_transport_security.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/surface/server_test.cc b/test/core/surface/server_test.cc index 538ce1d1ec6..dd1ffedf4db 100644 --- a/test/core/surface/server_test.cc +++ b/test/core/surface/server_test.cc @@ -16,17 +16,22 @@ * */ -#include +#include -#include +#include +#include +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "gtest/gtest.h" #include #include -#include #include +#include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" diff --git a/test/core/xds/certificate_provider_store_test.cc b/test/core/xds/certificate_provider_store_test.cc index 228daf84144..662726392fc 100644 --- a/test/core/xds/certificate_provider_store_test.cc +++ b/test/core/xds/certificate_provider_store_test.cc @@ -18,12 +18,20 @@ #include "src/core/ext/xds/certificate_provider_store.h" +#include +#include #include +#include -#include +#include "absl/memory/memory.h" +#include "gtest/gtest.h" + +#include +#include #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/unique_type_name.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" #include "test/core/util/test_config.h" diff --git a/test/core/xds/file_watcher_certificate_provider_factory_test.cc b/test/core/xds/file_watcher_certificate_provider_factory_test.cc index 7baa4d7c9e9..7514c09084c 100644 --- a/test/core/xds/file_watcher_certificate_provider_factory_test.cc +++ b/test/core/xds/file_watcher_certificate_provider_factory_test.cc @@ -18,10 +18,11 @@ #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h" -#include -#include - +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_format.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include diff --git a/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc b/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc index ccbc90f7ff9..7d91c9a187c 100644 --- a/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc +++ b/test/core/xds/google_mesh_ca_certificate_provider_factory_test.cc @@ -18,8 +18,10 @@ #include "src/core/ext/xds/google_mesh_ca_certificate_provider_factory.h" -#include -#include +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include diff --git a/test/core/xds/xds_bootstrap_test.cc b/test/core/xds/xds_bootstrap_test.cc index 575fd59c7ca..c96a1d7f22b 100644 --- a/test/core/xds/xds_bootstrap_test.cc +++ b/test/core/xds/xds_bootstrap_test.cc @@ -14,18 +14,42 @@ // limitations under the License. // -#include -#include +#include "src/core/ext/xds/xds_bootstrap.h" +#include + +#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/numbers.h" #include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" + +#include +#include +#include +#include +#include "src/core/ext/xds/certificate_provider_store.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" -#include "src/core/ext/xds/xds_client_grpc.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gpr/tmpfile.h" #include "src/core/lib/gprpp/env.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/json/json.h" +#include "src/core/lib/json/json_object_loader.h" +#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h" #include "src/core/lib/security/certificate_provider/certificate_provider_registry.h" +#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/xds/xds_certificate_provider_test.cc b/test/core/xds/xds_certificate_provider_test.cc index bb84ddd8611..d467f87c915 100644 --- a/test/core/xds/xds_certificate_provider_test.cc +++ b/test/core/xds/xds_certificate_provider_test.cc @@ -18,9 +18,15 @@ #include "src/core/ext/xds/xds_certificate_provider.h" -#include -#include +#include "absl/status/status.h" +#include "absl/types/optional.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include + +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/security/security_connector/ssl_utils.h" #include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" diff --git a/test/core/xds/xds_channel_stack_modifier_test.cc b/test/core/xds/xds_channel_stack_modifier_test.cc index 3bf4a7a4b1f..9f9bfc5d4cd 100644 --- a/test/core/xds/xds_channel_stack_modifier_test.cc +++ b/test/core/xds/xds_channel_stack_modifier_test.cc @@ -18,15 +18,23 @@ #include "src/core/ext/xds/xds_channel_stack_modifier.h" -#include +#include + +#include +#include + +#include "gtest/gtest.h" #include #include +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder_impl.h" #include "src/core/lib/config/core_configuration.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport_fwd.h" #include "src/core/lib/transport/transport_impl.h" #include "test/core/util/test_config.h" diff --git a/test/core/xds/xds_client_test.cc b/test/core/xds/xds_client_test.cc index 176044e3a8b..a17ced697af 100644 --- a/test/core/xds/xds_client_test.cc +++ b/test/core/xds/xds_client_test.cc @@ -20,21 +20,44 @@ #include "src/core/ext/xds/xds_client.h" +#include + +#include #include #include #include #include -#include -#include +#include +#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/strings/str_cat.h" +#include "absl/time/time.h" +#include "absl/types/optional.h" +#include "absl/types/variant.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" +#include "upb/def.h" + +#include +#include +#include #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_resource_type_impl.h" +#include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/env.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/json/json.h" +#include "src/core/lib/json/json_args.h" #include "src/core/lib/json/json_object_loader.h" -#include "src/proto/grpc/testing/xds/v3/discovery.grpc.pb.h" +#include "src/proto/grpc/testing/xds/v3/base.pb.h" +#include "src/proto/grpc/testing/xds/v3/discovery.pb.h" #include "test/core/util/test_config.h" #include "test/core/xds/xds_transport_fake.h" diff --git a/test/core/xds/xds_endpoint_resource_type_test.cc b/test/core/xds/xds_endpoint_resource_type_test.cc index cacdba2c506..c27e98c9a6b 100644 --- a/test/core/xds/xds_endpoint_resource_type_test.cc +++ b/test/core/xds/xds_endpoint_resource_type_test.cc @@ -14,14 +14,41 @@ // limitations under the License. // -#include -#include +#include +#include +#include +#include +#include +#include + +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/types/optional.h" +#include "gtest/gtest.h" +#include "upb/def.hpp" +#include "upb/upb.hpp" + +#include +#include + +#include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/ext/xds/xds_client.h" +#include "src/core/ext/xds/xds_client_stats.h" #include "src/core/ext/xds/xds_endpoint.h" +#include "src/core/ext/xds/xds_resource_type.h" +#include "src/core/ext/xds/xds_resource_type_impl.h" #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/proto/grpc/testing/xds/v3/endpoint.grpc.pb.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/resolver/server_address.h" +#include "src/proto/grpc/testing/xds/v3/address.pb.h" +#include "src/proto/grpc/testing/xds/v3/base.pb.h" +#include "src/proto/grpc/testing/xds/v3/endpoint.pb.h" +#include "src/proto/grpc/testing/xds/v3/percent.pb.h" #include "test/core/util/test_config.h" using envoy::config::endpoint::v3::ClusterLoadAssignment; diff --git a/test/core/xds/xds_lb_policy_registry_test.cc b/test/core/xds/xds_lb_policy_registry_test.cc index dee1b6dca26..ee1d7f7c8c0 100644 --- a/test/core/xds/xds_lb_policy_registry_test.cc +++ b/test/core/xds/xds_lb_policy_registry_test.cc @@ -18,26 +18,38 @@ #include "src/core/ext/xds/xds_lb_policy_registry.h" -#include -#include - -#include "absl/strings/str_format.h" +#include +#include +#include + +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "upb/def.hpp" -#include "upb/upb.h" #include "upb/upb.hpp" #include +#include #include "src/core/ext/xds/xds_bootstrap_grpc.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/load_balancing/lb_policy.h" #include "src/core/lib/load_balancing/lb_policy_factory.h" #include "src/core/lib/load_balancing/lb_policy_registry.h" -#include "src/proto/grpc/testing/xds/v3/cluster.grpc.pb.h" -#include "src/proto/grpc/testing/xds/v3/ring_hash.grpc.pb.h" -#include "src/proto/grpc/testing/xds/v3/round_robin.grpc.pb.h" -#include "src/proto/grpc/testing/xds/v3/typed_struct.grpc.pb.h" -#include "src/proto/grpc/testing/xds/v3/udpa_typed_struct.grpc.pb.h" -#include "src/proto/grpc/testing/xds/v3/wrr_locality.grpc.pb.h" +#include "src/proto/grpc/testing/xds/v3/cluster.pb.h" +#include "src/proto/grpc/testing/xds/v3/extension.pb.h" +#include "src/proto/grpc/testing/xds/v3/ring_hash.pb.h" +#include "src/proto/grpc/testing/xds/v3/round_robin.pb.h" +#include "src/proto/grpc/testing/xds/v3/typed_struct.pb.h" +#include "src/proto/grpc/testing/xds/v3/udpa_typed_struct.pb.h" +#include "src/proto/grpc/testing/xds/v3/wrr_locality.pb.h" #include "test/core/util/test_config.h" #include "test/cpp/util/config_grpc_cli.h" diff --git a/test/core/xds/xds_transport_fake.cc b/test/core/xds/xds_transport_fake.cc index 12b57134545..c2b10f617fc 100644 --- a/test/core/xds/xds_transport_fake.cc +++ b/test/core/xds/xds_transport_fake.cc @@ -18,11 +18,14 @@ #include "test/core/xds/xds_transport_fake.h" +#include + #include #include #include #include +#include #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/lib/event_engine/default_event_engine.h" diff --git a/test/core/xds/xds_transport_fake.h b/test/core/xds/xds_transport_fake.h index ed0d746c90e..08e673d4997 100644 --- a/test/core/xds/xds_transport_fake.h +++ b/test/core/xds/xds_transport_fake.h @@ -21,15 +21,21 @@ #include #include +#include #include #include +#include +#include "absl/base/thread_annotations.h" #include "absl/status/status.h" +#include "absl/strings/string_view.h" +#include "absl/time/time.h" #include "absl/types/optional.h" #include "src/core/ext/xds/xds_bootstrap.h" #include "src/core/ext/xds/xds_transport.h" #include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh index ecb4324d604..d4a1efa7f92 100755 --- a/tools/dockerfile/grpc_iwyu/iwyu.sh +++ b/tools/dockerfile/grpc_iwyu/iwyu.sh @@ -46,19 +46,17 @@ export ENABLED_MODULES=' src/core/ext src/core/lib src/cpp - test/core/end2end - test/core/memory_usage - test/core/promise - test/core/resource_quota - test/core/transport - test/core/uri - test/core/util + test/core ' export DISABLED_MODULES=' src/core/lib/gpr src/core/lib/iomgr src/core/ext/transport/binder + test/core/alts + test/core/iomgr + test/core/security + test/core/tsi test/core/transport/binder ' @@ -72,6 +70,7 @@ cat compile_commands.json | jq -r '.[].file' | grep -v -E $EXCLUSION_REGEX \ | grep -v src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h \ | grep -v test/core/end2end/end2end_tests.cc \ + | grep -v test/core/surface/public_headers_must_be_c89.c \ | sort \ > iwyu_files0.txt