HHH-19846 Drop JUnit 4 usage

dreab8 · dreab8 · commit 83d274f1a826 · 2025-10-20T14:34:17.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/AnnotationBinderTest.java
@@ -10,31 +10,31 @@
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static junit.framework.TestCase.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author Dominique Toupin
  */
 @JiraKey(value = "HHH-10456")
+@BaseUnitTest
 public class AnnotationBinderTest {
 
 	@Test
 	public void testInvalidPrimaryKeyJoinColumn() {
-		try (StandardServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistry()) {
-			try {
+		AnnotationException annotationException = assertThrows( AnnotationException.class, () -> {
+			try (StandardServiceRegistry serviceRegistry = ServiceRegistryUtil.serviceRegistry()) {
 				new MetadataSources( serviceRegistry )
 						.addAnnotatedClass( InvalidPrimaryKeyJoinColumnAnnotationEntity.class )
 						.buildMetadata();
-				fail();
 			}
-			catch (AnnotationException ae) {
-				// expected!
-			}
-		}
+		} );
+		assertThat( annotationException.getMessage() ).contains( "InvalidPrimaryKeyJoinColumnAnnotationEntity" );
 	}
 
 	@Entity
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/CfgFilePropertyTest.java
@@ -4,42 +4,42 @@
  */
 package org.hibernate.orm.test.cfg;
 
+import jakarta.persistence.EntityManagerFactory;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicReference;
-import jakarta.persistence.Persistence;
-
-import org.hibernate.cfg.AvailableSettings;
-
-import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
 
+import static jakarta.persistence.Persistence.createEntityManagerFactory;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hibernate.internal.util.ConfigHelper.findAsResource;
-import static org.junit.Assert.assertNull;
 
 /**
  * @author Vlad Mihalcea
  */
 @JiraKey(value = "HHH-13227")
-public class CfgFilePropertyTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class CfgFilePropertyTest {
 
 	@Test
-	public void test() throws InterruptedException {
+	public void test() throws Exception {
 
 		final AtomicReference<Exception> exceptionHolder = new AtomicReference<>();
 
 		Thread thread = new Thread( () -> {
-			try {
-				final Properties props = new Properties();
-				props.setProperty( AvailableSettings.CFG_XML_FILE, "/org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" );
-				ServiceRegistryUtil.applySettings( props );
-
-				Persistence.createEntityManagerFactory( "ExcludeUnlistedClassesTest1", props );
+			final Properties props = new Properties();
+			props.setProperty( AvailableSettings.CFG_XML_FILE,
+					"/org/hibernate/orm/test/boot/cfgXml/hibernate.cfg.xml" );
+			ServiceRegistryUtil.applySettings( props );
+			try (EntityManagerFactory emF = createEntityManagerFactory( "ExcludeUnlistedClassesTest1", props )) {
 			}
 			catch (Exception e) {
 				exceptionHolder.set( e );
@@ -50,18 +50,19 @@ public void test() throws InterruptedException {
 			@Override
 			protected Enumeration<URL> findResources(String name) throws IOException {
 				return name.equals( "META-INF/persistence.xml" ) ?
-					Collections.enumeration(
-						Collections.singletonList(
-							findAsResource( "org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml" )
-						)
-					) :
-					Collections.emptyEnumeration();
+						Collections.enumeration(
+								Collections.singletonList(
+										findAsResource(
+												"org/hibernate/jpa/test/persistenceunit/META-INF/persistence.xml" )
+								)
+						) :
+						Collections.emptyEnumeration();
 			}
-		}  );
+		} );
 
 		thread.start();
 		thread.join();
 
-		assertNull( exceptionHolder.get() );
+		assertThat( exceptionHolder.get() ).isNull();
 	}
 }
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
@@ -8,7 +8,6 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import org.hibernate.annotations.Immutable;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
@@ -19,53 +18,44 @@
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.persister.entity.EntityPersister;
-
+import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * @author Gail Badner
  */
-public class DefaultCacheConcurrencyPropertyTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class DefaultCacheConcurrencyPropertyTest {
 
 	@Test
-	@JiraKey( value = "HHH-9763" )
+	@JiraKey(value = "HHH-9763")
 	public void testExplicitDefault() {
 
 		final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder()
 				.applySetting( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY, "read-only" )
 				.build();
 		try {
-			assertEquals(
-					"read-only",
-					ssr.getService( ConfigurationService.class ).getSettings().get(
-							AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY
-					)
-			);
+			assertThat( ssr.getService( ConfigurationService.class ).getSettings()
+					.get( AvailableSettings.DEFAULT_CACHE_CONCURRENCY_STRATEGY ) )
+					.isEqualTo( "read-only" );
 			final MetadataImplementor metadata = (MetadataImplementor) new MetadataSources( ssr )
 					.addAnnotatedClass( TheEntity.class )
 					.buildMetadata();
-			assertEquals(
-					AccessType.READ_ONLY,
-					metadata.getMetadataBuildingOptions().getMappingDefaults().getImplicitCacheAccessType()
-			);
-			final SessionFactoryImplementor sf = (SessionFactoryImplementor) metadata.buildSessionFactory();
-			try {
+			assertThat( metadata.getMetadataBuildingOptions().getMappingDefaults().getImplicitCacheAccessType() )
+					.isEqualTo( AccessType.READ_ONLY );
+
+			try (SessionFactoryImplementor sf = metadata.buildSessionFactory()) {
 				final EntityPersister persister = sf.getRuntimeMetamodels()
 						.getMappingMetamodel()
 						.getEntityDescriptor( TheEntity.class.getName() );
-				assertTrue( persister.canReadFromCache() );
-				assertTrue( persister.canWriteToCache() );
-				assertNotNull( persister.getCacheAccessStrategy() );
-			}
-			finally {
-				sf.close();
+				assertThat( persister.canReadFromCache() ).isTrue();
+				assertThat( persister.canWriteToCache() ).isTrue();
+				assertThat( persister.getCacheAccessStrategy() ).isNotNull();
 			}
 		}
 		finally {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/cfg/cache/DirectReferenceCacheEntriesTest.java
@@ -7,48 +7,46 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
 import org.hibernate.annotations.Immutable;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.cfg.Configuration;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Andrea Boriero
  */
 @JiraKey(value = "HHH-13665")
-public class DirectReferenceCacheEntriesTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { TheEntity.class };
-	}
-
-	@Override
-	protected void configure(Configuration configuration) {
-		configuration.setProperty( AvailableSettings.USE_DIRECT_REFERENCE_CACHE_ENTRIES, true );
-	}
+@DomainModel(
+		annotatedClasses = {
+				DirectReferenceCacheEntriesTest.TheEntity.class
+		}
+)
+@SessionFactory
+@ServiceRegistry(
+		settings = @Setting(name = AvailableSettings.USE_DIRECT_REFERENCE_CACHE_ENTRIES, value = "true")
+)
+public class DirectReferenceCacheEntriesTest {
 
-	@Before
-	public void setUp() {
-		doInHibernate( this::sessionFactory, session -> {
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
 			TheEntity theEntity = new TheEntity();
 			theEntity.setId( 1L );
 			session.persist( theEntity );
 		} );
 	}
 
 	@Test
-	public void testSelectANonCachablenEntity() {
-		doInHibernate( this::sessionFactory, session -> {
-			session.createQuery( "select t from TheEntity t", TheEntity.class ).getResultList();
-		} );
+	public void testSelectANonCachablenEntity(SessionFactoryScope scope) {
+		scope.inTransaction( session ->
+				session.createQuery( "select t from TheEntity t", TheEntity.class ).getResultList()
+		);
 	}
 
 	@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
@@ -11,19 +11,19 @@
 import org.hibernate.internal.SessionFactoryRegistry;
 import org.hibernate.persister.spi.PersisterClassResolver;
 import org.hibernate.service.ServiceRegistry;
-
-import org.hibernate.testing.junit4.BaseUnitTestCase;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * @author Emmanuel Bernard
  */
-public class PersisterClassProviderTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class PersisterClassProviderTest {
+
 	@Test
 	public void testPersisterClassProvider() {
 
@@ -51,17 +51,17 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-			fail("The entity persister should be overridden");
+			fail( "The entity persister should be overridden" );
 		}
-		catch ( MappingException e ) {
+		catch (MappingException e) {
 			// expected
 			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( serviceRegistry );
 		}
 
-		assertFalse( SessionFactoryRegistry.INSTANCE.hasRegistrations() );
+		assertThat( SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
 
 		cfg = new Configuration();
 		cfg.addAnnotatedClass( Portal.class );
@@ -73,9 +73,9 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-			fail("The collection persister should be overridden but not the entity persister");
+			fail( "The collection persister should be overridden but not the entity persister" );
 		}
-		catch ( MappingException e ) {
+		catch (MappingException e) {
 			// expected
 			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
 		}
@@ -94,16 +94,16 @@ public void testPersisterClassProvider() {
 		try {
 			sessionFactory = cfg.buildSessionFactory( serviceRegistry );
 			sessionFactory.close();
-			fail("The entity persisters should be overridden in a class hierarchy");
+			fail( "The entity persisters should be overridden in a class hierarchy" );
 		}
-		catch ( MappingException e ) {
+		catch (MappingException e) {
 			// expected
 			assertThat( e.getCause() ).isInstanceOf( GoofyException.class );
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( serviceRegistry );
 		}
 
-		assertFalse( SessionFactoryRegistry.INSTANCE.hasRegistrations() );
+		assertThat( SessionFactoryRegistry.INSTANCE.hasRegistrations() ).isFalse();
 	}
 }
