HHH-19832 Disable BytecodeEnhancedTestEngine by default

Author: marko-bekhta

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

@@ -8,6 +8,7 @@
 import static org.junit.platform.commons.util.AnnotationUtils.isAnnotated;
 
 import org.hibernate.testing.bytecode.enhancement.extension.engine.BytecodeEnhancedEngineDescriptor;
+import org.hibernate.testing.bytecode.enhancement.extension.engine.BytecodeEnhancedTestEngine;
 import org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor;
 import org.junit.platform.engine.FilterResult;
 import org.junit.platform.engine.TestDescriptor;
@@ -24,6 +25,10 @@ public FilterResult apply(TestDescriptor testDescriptor) {
 			}
 
 			boolean isEnhanced = isAnnotated( descriptor.getTestClass(), BytecodeEnhanced.class );
+			if ( isEnhanced && !BytecodeEnhancedTestEngine.isEnabled() ) {
+				throw new IllegalStateException(
+						"BytecodeEnhancedTestEngine is disabled. But the tests rely on the @BytecodeEnhanced extensions. %s".formatted( descriptor ) );
+			}
 			if ( root instanceof BytecodeEnhancedEngineDescriptor ) {
 				if ( !isEnhanced ) {
 					return FilterResult.excluded( "Not bytecode enhanced." );

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

@@ -51,19 +51,34 @@
 import org.junit.platform.engine.OutputDirectoryCreator;
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.UniqueId;
+import org.junit.platform.engine.support.descriptor.EngineDescriptor;
 import org.junit.platform.engine.support.hierarchical.EngineExecutionContext;
 import org.junit.platform.engine.support.hierarchical.HierarchicalTestEngine;
 import org.junit.platform.engine.support.hierarchical.ThrowableCollector;
 
 public class BytecodeEnhancedTestEngine extends HierarchicalTestEngine<JupiterEngineExecutionContext> {
 
+	public static final String ENHANCEMENT_EXTENSION_ENGINE_ENABLED = "hibernate.testing.bytecode.enhancement.extension.engine.enabled";
+
+	public static boolean isEnabled() {
+		return "true".equalsIgnoreCase( System.getProperty( ENHANCEMENT_EXTENSION_ENGINE_ENABLED, "false" ) );
+	}
+
 	@Override
 	public String getId() {
 		return "bytecode-enhanced-engine";
 	}
 
 	@Override
 	public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
+		if ( isEnabled() ) {
+			return doDiscover( discoveryRequest, uniqueId );
+		}
+
+		return new EngineDescriptor( uniqueId, getId() );
+	}
+
+	public TestDescriptor doDiscover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
 		final BytecodeEnhancedEngineDescriptor engineDescriptor = new BytecodeEnhancedEngineDescriptor(
 				(JupiterEngineDescriptor) new JupiterTestEngine().discover( discoveryRequest, uniqueId )
 		);
@@ -235,8 +250,12 @@ protected JupiterEngineExecutionContext createExecutionContext(ExecutionRequest
 	}
 
 	private JupiterConfiguration getJupiterConfiguration(ExecutionRequest request) {
-		JupiterEngineDescriptor engineDescriptor = (JupiterEngineDescriptor) request.getRootTestDescriptor();
-		return engineDescriptor.getConfiguration();
+		if ( request.getRootTestDescriptor() instanceof JupiterEngineDescriptor descriptor ) {
+			return descriptor.getConfiguration();
+		}
+		else {
+			return null;
+		}
 	}
 
 	public Optional<String> getGroupId() {

local-build-plugins/src/main/groovy/local.java-module.gradle

@@ -212,6 +212,8 @@ tasks.withType( Test.class ).each { test ->
 
     test.maxHeapSize = '3G'
 
+    // Enable bytecode enhanced engine:
+    test.systemProperties['hibernate.testing.bytecode.enhancement.extension.engine.enabled'] = true
     test.systemProperties['hibernate.test.validatefailureexpected'] = true
     test.systemProperties['hibernate.highlight_sql'] = false
     test.systemProperties += System.properties.findAll { it.key.startsWith( "hibernate." ) }