HHH-19832 Upgrade to JUnit 6.0

marko-bekhta · marko-bekhta · commit aa4d85cb317a · 2025-10-02T12:32:04.000+02:00
diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle
@@ -57,7 +57,7 @@ configurations {
 
 	javadocClasspath {
 		description = 'Class files for the javadoc to be built'
-		resolutionStrategy.capabilitiesResolution.withCapability('org.junit.jupiter:junit-jupiter-params:'+testLibs.versions.junit5.get()) { details ->
+		resolutionStrategy.capabilitiesResolution.withCapability('org.junit.jupiter:junit-jupiter-params:'+testLibs.versions.junitJupiter.get()) { details ->
 			details.select( details.candidates.first() ).because( 'first' )
 		}
 
diff --git a/hibernate-testing/README.adoc b/hibernate-testing/README.adoc
@@ -1,7 +1,7 @@
 The `hibernate-testing` module of Hibernate ORM defines utilities for writing
 tests easier.
 
-This documentation focuses on the JUnit 5 & annotation based testing support...
+This documentation focuses on the JUnit 6 & annotation based testing support...
 
 
-// todo (6.1) : write more (duh)
+// todo (6.1) : write more (duh)
diff --git a/hibernate-testing/hibernate-testing.gradle b/hibernate-testing/hibernate-testing.gradle
@@ -15,8 +15,8 @@ dependencies {
     api project( ':hibernate-community-dialects' )
 
     api testLibs.junit4
-    api testLibs.junit5Api
-    api testLibs.junit5Params
+    api testLibs.junitJupiterApi
+    api testLibs.junitJupiterParams
 
     api testLibs.hamcrest
     api testLibs.assertjCore
@@ -55,8 +55,8 @@ dependencies {
         // Since we don't need WildFly Elytron in our tests, we'll just exclude it.
         exclude group: 'org.wildfly.security', module: 'wildfly-elytron'
     }
-    implementation testLibs.junit5Engine
-    implementation testLibs.junit5Launcher
+    implementation testLibs.junitJupiterEngine
+    implementation testLibs.junitJupiterLauncher
 
     annotationProcessor project( ':hibernate-processor' )
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java
@@ -15,7 +15,7 @@
  * except this annotation need not be attached to a static method
  *
  * @author Steve Ebersole
- * @deprecated Use JUnit 5 along with one of the Hibernate ORM's class-level test annotations
+ * @deprecated Use JUnit Jupiter along with one of the Hibernate ORM's class-level test annotations
  * ({@link org.hibernate.testing.orm.junit.BaseUnitTest},
  * {@link org.hibernate.testing.orm.junit.SessionFactory},
  * {@link org.hibernate.testing.orm.junit.Jpa},
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java b/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java
@@ -15,7 +15,7 @@
  * except this annotation need not be attached to a static method
  *
  * @author Steve Ebersole
- * @deprecated Use JUnit 5 along with one of the Hibernate ORM's class-level test annotations
+ * @deprecated Use JUnit Jupiter along with one of the Hibernate ORM's class-level test annotations
  * ({@link org.hibernate.testing.orm.junit.BaseUnitTest},
  * {@link org.hibernate.testing.orm.junit.SessionFactory},
  * {@link org.hibernate.testing.orm.junit.Jpa},
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java b/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java
@@ -14,7 +14,7 @@
  *
  * @author Hardy Ferentschik
  * @author Steve Ebersole
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.FailureExpected} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.FailureExpected} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
@@ -13,7 +13,7 @@
  * Annotation used to identify a method as a callback to be executed whenever a {@link FailureExpected} is handled.
  *
  * @author Steve Ebersole
- * @deprecated No replacement with JUnit 5 at the moment.
+ * @deprecated No replacement with JUnit Jupiter at the moment.
  */
 @Retention( RetentionPolicy.RUNTIME )
 @Target( ElementType.METHOD )
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java b/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java
@@ -13,7 +13,7 @@
  * Annotation used to identify a method as a callback to be executed on test failures.
  *
  * @author Steve Ebersole
- * @deprecated No replacement with JUnit 5 at the moment.
+ * @deprecated No replacement with JUnit Jupiter at the moment.
  */
 @Retention( RetentionPolicy.RUNTIME )
 @Target( ElementType.METHOD )
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java
@@ -19,7 +19,7 @@
  * @see RequiresDialects
  *
  * @author Hardy Ferentschik
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialect} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.RequiresDialect} instead.
  */
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java
@@ -14,7 +14,7 @@
  * specified feature.
  *
  * @author Hardy Ferentschik
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialectFeature} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.RequiresDialectFeature} instead.
  */
 @Target({ ElementType.METHOD, ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java
@@ -14,7 +14,7 @@
  * Useful when test needs to be run against more than one dialect because of a different reason.
  *
  * @author Lukasz Antoniak
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialects} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.RequiresDialects} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java b/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java
@@ -13,7 +13,7 @@
  * An annotation, used in combination with {@link Matcher}, to determine when/if tests should be skipped.
  *
  * @author Steve Ebersole
