Skip to content

Commit d83a327

Browse files
committed
xds: fix checkstyle violations in ExternalProcessor tests
TAG=agy CONV=86c74ebe-9fd7-4876-b27c-a4c1b230d346
1 parent 491c330 commit d83a327

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

xds/src/test/java/io/grpc/xds/ExternalProcessorClientInterceptorTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5199,7 +5199,8 @@ public void halfClose() {
51995199
proxyCall.halfClose();
52005200

52015201
assertThat(dataPlaneHalfClosedLatch.await(5, java.util.concurrent.TimeUnit.SECONDS)).isTrue();
5202-
// Since both end_of_stream and end_of_stream_without_message are true, the body must NOT be delivered
5202+
// Since both end_of_stream and end_of_stream_without_message are true,
5203+
// the body must NOT be delivered
52035204
assertThat(serverReceivedMessages).isEmpty();
52045205

52055206
proxyCall.cancel("Cleanup", null);
@@ -5366,7 +5367,7 @@ public void halfClose() {
53665367
@Test
53675368
@SuppressWarnings("unchecked")
53685369
public void
5369-
clientInterceptor_extProcResponse_eosTrue_eosWithoutMessageFalse_emptyBody_deliveredAsMessage()
5370+
clientInterceptor_extProcResponse_eosTrue_eosWithoutMsgFalse_emptyBody_deliveredAsMessage()
53705371
throws Exception {
53715372
String uniqueExtProcServerName = InProcessServerBuilder.generateName();
53725373
String uniqueDataPlaneServerName = InProcessServerBuilder.generateName();
@@ -5501,7 +5502,8 @@ public void halfClose() {
55015502
proxyCall.halfClose();
55025503

55035504
assertThat(dataPlaneHalfClosedLatch.await(5, java.util.concurrent.TimeUnit.SECONDS)).isTrue();
5504-
// Since end_of_stream is true and end_of_stream_without_message is false, empty body is delivered as a message
5505+
// Since end_of_stream is true and end_of_stream_without_message is false,
5506+
// empty body is delivered as a message
55055507
assertThat(serverReceivedMessages).containsExactly("");
55065508

55075509
proxyCall.cancel("Cleanup", null);
@@ -5647,7 +5649,8 @@ public void halfClose() {
56475649

56485650
assertThat(messageDeliveredLatch.await(5, java.util.concurrent.TimeUnit.SECONDS)).isTrue();
56495651
assertThat(serverReceivedMessages).containsExactly("normal-body");
5650-
// Since end_of_stream was false, end_of_stream_without_message is ignored, so data plane must NOT be half-closed
5652+
// Since end_of_stream was false, end_of_stream_without_message is ignored,
5653+
// so data plane must NOT be half-closed
56515654
assertThat(dataPlaneHalfClosedLatch.getCount()).isEqualTo(1);
56525655

56535656
proxyCall.cancel("Cleanup", null);

xds/src/test/java/io/grpc/xds/ExternalProcessorServerInterceptorTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6294,7 +6294,7 @@ public void sayHello(InputStream request, StreamObserver<InputStream> responseOb
62946294

62956295
@Test
62966296
public void
6297-
serverInterceptor_extProcResponse_eosTrue_eosWithoutMessageFalse_emptyBody_deliveredAsMessage()
6297+
serverInterceptor_extProcResponse_eosTrue_eosWithoutMsgFalse_emptyBody_deliveredAsMessage()
62986298
throws Exception {
62996299
ExternalProcessor proto =
63006300
createBaseProto(extProcServerName)
@@ -6581,7 +6581,8 @@ public void sayHello(InputStream request, StreamObserver<InputStream> responseOb
65816581
assertThat(extProcLatch.await(5, TimeUnit.SECONDS)).isTrue();
65826582
// Body is delivered as a regular message
65836583
assertThat(serverReceivedMessages).containsExactly("normal-body");
6584-
// Since end_of_stream was false, end_of_stream_without_message is ignored, so app must NOT receive half-close
6584+
// Since end_of_stream was false, end_of_stream_without_message is ignored,
6585+
// so app must NOT receive half-close
65856586
assertThat(appHalfCloseLatch.await(500, TimeUnit.MILLISECONDS)).isFalse();
65866587
} finally {
65876588
clientCall.cancel("Cleanup", null);

0 commit comments

Comments
 (0)