Refactored test environment factory methods (#1074)

Signed-off-by: dhoard <[email protected]>
prometheus · Nov 30, 2024 · 46502fc · 46502fc
1 parent df2b728
commit 46502fc
Show file tree

Hide file tree

Showing 44 changed files with 93 additions and 172 deletions.
diff --git a/...ntegration_tests/src/test/java/io/prometheus/jmx/test/core/AutoIncrementingMBeanTest.java b/...ntegration_tests/src/test/java/io/prometheus/jmx/test/core/AutoIncrementingMBeanTest.java
@@ -23,7 +23,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -52,7 +51,7 @@ public class AutoIncrementingMBeanTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...ion_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicTest.java b/...ion_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicTest.java
@@ -23,7 +23,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -51,7 +50,7 @@ public class BasicTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class BlacklistObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -45,7 +44,7 @@ public class CompositeKeyDataTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...src/test/java/io/prometheus/jmx/test/core/DisableAutoExcludeObjectNameAttributesTest.java b/...src/test/java/io/prometheus/jmx/test/core/DisableAutoExcludeObjectNameAttributesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -47,7 +46,7 @@ public class DisableAutoExcludeObjectNameAttributesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -47,7 +46,7 @@ public class ExcludeObjectNameAttributesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class ExcludeObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class IncludeAndExcludeObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

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
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -49,7 +48,7 @@ public class IncludeObjectNameAttributesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/IncludeObjectNamesTest.java b/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/IncludeObjectNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class IncludeObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...ion_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputAndLabelNamesTest.java b/...ion_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputAndLabelNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class LowerCaseOutputAndLabelNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...ration_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputLabelNamesTest.java b/...ration_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputLabelNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class LowerCaseOutputLabelNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...integration_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputNamesTest.java b/...integration_tests/src/test/java/io/prometheus/jmx/test/core/LowerCaseOutputNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class LowerCaseOutputNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/OptionalValueMBeanTest.java b/...e/integration_tests/src/test/java/io/prometheus/jmx/test/core/OptionalValueMBeanTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -47,7 +46,7 @@ public class OptionalValueMBeanTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...tests/src/test/java/io/prometheus/jmx/test/core/WhitelistAndBlacklistObjectNamesTest.java b/...tests/src/test/java/io/prometheus/jmx/test/core/WhitelistAndBlacklistObjectNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class WhitelistAndBlacklistObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...integration_tests/src/test/java/io/prometheus/jmx/test/core/WhitelistObjectNamesTest.java b/...integration_tests/src/test/java/io/prometheus/jmx/test/core/WhitelistObjectNamesTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
 import io.prometheus.jmx.test.support.http.HttpClient;
@@ -46,7 +45,7 @@ public class WhitelistObjectNamesTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/..._tests/src/test/java/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest.java b/..._tests/src/test/java/io/prometheus/jmx/test/http/CompleteHttpServerConfigurationTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -63,7 +62,7 @@ public static Stream<ExporterTestEnvironment> arguments() {
         // Filter eclipse-temurin:8 based Alpine images due to missing TLS cipher suites
         // https://github.com/adoptium/temurin-build/issues/3002
         // https://bugs.openjdk.org/browse/JDK-8306037
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments()
+        return ExporterTestEnvironment.createExporterTestEnvironments()
                 .filter(
                         exporterTestEnvironment ->
                                 !exporterTestEnvironment

diff --git a/...sts/src/test/java/io/prometheus/jmx/test/http/authentication/AuthenticatorPluginTest.java b/...sts/src/test/java/io/prometheus/jmx/test/http/authentication/AuthenticatorPluginTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -58,7 +57,7 @@ public class AuthenticatorPluginTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments()
+        return ExporterTestEnvironment.createExporterTestEnvironments()
                 .filter(
                         exporterTestEnvironment ->
                                 exporterTestEnvironment.getJmxExporterMode()

diff --git a/...io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test.java b/...io/prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA1Test.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.PBKDF2WithHmacExporterTestEnvironmentFilter;
@@ -59,7 +58,7 @@ public class BasicAuthenticationPBKDF2WithHmacSHA1Test {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments()
+        return ExporterTestEnvironment.createExporterTestEnvironments()
                 .filter(new PBKDF2WithHmacExporterTestEnvironmentFilter());
     }
 

diff --git a/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test.java b/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA256Test.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.PBKDF2WithHmacExporterTestEnvironmentFilter;
@@ -59,7 +58,7 @@ public class BasicAuthenticationPBKDF2WithHmacSHA256Test {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments()
+        return ExporterTestEnvironment.createExporterTestEnvironments()
                 .filter(new PBKDF2WithHmacExporterTestEnvironmentFilter());
     }
 

diff --git a/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test.java b/.../prometheus/jmx/test/http/authentication/BasicAuthenticationPBKDF2WithHmacSHA512Test.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.PBKDF2WithHmacExporterTestEnvironmentFilter;
@@ -59,7 +58,7 @@ public class BasicAuthenticationPBKDF2WithHmacSHA512Test {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments()
+        return ExporterTestEnvironment.createExporterTestEnvironments()
                 .filter(new PBKDF2WithHmacExporterTestEnvironmentFilter());
     }
 

diff --git a/...est/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest.java b/...est/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationPlaintextTest.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -58,7 +57,7 @@ public class BasicAuthenticationPlaintextTest {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare

diff --git a/...src/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test.java b/...src/test/java/io/prometheus/jmx/test/http/authentication/BasicAuthenticationSHA1Test.java
@@ -22,7 +22,6 @@
 
 import io.prometheus.jmx.test.support.ExporterPath;
 import io.prometheus.jmx.test.support.ExporterTestEnvironment;
-import io.prometheus.jmx.test.support.ExporterTestEnvironmentFactory;
 import io.prometheus.jmx.test.support.JmxExporterMode;
 import io.prometheus.jmx.test.support.MetricsType;
 import io.prometheus.jmx.test.support.TestSupport;
@@ -58,7 +57,7 @@ public class BasicAuthenticationSHA1Test {
 
     @Verifyica.ArgumentSupplier(parallelism = Integer.MAX_VALUE)
     public static Stream<ExporterTestEnvironment> arguments() {
-        return ExporterTestEnvironmentFactory.createExporterTestEnvironments();
+        return ExporterTestEnvironment.createExporterTestEnvironments();
     }
 
     @Verifyica.Prepare