HHH-19516 Upgrade to JUnit 5.13.0 for 6.6

Author: beikov

hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java

@@ -24,14 +24,15 @@
 import java.util.function.Supplier;
 
 import org.hibernate.testing.bytecode.enhancement.extension.BytecodeEnhanced;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.ClassOrderer;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExecutionCondition;
+import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.TestInstantiationAwareExtension;
 import org.junit.jupiter.api.io.CleanupMode;
 import org.junit.jupiter.api.io.TempDirFactory;
 import org.junit.jupiter.api.parallel.ExecutionMode;
@@ -48,6 +49,7 @@
 import org.junit.platform.engine.ExecutionRequest;
 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;
@@ -127,6 +129,7 @@ private void addEnhancementCheck(boolean enhance, String[] testEnhancedClasses,
 									descriptor.getTestClass().getName()
 							),
 					descriptor.getTestClass(),
+					descriptor::getEnclosingTestClasses,
 					jc,
 					enhance,
 					testEnhancedClasses
@@ -162,6 +165,7 @@ private void replaceWithEnhanced(Class<?> enhanced, ClassBasedTestDescriptor des
 								convertUniqueId( child.getUniqueId(), enhancementContextId ),
 								updated.getTestClass(),
 								findMethodReplacement( updated, testMethod ),
+								updated::getEnclosingTestClasses,
 								configuration
 						)
 				);
@@ -173,6 +177,7 @@ private void replaceWithEnhanced(Class<?> enhanced, ClassBasedTestDescriptor des
 						convertUniqueId( child.getUniqueId(), enhancementContextId ),
 						updated.getTestClass(),
 						findMethodReplacement( updated, testMethod ),
+						updated::getEnclosingTestClasses,
 						configuration
 				) );
 			}
@@ -251,6 +256,11 @@ private DelegatingJupiterConfiguration(JupiterConfiguration configuration, Objec
 			);
 		}
 
+		@Override
+		public Predicate<Class<? extends Extension>> getFilterForAutoDetectedExtensions() {
+			return configuration.getFilterForAutoDetectedExtensions();
+		}
+
 		@Override
 		public Optional<String> getRawConfigurationParameter(String s) {
 			return configuration.getRawConfigurationParameter( s );
@@ -276,6 +286,11 @@ public boolean isExtensionAutoDetectionEnabled() {
 			return configuration.isExtensionAutoDetectionEnabled();
 		}
 
+		@Override
+		public boolean isThreadDumpOnTimeoutEnabled() {
+			return configuration.isThreadDumpOnTimeoutEnabled();
+		}
+
 		@Override
 		public ExecutionMode getDefaultExecutionMode() {
 			return configuration.getDefaultExecutionMode();
@@ -320,6 +335,16 @@ public CleanupMode getDefaultTempDirCleanupMode() {
 		public Supplier<TempDirFactory> getDefaultTempDirFactorySupplier() {
 			return configuration.getDefaultTempDirFactorySupplier();
 		}
+
+		@Override
+		public TestInstantiationAwareExtension.ExtensionContextScope getDefaultTestInstantiationExtensionContextScope() {
+			return configuration.getDefaultTestInstantiationExtensionContextScope();
+		}
+
+		@Override
+		public OutputDirectoryProvider getOutputDirectoryProvider() {
+			return configuration.getOutputDirectoryProvider();
+		}
 	}
 
 	private static class DelegatingDisplayNameGenerator implements DisplayNameGenerator {
@@ -342,13 +367,13 @@ private String prefix() {
 		}
 
 		@Override
-		public String generateDisplayNameForNestedClass(Class<?> aClass) {
-			return prefix() + delegate.generateDisplayNameForNestedClass( aClass );
+		public String generateDisplayNameForNestedClass(List<Class<?>> enclosingInstanceTypes, Class<?> nestedClass) {
+			return prefix() + delegate.generateDisplayNameForNestedClass( enclosingInstanceTypes, nestedClass );
 		}
 
 		@Override
-		public String generateDisplayNameForMethod(Class<?> aClass, Method method) {
-			return prefix() + delegate.generateDisplayNameForMethod( aClass, method );
+		public String generateDisplayNameForMethod(List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod) {
+			return prefix() + delegate.generateDisplayNameForMethod( enclosingInstanceTypes, testClass, testMethod );
 		}
 	}
 
@@ -357,12 +382,11 @@ private static class EnhancementWorkedCheckMethodTestDescriptor extends TestMeth
 		private final boolean enhanced;
 		private final String[] classes;
 
-		public EnhancementWorkedCheckMethodTestDescriptor(UniqueId uniqueId, Class<?> testClass,
-				JupiterConfiguration configuration,
-				boolean enhanced, String[] classes) {
+		public EnhancementWorkedCheckMethodTestDescriptor(UniqueId uniqueId, Class<?> testClass, Supplier<List<Class<?>>> enclosingInstanceTypes, JupiterConfiguration configuration, boolean enhanced, String[] classes) {
 			super(
 					prepareId( uniqueId, testMethod( enhanced ) ),
 					testClass, testMethod( enhanced ),
+					enclosingInstanceTypes,
 					configuration
 			);
 			this.enhanced = enhanced;

tooling/hibernate-enhance-maven-plugin/hibernate-enhance-maven-plugin.gradle

@@ -38,6 +38,9 @@ dependencies {
     runtimeOnly mavenLibs.mavenArtifact
     runtimeOnly mavenLibs.mavenPlugin
     runtimeOnly mavenLibs.mavenPluginTools
+
+    testRuntimeOnly testLibs.junit5Engine
+    testRuntimeOnly testLibs.junit5Launcher
 }
 
 // Inject dependencies into plugin.xml

tooling/hibernate-gradle-plugin/hibernate-gradle-plugin.gradle

@@ -42,6 +42,7 @@ dependencies {
 	testImplementation testLibs.junit5Api
 
 	testRuntimeOnly testLibs.junit5Engine
+	testRuntimeOnly testLibs.junit5Launcher
 }
 
 gradlePlugin {