Cleaned up integration tests (#1101)

Signed-off-by: dhoard <[email protected]>
prometheus · Dec 18, 2024 · 3f90ac2 · 3f90ac2
1 parent 0a35c0b
commit 3f90ac2
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 182 deletions.
diff --git a/...integration_tests/src/test/java/io/prometheus/jmx/test/core/BlacklistObjectNamesTest.java b/...integration_tests/src/test/java/io/prometheus/jmx/test/core/BlacklistObjectNamesTest.java
@@ -77,7 +77,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -91,10 +91,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -108,8 +105,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -123,10 +119,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -145,9 +138,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...ite/integration_tests/src/test/java/io/prometheus/jmx/test/core/CompositeKeyDataTest.java b/...ite/integration_tests/src/test/java/io/prometheus/jmx/test/core/CompositeKeyDataTest.java
@@ -76,7 +76,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -90,10 +90,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -107,8 +104,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -122,10 +118,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -144,9 +137,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...src/test/java/io/prometheus/jmx/test/core/DisableAutoExcludeObjectNameAttributesTest.java b/...src/test/java/io/prometheus/jmx/test/core/DisableAutoExcludeObjectNameAttributesTest.java
@@ -78,7 +78,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -92,10 +92,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -109,8 +106,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -124,10 +120,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -146,9 +139,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...tion_tests/src/test/java/io/prometheus/jmx/test/core/ExcludeObjectNameAttributesTest.java b/...tion_tests/src/test/java/io/prometheus/jmx/test/core/ExcludeObjectNameAttributesTest.java
@@ -78,7 +78,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -92,10 +92,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -109,8 +106,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -124,10 +120,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -146,9 +139,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/ExcludeObjectNamesTest.java b/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/ExcludeObjectNamesTest.java
@@ -77,7 +77,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -91,10 +91,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -108,8 +105,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -123,10 +119,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -145,9 +138,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...ion_tests/src/test/java/io/prometheus/jmx/test/core/IncludeAndExcludeObjectNamesTest.java b/...ion_tests/src/test/java/io/prometheus/jmx/test/core/IncludeAndExcludeObjectNamesTest.java
@@ -77,7 +77,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -91,10 +91,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -108,8 +105,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -123,10 +119,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -145,9 +138,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);

diff --git a/...tion_tests/src/test/java/io/prometheus/jmx/test/core/IncludeObjectNameAttributesTest.java b/...tion_tests/src/test/java/io/prometheus/jmx/test/core/IncludeObjectNameAttributesTest.java
@@ -80,7 +80,7 @@ public void testDefaultTextMetrics(ExporterTestEnvironment exporterTestEnvironme
 
         HttpResponse httpResponse = HttpClient.sendRequest(url);
 
-        assertMetricsResponse(exporterTestEnvironment, httpResponse, MetricsContentType.DEFAULT);
+        assertMetricsResponse(httpResponse, MetricsContentType.DEFAULT);
     }
 
     @Verifyica.Test
@@ -94,10 +94,7 @@ public void testOpenMetricsTextMetrics(ExporterTestEnvironment exporterTestEnvir
                         HttpHeader.ACCEPT,
                         MetricsContentType.OPEN_METRICS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.OPEN_METRICS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.OPEN_METRICS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -111,8 +108,7 @@ public void testPrometheusTextMetrics(ExporterTestEnvironment exporterTestEnviro
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_TEXT_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment, httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_TEXT_METRICS);
     }
 
     @Verifyica.Test
@@ -126,10 +122,7 @@ public void testPrometheusProtobufMetrics(ExporterTestEnvironment exporterTestEn
                         HttpHeader.ACCEPT,
                         MetricsContentType.PROMETHEUS_PROTOBUF_METRICS.toString());
 
-        assertMetricsResponse(
-                exporterTestEnvironment,
-                httpResponse,
-                MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
+        assertMetricsResponse(httpResponse, MetricsContentType.PROMETHEUS_PROTOBUF_METRICS);
     }
 
     @Verifyica.AfterAll
@@ -148,9 +141,7 @@ public static void conclude(ClassContext classContext) throws Throwable {
     }
 
     private void assertMetricsResponse(
-            ExporterTestEnvironment exporterTestEnvironment,
-            HttpResponse httpResponse,
-            MetricsContentType metricsContentType) {
+            HttpResponse httpResponse, MetricsContentType metricsContentType) {
         assertCommonMetricsResponse(httpResponse, metricsContentType);
 
         Collection<Metric> metrics = MetricsParser.parseCollection(httpResponse);