HHH-19762 - Enable Parallel Testing for OTP

Author: loiclefevre

hibernate-agroal/src/test/java/org/hibernate/test/agroal/AgroalTransactionIsolationConfigTest.java

@@ -8,8 +8,8 @@
 import org.hibernate.community.dialect.TiDBDialect;
 import org.hibernate.community.dialect.GaussDBDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
-import org.hibernate.agroal.internal.AgroalConnectionProvider;
 
+import org.hibernate.test.agroal.util.GradleParallelTestingAgroalConnectionProvider;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.common.connections.BaseTransactionIsolationConfigTest;
 
@@ -22,6 +22,6 @@
 public class AgroalTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
 	@Override
 	protected ConnectionProvider getConnectionProviderUnderTest() {
-		return new AgroalConnectionProvider();
+		return new GradleParallelTestingAgroalConnectionProvider();
 	}
 }

hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/GradleParallelTestingAgroalConnectionProvider.java

@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.test.agroal.util;
+
+import org.hibernate.HibernateException;
+import org.hibernate.agroal.internal.AgroalConnectionProvider;
+
+import java.util.Map;
+
+import static org.hibernate.testing.jdbc.GradleParallelTestingUsernameResolver.resolveFromSettings;
+
+/**
+ * @author Loïc Lefèvre
+ */
+public class GradleParallelTestingAgroalConnectionProvider extends AgroalConnectionProvider {
+	@Override
+	public void configure(Map<String, Object> properties) throws HibernateException {
+		resolveFromSettings( properties );
+		super.configure( properties );
+	}
+}

hibernate-agroal/src/test/java/org/hibernate/test/agroal/util/PreparedStatementSpyConnectionProvider.java

@@ -10,7 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.hibernate.agroal.internal.AgroalConnectionProvider;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 
 import org.hibernate.testing.jdbc.JdbcSpies;
@@ -21,7 +20,7 @@
  *
  * @author Vlad Mihalcea
  */
-public class PreparedStatementSpyConnectionProvider extends AgroalConnectionProvider {
+public class PreparedStatementSpyConnectionProvider extends GradleParallelTestingAgroalConnectionProvider {
 	public final JdbcSpies.SpyContext spyContext = new JdbcSpies.SpyContext();
 
 	private final List<Connection> acquiredConnections = new ArrayList<>( );

hibernate-agroal/src/test/resources/hibernate.properties

@@ -10,7 +10,7 @@ hibernate.connection.password @jdbc.pass@
 hibernate.connection.init_sql @connection.init_sql@
 
 hibernate.jdbc.batch_size 10
-hibernate.connection.provider_class AgroalConnectionProvider
+hibernate.connection.provider_class org.hibernate.test.agroal.util.GradleParallelTestingAgroalConnectionProvider
 
 hibernate.agroal.maxSize 2
 hibernate.agroal.acquisitionTimeout PT1s

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/C3p0TransactionIsolationConfigTest.java

@@ -14,6 +14,7 @@
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
+import org.hibernate.test.c3p0.util.GradleParallelTestingC3P0ConnectionProvider;
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.common.connections.BaseTransactionIsolationConfigTest;
 import org.junit.Before;
@@ -35,7 +36,7 @@ public void setUp() {
 
 	@Override
 	protected ConnectionProvider getConnectionProviderUnderTest() {
-		C3P0ConnectionProvider provider = new C3P0ConnectionProvider();
+		C3P0ConnectionProvider provider = new GradleParallelTestingC3P0ConnectionProvider();
 		provider.injectServices( (ServiceRegistryImplementor) ssr );
 		return provider;
 	}

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/OracleSQLCallableStatementProxyTest.java

@@ -17,10 +17,10 @@
 import jakarta.persistence.SqlResultSetMappings;
 import jakarta.persistence.StoredProcedureParameter;
 
-import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.dialect.OracleDialect;
 
+import org.hibernate.test.c3p0.util.GradleParallelTestingC3P0ConnectionProvider;
 import org.hibernate.testing.RequiresDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@@ -41,7 +41,7 @@ public class OracleSQLCallableStatementProxyTest extends
 	protected void configure(Configuration configuration) {
 		configuration.setProperty(
 				org.hibernate.cfg.AvailableSettings.CONNECTION_PROVIDER,
-				C3P0ConnectionProvider.class
+				GradleParallelTestingC3P0ConnectionProvider.class
 		);
 	}
 

hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/util/GradleParallelTestingC3P0ConnectionProvider.java

@@ -0,0 +1,23 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.test.c3p0.util;
+
+import org.hibernate.HibernateException;
+import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
+
+import java.util.Map;
+
+import static org.hibernate.testing.jdbc.GradleParallelTestingUsernameResolver.resolveFromSettings;
+
+/**
+ * @author Loïc Lefèvre
+ */
+public class GradleParallelTestingC3P0ConnectionProvider extends C3P0ConnectionProvider {
+	@Override
+	public void configure(Map<String, Object> properties) throws HibernateException {
+		resolveFromSettings( properties );
+		super.configure( properties );
+	}
+}

hibernate-c3p0/src/test/resources/hibernate.properties

@@ -21,7 +21,7 @@ hibernate.c3p0.testConnectionOnCheckout true
 hibernate.show_sql false
 
 hibernate.max_fetch_depth 5
-hibernate.connection.provider_class C3P0ConnectionProvider
+hibernate.connection.provider_class org.hibernate.test.c3p0.util.GradleParallelTestingC3P0ConnectionProvider
 
 hibernate.cache.region_prefix hibernate.test
 hibernate.cache.region.factory_class org.hibernate.testing.cache.CachingRegionFactory

hibernate-core/hibernate-core.gradle

@@ -266,6 +266,12 @@ tasks.withType( Test.class ).each { test ->
         // Parallel test runs when running with in-memory databases
         test.maxParallelForks = Runtime.runtime.availableProcessors().intdiv( 2 ) ?: 1
     }
+    else if ( project.db == "oracle_test_pilot_database" ) {
+        // Parallel test runs when running with Oracle Test Pilot databases
+        // see GradleParallelTestingUsernameResolver
+        test.maxParallelForks = Runtime.runtime.availableProcessors() ?: 1
+        test.systemProperty 'maxParallelForks', test.maxParallelForks
+    }
 }
 
 tasks.named( "javadoc", Javadoc ) {

hibernate-core/src/test/bundles/templates/cfgxmlpar/org/hibernate/orm/test/jpa/pack/cfgxmlpar/hibernate.cfg.xml

@@ -10,6 +10,7 @@
     <session-factory>
         <property name="hibernate.dialect">@db.dialect@</property>
         <property name="hibernate.connection.driver_class">@jdbc.driver@</property>
+        <property name="hibernate.connection.creator_factory_class">org.hibernate.testing.jdbc.GradleParallelTestingConnectionCreatorFactoryImpl</property>
         <property name="hibernate.connection.username">@jdbc.user@</property>
         <property name="hibernate.connection.password">@jdbc.pass@</property>
         <property name="hibernate.connection.init_sql">@connection.init_sql@</property>
@@ -30,4 +31,4 @@
         <collection-cache collection="org.hibernate.orm.test.jpa.Item.distributors" usage="read-write" region="RegionName"/>
         <event type="pre-insert"/>
     </session-factory>
-</hibernate-configuration>
+</hibernate-configuration>