Fixup 12645: Address comments around whitespace and grfc inconcistency

Author: sauravzg

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

@@ -114,13 +114,17 @@ public void parseLoadBalancingConfigDefaultValues() throws IOException {
   @Test
   public void parseLoadBalancingConfigCustomMetrics() throws IOException {
     System.setProperty("GRPC_EXPERIMENTAL_WRR_CUSTOM_METRICS", "true");
-    String lbConfig = "{\"metricNamesForComputingUtilization\" : [\"foo\", \"bar\"]}";
-    ConfigOrError configOrError = provider.parseLoadBalancingPolicyConfig(
-        parseJsonObject(lbConfig));
-    assertThat(configOrError.getConfig()).isNotNull();
-    WeightedRoundRobinLoadBalancerConfig config =
-        (WeightedRoundRobinLoadBalancerConfig) configOrError.getConfig();
-    assertThat(config.metricNamesForComputingUtilization).containsExactly("foo", "bar");
+    try {
+      String lbConfig = "{\"metricNamesForComputingUtilization\" : [\"foo\", \"bar\"]}";
+      ConfigOrError configOrError = provider.parseLoadBalancingPolicyConfig(
+          parseJsonObject(lbConfig));
+      assertThat(configOrError.getConfig()).isNotNull();
+      WeightedRoundRobinLoadBalancerConfig config =
+          (WeightedRoundRobinLoadBalancerConfig) configOrError.getConfig();
+      assertThat(config.metricNamesForComputingUtilization).containsExactly("foo", "bar");
+    } finally {
+      System.clearProperty("GRPC_EXPERIMENTAL_WRR_CUSTOM_METRICS");
+    }
   }
 
 

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

@@ -1402,8 +1402,6 @@ public void customMetric_invalid_fallbackToAppUtil() {
         any());
   }
 
-
-
   @Test
   public void customMetric_mapLookup_used() {
     weightedConfig = WeightedRoundRobinLoadBalancerConfig.newBuilder().setBlackoutPeriodNanos(0)
@@ -1579,7 +1577,6 @@ public void customMetric_mixInvalidAndValid_validUsed() {
         any());
   }
 
-
   // Verifies that the MetricRecorder has been called to record a long counter value of 1 for the
   // given metric name, the given number of times
   private void verifyLongCounterRecord(String name, int times, long value) {

xds/src/test/java/io/grpc/xds/internal/MetricReportUtilsTest.java

@@ -58,7 +58,6 @@ public void getMetric_memUtilization() {
     assertEquals(0.2, result.getAsDouble(), 0.0001);
   }
 
-
   @Test
   public void getMetric_utilizationMetric() {
     Map<String, Double> utilizationMetrics = new HashMap<>();
@@ -69,17 +68,14 @@ public void getMetric_utilizationMetric() {
     OptionalDouble result = MetricReportUtils.getMetric(report, "utilization.foo");
     assertTrue(result.isPresent());
     assertEquals(1.23, result.getAsDouble(), 0.0001);
-
     assertFalse(MetricReportUtils.getMetric(report, "utilization.bar").isPresent());
   }
 
-
   @Test
   public void getMetric_namedMetric() {
     Map<String, Double> namedMetrics = new HashMap<>();
     namedMetrics.put("foo", 7.89);
     MetricReport report = createMetricReport(0, 0, 0, 0, 0, namedMetrics);
-
     OptionalDouble result = MetricReportUtils.getMetric(report, "named_metrics.foo");
     assertTrue(result.isPresent());
     assertEquals(7.89, result.getAsDouble(), 0.0001);