HHH-19846 Drop JUnit 4 usage

dreab8 · dreab8 · commit 68834b4d8085 · 2025-10-21T16:19:48.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/HibernateAnnotationMappingTest.java
@@ -29,13 +29,18 @@ public void testUniqueConstraintAnnotationOnNaturalIds() {
 		ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() );
 		configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );
 		configuration.addAnnotatedClass( Month.class );
-		SessionFactory sf;
+		SessionFactory sf = null;
 		try {
 			sf = configuration.buildSessionFactory();
-			sf.close();
+
 		}
 		catch (ConcurrentModificationException e) {
 			fail( e.toString() );
 		}
+		finally {
+			if ( sf != null ) {
+				sf.close();
+			}
+		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/index/jpa/AbstractJPAIndexTest.java
@@ -59,9 +59,9 @@ public CollectionClassification getSetting() {
 	@Test
 	public void testTableIndex(SessionFactoryScope scope) {
 		PersistentClass entity = scope.getMetadataImplementor().getEntityBinding( Car.class.getName() );
-		Iterator itr = entity.getTable().getUniqueKeys().values().iterator();
+		Iterator<UniqueKey> itr = entity.getTable().getUniqueKeys().values().iterator();
 		assertThat( itr.hasNext() ).isTrue();
-		UniqueKey uk = (UniqueKey) itr.next();
+		UniqueKey uk = itr.next();
 		assertThat( itr.hasNext() ).isFalse();
 		assertThat( StringHelper.isNotEmpty( uk.getName() ) ).isTrue();
 		assertThat( uk.getColumnSpan() ).isEqualTo( 2 );
@@ -72,10 +72,10 @@ public void testTableIndex(SessionFactoryScope scope) {
 		assertThat( uk.getTable() ).isSameAs( entity.getTable() );
 
 
-		itr = entity.getTable().getIndexes().values().iterator();
-		assertThat( itr.hasNext() ).isTrue();
-		Index index = (Index) itr.next();
-		assertThat( itr.hasNext() ).isFalse();
+		Iterator<Index> indexItr = entity.getTable().getIndexes().values().iterator();
+		assertThat( indexItr.hasNext() ).isTrue();
+		Index index = indexItr.next();
+		assertThat( indexItr.hasNext() ).isFalse();
 		assertThat( index.getName() ).isEqualTo( "Car_idx" );
 		assertThat( index.getColumnSpan() ).isEqualTo( 1 );
 		column = index.getColumns().iterator().next();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/namingstrategy/charset/AbstractCharsetNamingStrategyTest.java
@@ -55,7 +55,7 @@ public void tearDown() {
 	}
 
 	@Test
-	public void testWithCustomNamingStrategy() throws Exception {
+	public void testWithCustomNamingStrategy() {
 		Metadata metadata = new MetadataSources( serviceRegistry )
 				.addAnnotatedClass( Address.class )
 				.addAnnotatedClass( Person.class )
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/secondarytable/SecondaryTableSchemaTest.java
@@ -32,7 +32,6 @@
 @RequiresDialect(value = H2Dialect.class)
 public class SecondaryTableSchemaTest extends EntityManagerFactoryBasedFunctionalTest {
 
-
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
 		return new Class[] {Cluster.class};
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java
@@ -25,8 +25,6 @@ public class OptimisticLockAnnotationTest {
 
 	@Test
 	public void testOptimisticLockExcludeOnNameProperty(SessionFactoryScope scope) {
-
-
 		scope.inTransaction(
 				session -> {
 					Conductor c = new Conductor();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchingBatchFailureTest.java
@@ -63,9 +63,10 @@ public void jdbcExecuteBatchStart() {
 	@Test
 	public void testBasicInsertion(SessionFactoryScope scope) {
 		session = scope.getSessionFactory().withOptions().eventListeners( this ).openSession();
-		session.getTransaction().begin();
+
 
 		try {
+			session.getTransaction().begin();
 			session.persist( new User( 1, "ok" ) );
 			session.persist( new User( 2, null ) );
 			session.persist( new User( 3, "ok" ) );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/registry/classloading/HibernateClassLoaderLeaksTest.java
@@ -16,6 +16,7 @@
 import org.junit.Assert;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -25,6 +26,7 @@
  * it's best to focus on a single DB.
  */
 @RequiresDialect(H2Dialect.class)
+@Disabled
 public class HibernateClassLoaderLeaksTest {
 
 	private static Set<Driver> knownDrivers;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DefaultCacheConcurrencyPropertyTest.java
@@ -11,6 +11,7 @@
 import org.hibernate.annotations.Immutable;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cache.spi.access.AccessType;
 import org.hibernate.cfg.AvailableSettings;
@@ -34,10 +35,11 @@ public class DefaultCacheConcurrencyPropertyTest {
 	@Test
 	@JiraKey(value = "HHH-9763")
 	public void testExplicitDefault() {
-
-		try (StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
-				.applySetting( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY, "read-only" )
-				.build()) {
+		StandardServiceRegistry ssr = null;
+		try {
+			ssr = ServiceRegistryUtil.serviceRegistryBuilder()
+					.applySetting( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY, "read-only" )
+					.build();
 			assertThat( ssr.getService( ConfigurationService.class ).getSettings()
 					.get( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY ) )
 					.isEqualTo( "read-only" );
@@ -56,6 +58,11 @@ public void testExplicitDefault() {
 				assertThat( persister.getCacheAccessStrategy() ).isNotNull();
 			}
 		}
+		finally {
+			if ( ssr != null ) {
+				StandardServiceRegistryBuilder.destroy( ssr );
+			}
+		}
 	}
 
 	@Entity(name = "TheEntity")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/persister/PersisterClassProviderTest.java
@@ -13,6 +13,7 @@
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -22,11 +23,12 @@
  * @author Emmanuel Bernard
  */
 @BaseUnitTest
+@Order(Integer.MAX_VALUE)
 public class PersisterClassProviderTest {
 
 	@Test
 	public void testPersisterClassProvider() {
-		assertThat( SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
+		assertThat(SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
 		Configuration cfg = new Configuration();
 		cfg.addAnnotatedClass( Gate.class );
 		ServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistryBuilder()
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/connection/ConnectionCreatorTest.java
@@ -6,6 +6,7 @@
 
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceInitiator;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.boot.registry.internal.BootstrapServiceRegistryImpl;
 import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
 import org.hibernate.dialect.H2Dialect;
@@ -40,27 +41,35 @@ public class ConnectionCreatorTest {
 	@Test
 	@JiraKey(value = "HHH-8621")
 	public void testBadUrl() throws Exception {
-		DriverConnectionCreator connectionCreator = new DriverConnectionCreator(
-				(Driver) Class.forName( "org.h2.Driver" ).newInstance(),
-				CCTStandardServiceRegistryImpl.create(
-						true,
-						new BootstrapServiceRegistryImpl(),
-						Collections.emptyList(),
-						Collections.emptyList(),
-						Collections.emptyMap()
-				),
-				"jdbc:h2:mem:test-bad-urls;nosuchparam=saywhat;DB_CLOSE_ON_EXIT=FALSE",
-				new Properties(),
-				false,
-				null,
-				null
+		CCTStandardServiceRegistryImpl serviceRegistry = CCTStandardServiceRegistryImpl.create(
+				true,
+				new BootstrapServiceRegistryImpl(),
+				Collections.emptyList(),
+				Collections.emptyList(),
+				Collections.emptyMap()
 		);
+		try {
+			DriverConnectionCreator connectionCreator = new DriverConnectionCreator(
+					(Driver) Class.forName( "org.h2.Driver" ).newInstance(),
+					serviceRegistry,
+					"jdbc:h2:mem:test-bad-urls;nosuchparam=saywhat;DB_CLOSE_ON_EXIT=FALSE",
+					new Properties(),
+					false,
+					null,
+					null
+			);
+
+			assertThrows( JDBCConnectionException.class, () -> {
+						try (Connection conn = connectionCreator.createConnection()) {
+
+						}
+					},
+					"Expecting the bad Connection URL to cause an exception" );
+		}
+		finally {
+			StandardServiceRegistryBuilder.destroy(serviceRegistry);
+		}
 
-		assertThrows( JDBCConnectionException.class, () -> {
-					Connection conn = connectionCreator.createConnection();
-					conn.close();
-				},
-				"Expecting the bad Connection URL to cause an exception" );
 	}
 
 	private final static class CCTStandardServiceRegistryImpl extends StandardServiceRegistryImpl {

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,18 @@ public void testUniqueConstraintAnnotationOnNaturalIds() {`
`29`	`29`	`ServiceRegistryUtil.applySettings( configuration.getStandardServiceRegistryBuilder() );`
`30`	`30`	`configuration.setProperty( Environment.HBM2DDL_AUTO, "create-drop" );`
`31`	`31`	`configuration.addAnnotatedClass( Month.class );`
`32`		`- SessionFactory sf;`
	`32`	`+ SessionFactory sf = null;`
`33`	`33`	`try {`
`34`	`34`	`sf = configuration.buildSessionFactory();`
`35`		`- sf.close();`
	`35`	`+`
`36`	`36`	`}`
`37`	`37`	`catch (ConcurrentModificationException e) {`
`38`	`38`	`fail( e.toString() );`
`39`	`39`	`}`
	`40`	`+ finally {`
	`41`	`+ if ( sf != null ) {`
	`42`	`+ sf.close();`
	`43`	`+ }`
	`44`	`+ }`
`40`	`45`	`}`
`41`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void tearDown() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
`58`		`- public void testWithCustomNamingStrategy() throws Exception {`
	`58`	`+ public void testWithCustomNamingStrategy() {`
`59`	`59`	`Metadata metadata = new MetadataSources( serviceRegistry )`
`60`	`60`	`.addAnnotatedClass( Address.class )`
`61`	`61`	`.addAnnotatedClass( Person.class )`