Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[reorg] move test/core/util -> test/core/test_util #36446

Closed
wants to merge 4 commits into from
Closed

[reorg] move test/core/util -> test/core/test_util #36446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8382754
[reorg] move test/core/util -> test/core/test_util
markdroth Apr 24, 2024
1fab87a
fix build
markdroth Apr 24, 2024
19d4e8d
buildifier
markdroth Apr 24, 2024
5dcc85e
Merge remote-tracking branch 'upstream/master' into reorg_test
markdroth Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion test/core/address_utils/parse_address_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#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"
#include "test/core/test_util/test_config.h"

#ifdef GRPC_HAVE_UNIX_SOCKET

Expand Down
2 changes: 1 addition & 1 deletion test/core/address_utils/parse_address_with_named_scope_id_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include "src/core/lib/iomgr/resolved_address.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/uri/uri_parser.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static void test_grpc_parse_ipv6_parity_with_getaddrinfo(
const char* target, const struct sockaddr_in6 result_from_getaddrinfo) {
Expand Down
2 changes: 1 addition & 1 deletion test/core/address_utils/sockaddr_utils_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "src/core/lib/address_utils/parse_address.h"
#include "src/core/lib/iomgr/sockaddr.h"
#include "src/core/lib/iomgr/socket_utils.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace {

Expand Down
2 changes: 1 addition & 1 deletion test/core/backoff/backoff_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "src/core/lib/gprpp/time.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc {
namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/bad_client.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include "src/core/lib/surface/server.h"
#include "src/core/lib/transport/transport.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define MIN_HTTP2_FRAME_SIZE 9

Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/bad_streaming_id.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define HEADER_FRAME_ID_1 \
"\x00\x00\xc9\x01\x05\x00\x00\x00\x01" /* headers: generated from \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/badreq.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/connection_prefix.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static void verifier(grpc_server* server, grpc_completion_queue* cq,
void* /*registered_method*/) {
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/duplicate_header.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "src/core/lib/gprpp/time.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/head_of_line_blocking.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "test/core/bad_client/bad_client.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static const char prefix[] =
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/headers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/initial_settings_frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#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"
#include "test/core/test_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"
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/out_of_bounds.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define APPEND_BUFFER(string, to_append) \
((string).append((to_append), sizeof(to_append) - 1))
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/server_registered_method.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#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"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/simple_request.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#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"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/unknown_frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static void verifier(grpc_server* server, grpc_completion_queue* cq,
void* /*registered_method*/) {
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_client/tests/window_overflow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include "src/core/lib/surface/server.h"
#include "test/core/bad_client/bad_client.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

#define PFX_STR \
"\x00\x00\x00\x04\x01\x00\x00\x00\x00" \
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_connection/close_fd_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/completion_queue.h"
#include "src/core/lib/surface/server.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static void* tag(intptr_t t) { return reinterpret_cast<void*>(t); }

Expand Down
4 changes: 2 additions & 2 deletions test/core/bad_ssl/bad_ssl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
#include "src/core/lib/gprpp/env.h"
#include "src/core/lib/gprpp/host_port.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/port.h"
#include "test/core/test_util/test_config.h"

static void run_test(const char* target, size_t nops) {
grpc_channel_credentials* ssl_creds =
Expand Down
4 changes: 2 additions & 2 deletions test/core/bad_ssl/server_common.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <grpc/support/log.h>
#include <grpc/support/time.h>

#include "test/core/util/cmdline.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/cmdline.h"
#include "test/core/test_util/test_config.h"

// Common server implementation details for all servers in servers/.
// There's nothing *wrong* with these servers per-se, but they are
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_ssl/servers/alpn.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/iomgr/error.h"
#include "test/core/bad_ssl/server_common.h"
#include "test/core/util/tls_utils.h"
#include "test/core/test_util/tls_utils.h"

#define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem"
#define SERVER_CERT_PATH "src/core/tsi/test_creds/server1.pem"
Expand Down
2 changes: 1 addition & 1 deletion test/core/bad_ssl/servers/cert.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

#include "src/core/lib/iomgr/error.h"
#include "test/core/bad_ssl/server_common.h"
#include "test/core/util/tls_utils.h"
#include "test/core/test_util/tls_utils.h"

// This server will present an untrusted cert to the connecting client,
// causing the SSL handshake to fail
Expand Down
4 changes: 2 additions & 2 deletions test/core/channel/call_tracer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "src/core/lib/promise/context.h"
#include "src/core/lib/resource_quota/memory_quota.h"
#include "src/core/lib/resource_quota/resource_quota.h"
#include "test/core/util/fake_stats_plugin.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/fake_stats_plugin.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channel/channel_args_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#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 "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {

Expand Down
2 changes: 1 addition & 1 deletion test/core/channel/channel_stack_builder_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include "src/core/lib/iomgr/closure.h"
#include "src/core/lib/iomgr/error.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channel/channel_stack_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "src/core/lib/config/core_configuration.h"
#include "src/core/lib/gprpp/status_helper.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

static grpc_error_handle channel_init_func(grpc_channel_element* elem,
grpc_channel_element_args* args) {
Expand Down
4 changes: 2 additions & 2 deletions test/core/channel/metrics_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"

#include "test/core/util/fake_stats_plugin.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/fake_stats_plugin.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channel/minimal_stack_is_minimal_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "src/core/lib/surface/channel_init.h"
#include "src/core/lib/surface/channel_stack_type.h"
#include "src/core/lib/transport/transport.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace {
class FakeTransport final : public grpc_core::Transport {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channelz/channel_trace_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/exec_ctx.h"
#include "src/core/lib/json/json.h"
#include "src/core/lib/json/json_writer.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"
#include "test/cpp/util/channel_trace_proto_helper.h"

namespace grpc_core {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channelz/channelz_registry_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "gtest/gtest.h"

#include "src/core/channelz/channelz.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace channelz {
Expand Down
2 changes: 1 addition & 1 deletion test/core/channelz/channelz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include "src/core/lib/surface/channel.h"
#include "src/core/lib/surface/server.h"
#include "test/core/event_engine/event_engine_test_utils.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"
#include "test/cpp/util/channel_trace_proto_helper.h"

using grpc_event_engine::experimental::GetDefaultEventEngine;
Expand Down
2 changes: 1 addition & 1 deletion test/core/client_channel/client_channel_service_config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
#include "src/core/service_config/service_config_parser.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/core/client_channel/client_channel_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "src/core/client_channel/subchannel_pool_interface.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/resolver/endpoint_addresses.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/core/client_channel/retry_service_config_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "src/core/service_config/service_config.h"
#include "src/core/service_config/service_config_impl.h"
#include "src/core/service_config/service_config_parser.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace testing {
Expand Down
2 changes: 1 addition & 1 deletion test/core/client_channel/retry_throttle_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "gtest/gtest.h"

#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace internal {
Expand Down
2 changes: 1 addition & 1 deletion test/core/compression/compression_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <grpc/support/log.h>

#include "src/core/lib/gpr/useful.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

TEST(CompressionTest, CompressionAlgorithmParse) {
size_t i;
Expand Down
4 changes: 2 additions & 2 deletions test/core/compression/message_compress_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#include "src/core/lib/gpr/useful.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/util/slice_splitter.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/slice_splitter.h"
#include "test/core/test_util/test_config.h"

typedef enum { ONE_A = 0, ONE_KB_A, ONE_MB_A, TEST_VALUE_COUNT } test_value;

Expand Down
2 changes: 1 addition & 1 deletion test/core/debug/stats_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#include "src/core/lib/debug/stats_data.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

namespace grpc_core {
namespace testing {
Expand Down
6 changes: 3 additions & 3 deletions test/core/end2end/bad_server_response_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
#include "src/core/lib/iomgr/tcp_server.h"
#include "src/core/lib/slice/slice_string_helpers.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
#include "test/core/util/test_tcp_server.h"
#include "test/core/test_util/port.h"
#include "test/core/test_util/test_config.h"
#include "test/core/test_util/test_tcp_server.h"

#define HTTP1_RESP_400 \
"HTTP/1.0 400 Bad Request\n" \
Expand Down
4 changes: 2 additions & 2 deletions test/core/end2end/connection_refused_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#include "src/core/lib/gprpp/host_port.h"
#include "src/core/lib/iomgr/exec_ctx.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/port.h"
#include "test/core/test_util/test_config.h"

static void run_test(bool wait_for_ready, bool use_service_config) {
grpc_channel* chan;
Expand Down
2 changes: 1 addition & 1 deletion test/core/end2end/cq_verifier.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#include "src/core/lib/gprpp/debug_location.h"
#include "src/core/lib/gprpp/match.h"
#include "src/core/lib/surface/event_string.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/test_config.h"

// a set of metadata we expect to find on an event
typedef struct metadata {
Expand Down
4 changes: 2 additions & 2 deletions test/core/end2end/dualstack_socket_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
#include "src/core/lib/iomgr/socket_utils_posix.h"
#include "src/core/lib/transport/error_utils.h"
#include "test/core/end2end/cq_verifier.h"
#include "test/core/util/port.h"
#include "test/core/util/test_config.h"
#include "test/core/test_util/port.h"
#include "test/core/test_util/test_config.h"

// This test exercises IPv4, IPv6, and dualstack sockets in various ways.

Expand Down