[FLINK-39408][tests] Fix TestNameProvider broken after JUnit 5 migration

1996fanrui · 1996fanrui · commit 62cb6c5fc379 · 2026-04-08T20:42:57.000+02:00
TestNameProvider is a JUnit 4 TestRule that stores the test name in a ThreadLocal. After FLINK-39124 migrated modules to JUnit 5, the @rule is never triggered, so PseudoRandomValueSelector.randomize() always gets null from getCurrentTestName(), causing all boolean config randomizations to select the same fixed value. Fix: add TestNameProviderExtension (JUnit 5 BeforeEachCallback / AfterEachCallback) that delegates to TestNameProvider's static methods. TestNameProvider itself does not depend on JUnit 5 APIs, avoiding ClassNotFoundException in non-test runtime environments (e.g. PyFlink). Register TestNameProviderExtension globally via META-INF/services in all modules.
diff --git a/flink-clients/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-clients/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-connectors/flink-connector-base/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-connectors/flink-connector-base/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-connectors/flink-connector-files/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-connectors/flink-connector-files/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-connectors/flink-file-sink-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-connectors/flink-file-sink-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-connectors/flink-hadoop-compatibility/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-connectors/flink-hadoop-compatibility/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-container/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-container/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-docs/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-docs/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-examples/flink-examples-table/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-examples/flink-examples-table/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-external-resources/flink-external-resource-gpu/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-external-resources/flink-external-resource-gpu/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-avro-confluent-registry/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-avro-confluent-registry/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-avro/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-avro/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-compress/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-compress/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-hadoop-bulk/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-hadoop-bulk/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-json/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-json/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-orc-nohive/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-orc-nohive/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-orc/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-orc/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-parquet/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-parquet/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-formats/flink-sequence-file/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-formats/flink-sequence-file/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-kubernetes/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-kubernetes/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-datadog/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-datadog/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-dropwizard/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-dropwizard/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-graphite/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-graphite/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-influxdb/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-influxdb/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-jmx/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-jmx/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-prometheus/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-prometheus/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-slf4j/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-slf4j/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-metrics/flink-metrics-statsd/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-metrics/flink-metrics-statsd/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-python/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-python/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-queryable-state/flink-queryable-state-runtime/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-queryable-state/flink-queryable-state-runtime/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-rpc/flink-rpc-akka-loader/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-rpc/flink-rpc-akka-loader/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-rpc/flink-rpc-akka/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-rpc/flink-rpc-akka/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-rpc/flink-rpc-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-rpc/flink-rpc-core/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-runtime-web/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-runtime-web/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-runtime/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-runtime/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -32,3 +32,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-state-backends/flink-statebackend-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-state-backends/flink-statebackend-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-state-backends/flink-statebackend-heap-spillable/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-state-backends/flink-statebackend-heap-spillable/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-streaming-java/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-streaming-java/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-sql-client/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-sql-client/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-sql-gateway/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-sql-gateway/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-sql-parser/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-sql-parser/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-api-java-bridge/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-api-java-bridge/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-api-java/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-api-java/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-api-scala/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-api-scala/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-code-splitter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-code-splitter/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-common/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-table/flink-table-planner/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-table/flink-table-planner/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -13,4 +13,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProvider.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProvider.java
@@ -24,8 +24,11 @@
 import javax.annotation.Nullable;
 
 /**
- * A rule that provides the current test name per thread. Currently, the test name is available for
- * all tests that extend {@link TestLogger}.
+ * Provides the current test name per thread. For JUnit 4, this works as a {@link TestRule}
+ * registered in {@link TestLogger}. For JUnit 5, use {@link TestNameProviderExtension}.
+ *
+ * <p>This class must NOT depend on JUnit 5 APIs because it is loaded at runtime (not only in test
+ * environments) via {@link org.apache.flink.runtime.testutils.PseudoRandomValueSelector#randomize}.
  */
 public class TestNameProvider implements TestRule {
     private static ThreadLocal<String> testName = new ThreadLocal<>();
@@ -35,6 +38,14 @@ public static String getCurrentTestName() {
         return testName.get();
     }
 
+    static void setCurrentTestName(String name) {
+        testName.set(name);
+    }
+
+    static void clearCurrentTestName() {
+        testName.set(null);
+    }
+
     @Override
     public Statement apply(Statement base, Description description) {
         return new Statement() {
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProviderExtension.java b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProviderExtension.java
diff --git a/flink-test-utils-parent/flink-test-utils-junit/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-test-utils-parent/flink-test-utils-junit/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/flink-test-utils-parent/flink-test-utils/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-test-utils-parent/flink-test-utils/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SnapshotFileMergingCompatibilityITCase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SnapshotFileMergingCompatibilityITCase.java
diff --git a/flink-tests/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-tests/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/flink-yarn-tests/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-yarn-tests/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/flink-yarn/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/flink-yarn/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/tools/ci/flink-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/tools/ci/flink-ci-tools/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@`
`14`	`14`	`# limitations under the License.`
`15`	`15`
`16`	`16`	`org.apache.flink.util.TestLoggerExtension`
	`17`	`+org.apache.flink.util.TestNameProviderExtension`