Skip to content

Commit dc4052f

Browse files
tanvi-jagtapcopybara-github
authored andcommitted
[PH2][Trivial] Fixing misleading namespace.
The files were moved from the chaotic_good folder to util folder. We wanted to share this code between HTTP2 and Chaotic Good. PR in which this was moved : grpc#37840 grpc#38791 PiperOrigin-RevId: 730373274
1 parent a6eb776 commit dc4052f

13 files changed

+26
-22
lines changed

test/core/transport/chaotic_good/client_transport_test.cc

+2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ using testing::Return;
5454
using testing::StrictMock;
5555

5656
using EventEngineSlice = grpc_event_engine::experimental::Slice;
57+
using grpc_core::util::testing::MockPromiseEndpoint;
58+
using grpc_core::util::testing::TransportTest;
5759

5860
namespace grpc_core {
5961
namespace chaotic_good {

test/core/transport/chaotic_good/control_endpoint_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ControlEndpointTest : public YodelTest {
3030
#define CONTROL_ENDPOINT_TEST(name) YODEL_TEST(ControlEndpointTest, name)
3131

3232
CONTROL_ENDPOINT_TEST(CanWrite) {
33-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
33+
util::testing::MockPromiseEndpoint ep(1234);
3434
chaotic_good::ControlEndpoint control_endpoint(std::move(ep.promise_endpoint),
3535
event_engine().get());
3636
ep.ExpectWrite(

test/core/transport/chaotic_good/data_endpoints_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ std::vector<chaotic_good::PendingConnection> Endpoints(Args... args) {
5555
}
5656

5757
DATA_ENDPOINTS_TEST(CanWrite) {
58-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
58+
util::testing::MockPromiseEndpoint ep(1234);
5959
chaotic_good::DataEndpoints data_endpoints(
6060
Endpoints(std::move(ep.promise_endpoint)), event_engine().get(), false);
6161
ep.ExpectWrite(
@@ -69,8 +69,8 @@ DATA_ENDPOINTS_TEST(CanWrite) {
6969
}
7070

7171
DATA_ENDPOINTS_TEST(CanMultiWrite) {
72-
chaotic_good::testing::MockPromiseEndpoint ep1(1234);
73-
chaotic_good::testing::MockPromiseEndpoint ep2(1235);
72+
util::testing::MockPromiseEndpoint ep1(1234);
73+
util::testing::MockPromiseEndpoint ep2(1235);
7474
chaotic_good::DataEndpoints data_endpoints(
7575
Endpoints(std::move(ep1.promise_endpoint),
7676
std::move(ep2.promise_endpoint)),
@@ -100,7 +100,7 @@ DATA_ENDPOINTS_TEST(CanMultiWrite) {
100100
}
101101

102102
DATA_ENDPOINTS_TEST(CanRead) {
103-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
103+
util::testing::MockPromiseEndpoint ep(1234);
104104
chaotic_good::DataEndpoints data_endpoints(
105105
Endpoints(std::move(ep.promise_endpoint)), event_engine().get(), false);
106106
ep.ExpectRead(

test/core/transport/chaotic_good/server_transport_test.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ using testing::StrictMock;
5656
using testing::WithArgs;
5757

5858
using EventEngineSlice = grpc_event_engine::experimental::Slice;
59+
using grpc_core::util::testing::TransportTest;
5960

6061
namespace grpc_core {
6162
namespace chaotic_good {
@@ -110,8 +111,8 @@ class MockServerConnectionFactory : public ServerConnectionFactory {
110111
};
111112

112113
TEST_F(TransportTest, ReadAndWriteOneMessage) {
113-
MockPromiseEndpoint control_endpoint(1);
114-
MockPromiseEndpoint data_endpoint(2);
114+
util::testing::MockPromiseEndpoint control_endpoint(1);
115+
util::testing::MockPromiseEndpoint data_endpoint(2);
115116
auto server_connection_factory =
116117
MakeRefCounted<StrictMock<MockServerConnectionFactory>>();
117118
auto call_destination = MakeRefCounted<StrictMock<MockCallDestination>>();

test/core/transport/chaotic_good_legacy/client_transport_test.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ using testing::StrictMock;
5353

5454
using EventEngineSlice = grpc_event_engine::experimental::Slice;
5555

56-
using grpc_core::chaotic_good::testing::MockPromiseEndpoint;
56+
using grpc_core::chaotic_good_legacy::testing::TransportTest;
57+
using grpc_core::util::testing::MockPromiseEndpoint;
5758

5859
namespace grpc_core {
5960
namespace chaotic_good_legacy {

test/core/transport/chaotic_good_legacy/control_endpoint_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class ControlEndpointTest : public YodelTest {
3030
#define CONTROL_ENDPOINT_TEST(name) YODEL_TEST(ControlEndpointTest, name)
3131

3232
CONTROL_ENDPOINT_TEST(CanWrite) {
33-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
33+
util::testing::MockPromiseEndpoint ep(1234);
3434
chaotic_good_legacy::ControlEndpoint control_endpoint(
3535
std::move(ep.promise_endpoint), event_engine().get());
3636
ep.ExpectWrite(

test/core/transport/chaotic_good_legacy/data_endpoints_test.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ std::vector<chaotic_good_legacy::PendingConnection> Endpoints(Args... args) {
5555
}
5656

5757
DATA_ENDPOINTS_TEST(CanWrite) {
58-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
58+
util::testing::MockPromiseEndpoint ep(1234);
5959
chaotic_good_legacy::DataEndpoints data_endpoints(
6060
Endpoints(std::move(ep.promise_endpoint)), event_engine().get(), false);
6161
ep.ExpectWrite(
@@ -69,8 +69,8 @@ DATA_ENDPOINTS_TEST(CanWrite) {
6969
}
7070

7171
DATA_ENDPOINTS_TEST(CanMultiWrite) {
72-
chaotic_good::testing::MockPromiseEndpoint ep1(1234);
73-
chaotic_good::testing::MockPromiseEndpoint ep2(1235);
72+
util::testing::MockPromiseEndpoint ep1(1234);
73+
util::testing::MockPromiseEndpoint ep2(1235);
7474
chaotic_good_legacy::DataEndpoints data_endpoints(
7575
Endpoints(std::move(ep1.promise_endpoint),
7676
std::move(ep2.promise_endpoint)),
@@ -100,7 +100,7 @@ DATA_ENDPOINTS_TEST(CanMultiWrite) {
100100
}
101101

102102
DATA_ENDPOINTS_TEST(CanRead) {
103-
chaotic_good::testing::MockPromiseEndpoint ep(1234);
103+
util::testing::MockPromiseEndpoint ep(1234);
104104
chaotic_good_legacy::DataEndpoints data_endpoints(
105105
Endpoints(std::move(ep.promise_endpoint)), event_engine().get(), false);
106106
ep.ExpectRead(

test/core/transport/chaotic_good_legacy/server_transport_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ using testing::WithArgs;
5656

5757
using EventEngineSlice = grpc_event_engine::experimental::Slice;
5858

59-
using grpc_core::chaotic_good::testing::MockPromiseEndpoint;
59+
using grpc_core::util::testing::MockPromiseEndpoint;
6060

6161
namespace grpc_core {
6262
namespace chaotic_good_legacy {

test/core/transport/chttp2/http2_client_transport_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "test/core/transport/chttp2/http2_frame_test_helper.h"
2525
#include "test/core/transport/util/mock_promise_endpoint.h"
2626

27-
using grpc_core::chaotic_good::testing::MockPromiseEndpoint;
2827
using grpc_core::transport::testing::Http2FrameTestHelper;
28+
using grpc_core::util::testing::MockPromiseEndpoint;
2929
using grpc_event_engine::experimental::EventEngine;
3030

3131
namespace grpc_core {

test/core/transport/chttp2/http2_server_transport_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "src/core/lib/event_engine/default_event_engine.h"
2424
#include "test/core/transport/util/mock_promise_endpoint.h"
2525

26-
using grpc_core::chaotic_good::testing::MockPromiseEndpoint;
26+
using grpc_core::util::testing::MockPromiseEndpoint;
2727
using grpc_event_engine::experimental::EventEngine;
2828

2929
namespace grpc_core {

test/core/transport/util/mock_promise_endpoint.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ using grpc_event_engine::experimental::EventEngine;
2525
using testing::WithArgs;
2626

2727
namespace grpc_core {
28-
namespace chaotic_good {
28+
namespace util {
2929
namespace testing {
3030

3131
void MockPromiseEndpoint::ExpectRead(
@@ -109,5 +109,5 @@ void MockPromiseEndpoint::CaptureWrites(SliceBuffer& writes,
109109
}
110110

111111
} // namespace testing
112-
} // namespace chaotic_good
112+
} // namespace util
113113
} // namespace grpc_core

test/core/transport/util/mock_promise_endpoint.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "src/core/lib/transport/promise_endpoint.h"
2424

2525
namespace grpc_core {
26-
namespace chaotic_good {
26+
namespace util {
2727
namespace testing {
2828

2929
class MockEndpoint
@@ -87,7 +87,7 @@ struct MockPromiseEndpoint {
8787
};
8888

8989
} // namespace testing
90-
} // namespace chaotic_good
90+
} // namespace util
9191
} // namespace grpc_core
9292

9393
#endif // GRPC_TEST_CORE_TRANSPORT_UTIL_MOCK_PROMISE_ENDPOINT_H

test/core/transport/util/transport_test.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h"
3030

3131
namespace grpc_core {
32-
namespace chaotic_good {
32+
namespace util {
3333
namespace testing {
3434

3535
class TransportTest : public ::testing::Test {
@@ -74,7 +74,7 @@ class TransportTest : public ::testing::Test {
7474
};
7575

7676
} // namespace testing
77-
} // namespace chaotic_good
77+
} // namespace util
7878
} // namespace grpc_core
7979

8080
#endif // GRPC_TEST_CORE_TRANSPORT_UTIL_TRANSPORT_TEST_H

0 commit comments

Comments
 (0)