CR

Author: panchenko

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

@@ -3242,8 +3242,9 @@ public void validateCommonTlsContext_combinedValidationContext_isRequiredForClie
         .build();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsClusterResource.validateCommonTlsContext(commonTlsContext, null, false));
-    assertThat(e).hasMessageThat().isEqualTo("ca_certificate_provider_instance or system_root_certs is required "
-        + "in upstream-tls-context");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "ca_certificate_provider_instance or system_root_certs is required "
+            + "in upstream-tls-context");
   }
 
   @Test
@@ -3277,7 +3278,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextForS
         .build();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), true));
-    assertThat(e).hasMessageThat().isEqualTo("match_subject_alt_names only allowed in upstream_tls_context");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "match_subject_alt_names only allowed in upstream_tls_context");
   }
 
   @Test
@@ -3294,8 +3296,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
         .build();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
-    assertThat(e).hasMessageThat().isEqualTo("verify_certificate_spki in default_validation_context is not "
-        + "supported");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "verify_certificate_spki in default_validation_context is not supported");
   }
 
   @Test
@@ -3312,8 +3314,8 @@ public void validateCommonTlsContext_combinedValContextWithDefaultValContextVeri
         .build();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
-    assertThat(e).hasMessageThat().isEqualTo("verify_certificate_hash in default_validation_context is not "
-        + "supported");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "verify_certificate_hash in default_validation_context is not supported");
   }
 
   @Test
@@ -3367,16 +3369,17 @@ public void validateCommonTlsContext_combinedValContextWithDfltValContextCustomV
         .build();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsClusterResource.validateCommonTlsContext(commonTlsContext, ImmutableSet.of(""), false));
-    assertThat(e).hasMessageThat().isEqualTo("custom_validator_config in default_validation_context is not "
-        + "supported");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "custom_validator_config in default_validation_context is not supported");
   }
 
   @Test
   public void validateDownstreamTlsContext_noCommonTlsContext() throws ResourceInvalidException {
     DownstreamTlsContext downstreamTlsContext = DownstreamTlsContext.getDefaultInstance();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsListenerResource.validateDownstreamTlsContext(downstreamTlsContext, null));
-    assertThat(e).hasMessageThat().isEqualTo("common-tls-context is required in downstream-tls-context");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "common-tls-context is required in downstream-tls-context");
   }
 
   @Test
@@ -3396,7 +3399,8 @@ public void validateDownstreamTlsContext_hasRequireSni() throws ResourceInvalidE
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
         XdsListenerResource.validateDownstreamTlsContext(downstreamTlsContext,
             ImmutableSet.of("")));
-    assertThat(e).hasMessageThat().isEqualTo("downstream-tls-context with require-sni is not supported");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "downstream-tls-context with require-sni is not supported");
   }
 
   @Test
@@ -3425,7 +3429,8 @@ public void validateUpstreamTlsContext_noCommonTlsContext() throws ResourceInval
     UpstreamTlsContext upstreamTlsContext = UpstreamTlsContext.getDefaultInstance();
     ResourceInvalidException e = assertThrows(ResourceInvalidException.class, () ->
             XdsClusterResource.validateUpstreamTlsContext(upstreamTlsContext, null));
-    assertThat(e).hasMessageThat().isEqualTo("common-tls-context is required in upstream-tls-context");
+    assertThat(e).hasMessageThat().isEqualTo(
+        "common-tls-context is required in upstream-tls-context");
   }
 
   @Test

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

@@ -18,8 +18,8 @@
 
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
 import static io.grpc.Metadata.ASCII_STRING_MARSHALLER;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;