Skip to content

Commit b90834c

Browse files
committed
CR
1 parent e78d323 commit b90834c

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3242,8 +3242,9 @@ public void validateCommonTlsContext_combinedValidationContext_isRequiredForClie
32423242
.build();
32433243
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
32443244
XdsClusterResource.validateCommonTlsContext(commonTlsContext, null, false));
3245-
assertThat(e).hasMessageThat().isEqualTo("ca_certificate_provider_instance or system_root_certs is required "
3246-
+ "in upstream-tls-context");
3245+
assertThat(e).hasMessageThat().isEqualTo(
3246+
"ca_certificate_provider_instance or system_root_certs is required "
3247+
+ "in upstream-tls-context");
32473248
}
32483249

32493250
@Test
@@ -3277,7 +3278,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextForS
32773278
.build();
32783279
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
32793280
XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), true));
3280-
assertThat(e).hasMessageThat().isEqualTo("match_subject_alt_names only allowed in upstream_tls_context");
3281+
assertThat(e).hasMessageThat().isEqualTo(
3282+
"match_subject_alt_names only allowed in upstream_tls_context");
32813283
}
32823284

32833285
@Test
@@ -3294,8 +3296,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
32943296
.build();
32953297
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
32963298
XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
3297-
assertThat(e).hasMessageThat().isEqualTo("verify_certificate_spki in default_validation_context is not "
3298-
+ "supported");
3299+
assertThat(e).hasMessageThat().isEqualTo(
3300+
"verify_certificate_spki in default_validation_context is not supported");
32993301
}
33003302

33013303
@Test
@@ -3312,8 +3314,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
33123314
.build();
33133315
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
33143316
XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
3315-
assertThat(e).hasMessageThat().isEqualTo("verify_certificate_hash in default_validation_context is not "
3316-
+ "supported");
3317+
assertThat(e).hasMessageThat().isEqualTo(
3318+
"verify_certificate_hash in default_validation_context is not supported");
33173319
}
33183320

33193321
@Test
@@ -3367,16 +3369,17 @@ public void validateCommonTlsContext_combinedValContextWithDfltValContextCustomV
33673369
.build();
33683370
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
33693371
XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
3370-
assertThat(e).hasMessageThat().isEqualTo("custom_validator_config in default_validation_context is not "
3371-
+ "supported");
3372+
assertThat(e).hasMessageThat().isEqualTo(
3373+
"custom_validator_config in default_validation_context is not supported");
33723374
}
33733375

33743376
@Test
33753377
public void validateDownstreamTlsContext_noCommonTlsContext() throws ResourceInvalidException {
33763378
DownstreamTlsContext downstreamTlsContext = DownstreamTlsContext.getDefaultInstance();
33773379
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
33783380
XdsListenerResource.validateDownstreamTlsContext(downstreamTlsContext, null));
3379-
assertThat(e).hasMessageThat().isEqualTo("common-tls-context is required in downstream-tls-context");
3381+
assertThat(e).hasMessageThat().isEqualTo(
3382+
"common-tls-context is required in downstream-tls-context");
33803383
}
33813384

33823385
@Test
@@ -3396,7 +3399,8 @@ public void validateDownstreamTlsContext_hasRequireSni() throws ResourceInvalidE
33963399
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
33973400
XdsListenerResource.validateDownstreamTlsContext(downstreamTlsContext,
33983401
ImmutableSet.of("")));
3399-
assertThat(e).hasMessageThat().isEqualTo("downstream-tls-context with require-sni is not supported");
3402+
assertThat(e).hasMessageThat().isEqualTo(
3403+
"downstream-tls-context with require-sni is not supported");
34003404
}
34013405

34023406
@Test
@@ -3425,7 +3429,8 @@ public void validateUpstreamTlsContext_noCommonTlsContext() throws ResourceInval
34253429
UpstreamTlsContext upstreamTlsContext = UpstreamTlsContext.getDefaultInstance();
34263430
ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
34273431
XdsClusterResource.validateUpstreamTlsContext(upstreamTlsContext, null));
3428-
assertThat(e).hasMessageThat().isEqualTo("common-tls-context is required in upstream-tls-context");
3432+
assertThat(e).hasMessageThat().isEqualTo(
3433+
"common-tls-context is required in upstream-tls-context");
34293434
}
34303435

34313436
@Test

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919

2020
import static com.google.common.truth.Truth.assertThat;
21-
import static org.junit.Assert.assertThrows;
2221
import static io.grpc.Metadata.ASCII_STRING_MARSHALLER;
22+
import static org.junit.Assert.assertThrows;
2323
import static org.mockito.Mockito.verify;
2424
import static org.mockito.Mockito.verifyNoMoreInteractions;
2525
import static org.mockito.Mockito.when;

0 commit comments

Comments
 (0)