This is an automated email from the ASF dual-hosted git repository.
fanrui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 62cb6c5fc37 [FLINK-39408][tests] Fix TestNameProvider broken after
JUnit 5 migration
62cb6c5fc37 is described below
commit 62cb6c5fc379e40fe4ca3d4f5ed6ab2beb367f92
Author: Rui Fan <[email protected]>
AuthorDate: Wed Apr 8 00:03:41 2026 +0200
[FLINK-39408][tests] Fix TestNameProvider broken after JUnit 5 migration
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.
---
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org/apache/flink/util/TestNameProvider.java | 15 ++++++--
.../flink/util/TestNameProviderExtension.java | 42 ++++++++++++++++++++++
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../org.junit.jupiter.api.extension.Extension | 3 +-
.../SnapshotFileMergingCompatibilityITCase.java | 4 +++
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 1 +
.../org.junit.jupiter.api.extension.Extension | 3 +-
57 files changed, 155 insertions(+), 44 deletions(-)
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index b1cb0eb2363..75f07406bf2 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 28999133c2b..75ae4ae1db3 100644
---
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
\ No newline at end of file
+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
index 2c91ef0c069..e4d9b366666 100644
---
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 org.junit.runners.model.Statement;
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 class TestNameProvider implements TestRule {
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
new file mode 100644
index 00000000000..29f093419b7
--- /dev/null
+++
b/flink-test-utils-parent/flink-test-utils-junit/src/main/java/org/apache/flink/util/TestNameProviderExtension.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.util;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * JUnit 5 extension that populates {@link TestNameProvider} with the current
test name. This is the
+ * JUnit 5 counterpart of the JUnit 4 {@link TestNameProvider} {@link
org.junit.rules.TestRule}.
+ *
+ * <p>This extension is registered globally via {@code
+ * META-INF/services/org.junit.jupiter.api.extension.Extension}.
+ */
+public class TestNameProviderExtension implements BeforeEachCallback,
AfterEachCallback {
+
+ @Override
+ public void beforeEach(ExtensionContext context) {
+ TestNameProvider.setCurrentTestName(context.getDisplayName());
+ }
+
+ @Override
+ public void afterEach(ExtensionContext context) {
+ TestNameProvider.clearCurrentTestName();
+ }
+}
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
index 28999133c2b..75ae4ae1db3 100644
---
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
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.util.TestLoggerExtension
\ No newline at end of file
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
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
index 28999133c2b..75ae4ae1db3 100644
---
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
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.util.TestLoggerExtension
\ No newline at end of file
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
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
index db156c5154c..25423b54108 100644
---
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
@@ -21,6 +21,7 @@ package org.apache.flink.test.checkpointing;
import org.apache.flink.configuration.CheckpointingOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.StateBackendOptions;
+import org.apache.flink.configuration.StateChangelogOptions;
import org.apache.flink.core.execution.RecoveryClaimMode;
import org.apache.flink.core.fs.FileStatus;
import org.apache.flink.core.fs.FileSystem;
@@ -117,6 +118,9 @@ class SnapshotFileMergingCompatibilityITCase {
config.set(CheckpointingOptions.INCREMENTAL_CHECKPOINTS, true);
config.set(CheckpointingOptions.FILE_MERGING_ACROSS_BOUNDARY,
fileMergingAcrossBoundary);
config.set(CheckpointingOptions.FILE_MERGING_ENABLED,
firstFileMergingSwitch);
+ // Disable changelog to avoid ChangelogStateBackendHandle wrapping the
state handles,
+ // which would break the type assertions in verifyStateHandleType.
+ config.set(StateChangelogOptions.ENABLE_STATE_CHANGE_LOG, false);
MiniClusterWithClientResource firstCluster =
new MiniClusterWithClientResource(
new MiniClusterResourceConfiguration.Builder()
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
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
index 0b74fd4603c..75ae4ae1db3 100644
---
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
@@ -14,3 +14,4 @@
# limitations under the License.
org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
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
index 28999133c2b..75ae4ae1db3 100644
---
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
@@ -13,4 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-org.apache.flink.util.TestLoggerExtension
\ No newline at end of file
+org.apache.flink.util.TestLoggerExtension
+org.apache.flink.util.TestNameProviderExtension
