Fix tests

Signed-off-by: Federico Torres <[email protected]>

Author: fedetorres93

prometheus-metrics-exposition-textformats/src/main/java/io/prometheus/metrics/expositionformats/TextFormatUtil.java

@@ -49,7 +49,7 @@ static void writeOpenMetricsTimestamp(Writer writer, long timestampMs) throws IO
     writer.write(Long.toString(ms));
   }
 
-  static void writeEscapedLabelValue(Writer writer, String s) throws IOException {
+  static void writeEscapedString(Writer writer, String s) throws IOException {
     // optimize for the common case where no escaping is needed
     int start = 0;
     // #indexOf is a vectorized intrinsic

prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/ExpositionFormatsTest.java

@@ -464,10 +464,12 @@ public void testGaugeWithDots() throws IOException {
   @Test
   public void testGaugeUTF8() throws IOException {
     String prometheusText =
-      "# HELP \"gauge.name\" gauge\\ndoc\\nstr\"ing\n" +
-        "# TYPE \"gauge.name\" gauge\n" +
-        "{\"gauge.name\",\"name*2\"=\"val with \\\\backslash and \\\"quotes\\\"\",\"name.1\"=\"val with\\nnew line\"} +Inf\n" +
-        "{\"gauge.name\",\"name*2\"=\"佖佥\",\"name.1\"=\"Björn\"} 3.14E42\n";
+      """
+      # HELP \"gauge.name\" gauge\\ndoc\\nstr\"ing
+      # TYPE \"gauge.name\" gauge
+      {\"gauge.name\",\"name*2\"=\"val with \\\\backslash and \\\"quotes\\\"\",\"name.1\"=\"val with\\nnew line\"} +Inf
+      {\"gauge.name\",\"name*2\"=\"佖佥\",\"name.1\"=\"Björn\"} 3.14E42
+      """;
     PrometheusNaming.nameValidationScheme = ValidationScheme.UTF_8_VALIDATION;
 
     GaugeSnapshot gauge = GaugeSnapshot.builder()
@@ -2872,26 +2874,19 @@ public void testWrite() throws IOException {
         .build())
       .build();
 
-    String acceptHeaderValue = "application/vnd.google.protobuf;proto=io.prometheus.client.MetricFamily;encoding=delimited";
-    nameEscapingScheme = EscapingScheme.fromAcceptHeader(acceptHeaderValue);
-    ExpositionFormatWriter protoWriter = expositionFormats.findWriter(acceptHeaderValue);
-
-    protoWriter.write(buff, MetricSnapshots.of(unknown));
-    byte[] out = buff.toByteArray();
-    assertThat(out.length).isNotEqualTo(0);
-
-    buff.reset();
-
-    acceptHeaderValue = "text/plain; version=0.0.4; charset=utf-8";
+    String acceptHeaderValue = "text/plain; version=0.0.4; charset=utf-8";
     nameEscapingScheme = EscapingScheme.fromAcceptHeader(acceptHeaderValue);
     ExpositionFormatWriter textWriter = expositionFormats.findWriter(acceptHeaderValue);
 
     textWriter.write(buff, MetricSnapshots.of(unknown));
-    out = buff.toByteArray();
+    byte[] out = buff.toByteArray();
     assertThat(out.length).isNotEqualTo(0);
 
-    String expected = "# TYPE foo_metric untyped\n" +
-      "foo_metric 1.234\n";
+    String expected =
+      """
+      # TYPE foo_metric untyped
+      foo_metric 1.234
+      """;
 
     assertThat(new String(out, UTF_8)).hasToString(expected);
   }

prometheus-metrics-exposition-textformats/src/test/java/io/prometheus/metrics/expositionformats/TextFormatUtilTest.java

@@ -19,7 +19,7 @@ void writeEscapedLabelValue() throws IOException {
 
   private static String escape(String s) throws IOException {
     StringWriter writer = new StringWriter();
-    TextFormatUtil.writeEscapedLabelValue(writer, s);
+    TextFormatUtil.writeEscapedString(writer, s);
     return writer.toString();
   }