- * @deprecated Use JUnit 5 and {@link org.junit.jupiter.api.condition.DisabledOnOs}
+ * @deprecated Use JUnit Jupiter and {@link org.junit.jupiter.api.condition.DisabledOnOs}
  * or {@link org.junit.jupiter.api.condition.DisabledIf}.
  */
 @Retention( RetentionPolicy.RUNTIME )
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java
@@ -20,7 +20,7 @@
  *
  * @author Hardy Ferentschik
  * @author Steve Ebersole
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.SkipForDialect} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.SkipForDialect} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java b/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java
@@ -14,7 +14,7 @@
  * Useful when more than one dialect needs to be skipped because of a different reason.
  *
  * @author Lukasz Antoniak
- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.SkipForDialectGroup} instead.
+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.SkipForDialectGroup} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
@@ -41,16 +41,16 @@
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
 import org.junit.jupiter.engine.descriptor.JupiterEngineDescriptor;
-import org.junit.jupiter.engine.descriptor.LauncherStoreFacade;
 import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
 import org.junit.jupiter.engine.descriptor.TestTemplateTestDescriptor;
 import org.junit.jupiter.engine.execution.JupiterEngineExecutionContext;
+import org.junit.jupiter.engine.execution.LauncherStoreFacade;
 import org.junit.platform.engine.EngineDiscoveryRequest;
 import org.junit.platform.engine.EngineExecutionListener;
 import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.OutputDirectoryCreator;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
-import org.junit.platform.engine.reporting.OutputDirectoryProvider;
 import org.junit.platform.engine.support.hierarchical.EngineExecutionContext;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
@@ -278,8 +278,8 @@ public Optional<String> getRawConfigurationParameter(String s) {
 		}
 
 		@Override
-		public <T> Optional<T> getRawConfigurationParameter(String s, Function<String, T> function) {
-			return configuration.getRawConfigurationParameter( s, function );
+		public <T> Optional<T> getRawConfigurationParameter(String key, Function<? super String, ? extends T> transformer) {
+			return configuration.getRawConfigurationParameter(  key, transformer );
 		}
 
 		@Override
@@ -353,8 +353,8 @@ public TestInstantiationAwareExtension.ExtensionContextScope getDefaultTestInsta
 		}
 
 		@Override
-		public OutputDirectoryProvider getOutputDirectoryProvider() {
-			return configuration.getOutputDirectoryProvider();
+		public OutputDirectoryCreator getOutputDirectoryCreator() {
+			return configuration.getOutputDirectoryCreator();
 		}
 	}
 
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFilterExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFilterExtension.java
@@ -19,7 +19,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * JUnit 5 extension used to add {@link RequiresDialect} and {@link SkipForDialect}
+ * JUnit Jupiter extension used to add {@link RequiresDialect} and {@link SkipForDialect}
  * handling
  *
  * @author Steve Ebersole
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/FailureExpectedExtension.java
@@ -16,7 +16,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * JUnit 5 extension used to support {@link FailureExpected} handling
+ * JUnit Jupiter extension used to support {@link FailureExpected} handling
  *
  * @author Steve Ebersole
  */
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/NotImplementedYetExtension.java
@@ -19,7 +19,7 @@
 import static org.hibernate.testing.orm.junit.FailureExpectedExtension.failureExpectedValidation;
 
 /**
- * JUnit 5 extension used to support {@link NotImplementedYet} handling
+ * JUnit Jupiter extension used to support {@link NotImplementedYet} handling
  *
  * @author Jan Schatteman
  */
diff --git a/local-build-plugins/src/main/groovy/local.java-module.gradle b/local-build-plugins/src/main/groovy/local.java-module.gradle
@@ -52,13 +52,13 @@ dependencies {
     }
 
     // JUnit dependencies made up of:
-    // 		* JUnit 5
-    // 		* the Jupiter engine which runs JUnit 5 based tests
+    // 		* JUnit 6
+    // 		* the Jupiter engine which runs JUnit 6 based tests
     //		* the "vintage" engine - which runs JUnit 3 and 4 based tests
