cleanup

Signed-off-by: Gregor Zeitlinger <[email protected]>

Author: zeitlinger

prometheus-metrics-model/src/test/java/io/prometheus/metrics/model/snapshots/PrometheusNamingTest.java

@@ -1,5 +1,15 @@
 package io.prometheus.metrics.model.snapshots;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junitpioneer.jupiter.SetSystemProperty;
+
+import java.util.stream.Stream;
+
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeMetricSnapshot;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.escapeName;
 import static io.prometheus.metrics.model.snapshots.PrometheusNaming.isValidLabelName;
@@ -13,15 +23,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import java.util.stream.Stream;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junitpioneer.jupiter.SetSystemProperty;
-
 class PrometheusNamingTest {
 
   @AfterEach
@@ -296,7 +297,7 @@ static Stream<Arguments> escapeNameUtf8TestCases() {
   @CsvSource(
       value = {
         // empty string
-        ",",
+        "'',''",
         // basic case, no error
         "U__no:unescapingrequired,no:unescapingrequired",
         // capitals ok, no error
@@ -317,12 +318,6 @@ static Stream<Arguments> escapeNameUtf8TestCases() {
         "U__bad__utf_D900_,U__bad__utf_D900_",
       })
   public void testValueUnescapeErrors(String escapedName, String expectedUnescapedName) {
-    if (escapedName == null) {
-      escapedName = "";
-    }
-    if (expectedUnescapedName == null) {
-      expectedUnescapedName = "";
-    }
     assertThat(unescapeName(escapedName, EscapingScheme.VALUE_ENCODING_ESCAPING))
         .isEqualTo(expectedUnescapedName);
   }