-    testImplementation testLibs.junit5Api
-    testImplementation testLibs.junit5Engine
-    testImplementation testLibs.junit5Params
-    testImplementation testLibs.junit5Launcher
+    testImplementation testLibs.junitJupiterApi
+    testImplementation testLibs.junitJupiterEngine
+    testImplementation testLibs.junitJupiterParams
+    testImplementation testLibs.junitJupiterLauncher
     testImplementation testLibs.junit4
     testImplementation testLibs.junit4Engine
     testImplementation testLibs.assertjCore
diff --git a/settings.gradle b/settings.gradle
@@ -167,9 +167,9 @@ dependencyResolutionManagement {
             library( "jaxb", "org.glassfish.jaxb", "jaxb-runtime" ).versionRef( jaxbRuntimeVersion )
         }
         testLibs {
-            def junit5Version = version "junit5", "5.13.4"
+            def junitJupiterVersion = version "junitJupiter", "6.0.0"
             def junit4Version = version "junit4", "4.13.2"
-            def junit5LauncherVersion = version "junit5Launcher", "1.13.4"
+            def junitJupiterLauncherVersion = version "junitJupiterLauncher", "6.0.0"
 
             def assertjVersion = version "assertj", "3.26.3"
             def hamcrestVersion = version "hamcrest", "3.0"
@@ -189,11 +189,11 @@ dependencyResolutionManagement {
 
             library( "validator", "org.hibernate.validator", "hibernate-validator" ).versionRef( hibernateValidatorVersion )
 
-            library( "junit5Api", "org.junit.jupiter", "junit-jupiter-api" ).versionRef( junit5Version )
-            library( "junit5Engine", "org.junit.jupiter", "junit-jupiter-engine" ).versionRef( junit5Version )
-            library( "junit5Params", "org.junit.jupiter", "junit-jupiter-params" ).versionRef( junit5Version )
-            library( "junit4Engine", "org.junit.vintage", "junit-vintage-engine" ).versionRef( junit5Version )
-            library( "junit5Launcher", "org.junit.platform", "junit-platform-launcher" ).versionRef( junit5LauncherVersion )
+            library( "junitJupiterApi", "org.junit.jupiter", "junit-jupiter-api" ).versionRef( junitJupiterVersion )
+            library( "junitJupiterEngine", "org.junit.jupiter", "junit-jupiter-engine" ).versionRef( junitJupiterVersion )
+            library( "junitJupiterParams", "org.junit.jupiter", "junit-jupiter-params" ).versionRef( junitJupiterVersion )
+            library( "junit4Engine", "org.junit.vintage", "junit-vintage-engine" ).versionRef( junitJupiterVersion )
+            library( "junitJupiterLauncher", "org.junit.platform", "junit-platform-launcher" ).versionRef( junitJupiterLauncherVersion )
             library( "junit4", "junit", "junit" ).versionRef( junit4Version )
 
             library( "assertjCore", "org.assertj", "assertj-core" ).versionRef( assertjVersion )
diff --git a/test-case-guide.adoc b/test-case-guide.adoc
@@ -13,10 +13,10 @@ There are a number of tenants that make up a good test case as opposed to a poor
 * (V)erifiable - The test should actually reproduce the problem being reported.
 
 
-[[junit5]]
-== JUnit 5 extensions
+[[junit-jupiter]]
+== [[junit5]] JUnit Jupiter (6) extensions
 
-JUnit 5 offers better support for integration, compared to JUnit 4, via https://junit.org/junit5/docs/current/user-guide/#extensions[extensions].  Hibernate builds on those concepts in its `hibernate-testing` module allowing set up of test fixtures using annotations.  The following sections describe the Hibernate extensions.
+JUnit 6 offers better support for integration, compared to JUnit 4, via https://junit.org/junit5/docs/current/user-guide/#extensions[extensions].  Hibernate builds on those concepts in its `hibernate-testing` module allowing set up of test fixtures using annotations.  The following sections describe the Hibernate extensions.
 
 NOTE: The extensions exist in the `org.hibernate.testing.orm.junit` package, as opposed to the older `org.hibernate.testing.junit4` package used with JUnit 4.
 
@@ -29,7 +29,7 @@ Manages a `ServiceRegistry` as part of the test lifecycle.  2 in fact, depending
 `@BootstrapServiceRegistry`:: configures Hibernate's bootstrap `BootstrapServiceRegistry` which manages class-loading, etc.  `@BootstrapServiceRegistry` is used to provide Java services and Hibernate `Integrator` implementations for the test.
 `@ServiceRegistry`:: configures Hibernate's standard `StandardServiceRegistry`.  `@ServiceRegistry` is used to provide settings, contributors, services, etc.
 
-Also exposes `ServiceRegistryScope` via JUnit 5 `ParameterResolver`.  `ServiceRegistryScope` allows
+Also exposes `ServiceRegistryScope` via JUnit 6 `ParameterResolver`.  `ServiceRegistryScope` allows
 access to the managed `ServiceRegistry` from tests and callbacks.
 
 ```
@@ -191,7 +191,7 @@ The distinction with `@Jpa` is that `EntityManagerExtension` uses the JPA-define
 
 == JUnit 4
 
-Historically, Hibernate used JUnit 4 for its test suite.  Since the release of https://junit.org/junit5/[JUnit 5], we've moved to using the testing approach outlined in <<junit5>>.  However, many existing tests still use the legacy JUnit 4 based infrastructure (boilerplate) based on "test templates".
+Historically, Hibernate used JUnit 4 for its test suite.  Since the release of https://junit.org/junit5/[JUnit 5], we've moved to using the testing approach outlined in <<junit-jupiter>>.  However, many existing tests still use the legacy JUnit 4 based infrastructure (boilerplate) based on "test templates".
 
 
 === Test templates
diff --git a/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle b/tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle
@@ -32,10 +32,10 @@ dependencies {
 
 	testImplementation gradleTestKit()
 	testImplementation testLibs.assertjCore
-	testImplementation testLibs.junit5Api
+	testImplementation testLibs.junitJupiterApi
 
-	testRuntimeOnly testLibs.junit5Engine
-	testRuntimeOnly testLibs.junit5Launcher
+	testRuntimeOnly testLibs.junitJupiterEngine
+	testRuntimeOnly testLibs.junitJupiterLauncher
 }
 
 gradlePlugin {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ configurations {`
`57`	`57`
`58`	`58`	`javadocClasspath {`
`59`	`59`	`description = 'Class files for the javadoc to be built'`
`60`		`- resolutionStrategy.capabilitiesResolution.withCapability('org.junit.jupiter:junit-jupiter-params:'+testLibs.versions.junit5.get()) { details ->`
	`60`	`+ resolutionStrategy.capabilitiesResolution.withCapability('org.junit.jupiter:junit-jupiter-params:'+testLibs.versions.junitJupiter.get()) { details ->`
`61`	`61`	`details.select( details.candidates.first() ).because( 'first' )`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`* except this annotation need not be attached to a static method`
`16`	`16`	`*`
`17`	`17`	`* @author Steve Ebersole`
`18`		`- * @deprecated Use JUnit 5 along with one of the Hibernate ORM's class-level test annotations`
	`18`	`+ * @deprecated Use JUnit Jupiter along with one of the Hibernate ORM's class-level test annotations`
`19`	`19`	`* ({@link org.hibernate.testing.orm.junit.BaseUnitTest},`
`20`	`20`	`* {@link org.hibernate.testing.orm.junit.SessionFactory},`
`21`	`21`	`* {@link org.hibernate.testing.orm.junit.Jpa},`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @author Hardy Ferentschik`
`16`	`16`	`* @author Steve Ebersole`
`17`		`- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.FailureExpected} instead.`
	`17`	`+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.FailureExpected} instead.`
`18`	`18`	`*/`
`19`	`19`	`@Retention(RetentionPolicy.RUNTIME)`
`20`	`20`	`@Target({ ElementType.METHOD, ElementType.TYPE })`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* Annotation used to identify a method as a callback to be executed whenever a {@link FailureExpected} is handled.`
`14`	`14`	`*`
`15`	`15`	`* @author Steve Ebersole`
`16`		`- * @deprecated No replacement with JUnit 5 at the moment.`
	`16`	`+ * @deprecated No replacement with JUnit Jupiter at the moment.`
`17`	`17`	`*/`
`18`	`18`	`@Retention( RetentionPolicy.RUNTIME )`
`19`	`19`	`@Target( ElementType.METHOD )`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`* @see RequiresDialects`
`20`	`20`	`*`
`21`	`21`	`* @author Hardy Ferentschik`
`22`		`- * @deprecated Use JUnit 5 and {@link org.hibernate.testing.orm.junit.RequiresDialect} instead.`
	`22`	`+ * @deprecated Use JUnit Jupiter and {@link org.hibernate.testing.orm.junit.RequiresDialect} instead.`
`23`	`23`	`*/`
`24`	`24`	`@Target({ ElementType.METHOD, ElementType.TYPE })`
`25`	`25`	`@Retention(RetentionPolicy.RUNTIME)`