HHH-19846 Drop JUnit 4 usage

dreab8 · dreab8 · commit 2cc9d41983b2 · 2025-10-17T08:57:32.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/Dvd.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.type;
+
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.Column;
 import jakarta.persistence.EmbeddedId;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/type/TypeTest.java
@@ -4,35 +4,35 @@
  */
 package org.hibernate.orm.test.annotations.type;
 
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import static org.assertj.core.api.Assertions.assertThat;
 
-import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Emmanuel Bernard
  */
-public class TypeTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testIdWithMulticolumns() {
-		Session s;
-		Transaction tx;
-		s = openSession();
-		tx = s.beginTransaction();
-		Dvd lesOiseaux = new Dvd();
-		lesOiseaux.setTitle( "Les oiseaux" );
-		s.persist( lesOiseaux );
-		s.flush();
-		assertNotNull( lesOiseaux.getId() );
-		tx.rollback();
-		s.close();
-	}
+@DomainModel(
+		annotatedClasses = {
+				Dvd.class
+		}
+)
+@SessionFactory
+public class TypeTest {
 
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[]{ Dvd.class };
+	@Test
+	public void testIdWithMulticolumns(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					Dvd lesOiseaux = new Dvd();
+					lesOiseaux.setTitle( "Les oiseaux" );
+					session.persist( lesOiseaux );
+					session.flush();
+					assertThat( lesOiseaux.getId() ).isNotNull();
+				}
+		);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintThrowsConstraintViolationExceptionTest.java
@@ -10,56 +10,43 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
-import jakarta.persistence.PersistenceException;
 import jakarta.persistence.Table;
-
 import org.hibernate.exception.ConstraintViolationException;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * @author Vlad Mihalcea
  */
 @JiraKey(value = "HHH-11236")
-public class UniqueConstraintThrowsConstraintViolationExceptionTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = {
+				UniqueConstraintThrowsConstraintViolationExceptionTest.Customer.class
+		}
+)
+@SessionFactory
+public class UniqueConstraintThrowsConstraintViolationExceptionTest {
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { Customer.class };
-	}
 
 	@Test
-	public void testUniqueConstraintWithEmptyColumnName() {
-		doInHibernate( this::sessionFactory, session -> {
+	public void testUniqueConstraintWithEmptyColumnName(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
 			Customer customer1 = new Customer();
 			customer1.customerId = "123";
 			session.persist( customer1 );
 		} );
-		try {
-			doInHibernate( this::sessionFactory, session -> {
-				Customer customer1 = new Customer();
-				customer1.customerId = "123";
-				session.persist( customer1 );
-			} );
-			fail( "Should throw" );
-		}
-		catch ( PersistenceException e ) {
-			assertEquals(
-					ConstraintViolationException.class,
-					e.getClass()
-			);
-		}
-	}
 
-	@Override
-	protected boolean isCleanupTestDataRequired() {
-		return true;
+		assertThrows( ConstraintViolationException.class, () -> scope.inTransaction( session -> {
+			Customer customer1 = new Customer();
+			customer1.customerId = "123";
+			session.persist( customer1 );
+		} ) );
 	}
 
 	@Entity(name = "Customer")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintUnitTests.java
@@ -4,8 +4,6 @@
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
-import java.util.HashSet;
-import java.util.Set;
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -16,29 +14,31 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.Metadata;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-
+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 java.util.HashSet;
+import java.util.Set;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Fail.fail;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 /**
  * @author Steve Ebersole
  */
-public class UniqueConstraintUnitTests extends BaseUnitTestCase {
+@BaseUnitTest
+public class UniqueConstraintUnitTests {
 
 	@Test
-	@JiraKey( value = "HHH-8026" )
+	@JiraKey(value = "HHH-8026")
 	public void testUnNamedConstraints() {
 		StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
 
@@ -59,25 +59,24 @@ else if ( table.getName().equals( "UniqueNoNameB" ) ) {
 				}
 			}
 
-			assertTrue( "Could not find the expected tables.", tableA != null && tableB != null );
-			assertFalse(
-					tableA.getUniqueKeys().values().iterator().next().getName().equals(
-							tableB.getUniqueKeys().values().iterator().next().getName()
-					)
-			);
+			assertThat( tableA != null && tableB != null )
+					.describedAs( "Could not find the expected tables." )
+					.isTrue();
+			assertThat( tableA.getUniqueKeys().values().iterator().next().getName() )
+					.isNotEqualTo( tableB.getUniqueKeys().values().iterator().next().getName() );
 		}
 		finally {
 			StandardServiceRegistryBuilder.destroy( ssr );
 		}
 	}
 
 	@Test
-	@JiraKey( value = "HHH-8537" )
+	@JiraKey(value = "HHH-8537")
 	public void testNonExistentColumn() {
 		StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistry();
 
 		try {
-			final Metadata metadata = new MetadataSources( ssr )
+			new MetadataSources( ssr )
 					.addAnnotatedClass( UniqueNoNameA.class )
 					.addAnnotatedClass( UniqueNoNameB.class )
 					.buildMetadata();
@@ -94,8 +93,8 @@ public void testNonExistentColumn() {
 	}
 
 	@Entity
-	@Table( name = "UniqueNoNameA",
-			uniqueConstraints = {@UniqueConstraint(columnNames={"name"})})
+	@Table(name = "UniqueNoNameA",
+			uniqueConstraints = {@UniqueConstraint(columnNames = {"name"})})
 	public static class UniqueNoNameA {
 		@Id
 		@GeneratedValue
@@ -105,8 +104,8 @@ public static class UniqueNoNameA {
 	}
 
 	@Entity
-	@Table( name = "UniqueNoNameB",
-			uniqueConstraints = {@UniqueConstraint(columnNames={"name"})})
+	@Table(name = "UniqueNoNameB",
+			uniqueConstraints = {@UniqueConstraint(columnNames = {"name"})})
 	public static class UniqueNoNameB {
 		@Id
 		@GeneratedValue
@@ -125,9 +124,9 @@ public static class UniqueColumnDoesNotExist {
 				name = "tbl_strings",
 				joinColumns = @JoinColumn(name = "fk", nullable = false),
 				// the failure required at least 1 columnName to be correct -- all incorrect wouldn't reproduce
-				uniqueConstraints =  @UniqueConstraint(columnNames = { "fk", "doesnotexist" })
+				uniqueConstraints = @UniqueConstraint(columnNames = {"fk", "doesnotexist"})
 		)
 		@Column(name = "string", nullable = false)
-		public Set<String> strings = new HashSet<String>();
+		public Set<String> strings = new HashSet<>();
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintValidationTest.java
@@ -4,37 +4,43 @@
  */
 package org.hibernate.orm.test.annotations.uniqueconstraint;
 
-import java.io.Serializable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
-
 import org.hibernate.AnnotationException;
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-
+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 java.io.Serializable;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author Nikolay Shestakov
  *
  */
-public class UniqueConstraintValidationTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class UniqueConstraintValidationTest {
 
-	@Test(expected = AnnotationException.class)
+	@Test
 	@JiraKey(value = "HHH-4084")
 	public void testUniqueConstraintWithEmptyColumnName() {
-		buildSessionFactory(EmptyColumnNameEntity.class);
+		assertThrows( AnnotationException.class, () ->
+				buildSessionFactory( EmptyColumnNameEntity.class )
+		);
 	}
 
-	@Test(expected = AnnotationException.class)
+	@Test
 	public void testUniqueConstraintWithEmptyColumnNameList() {
-		buildSessionFactory(EmptyColumnNameListEntity.class);
+		assertThrows( AnnotationException.class, () ->
+				buildSessionFactory( EmptyColumnNameListEntity.class )
+		);
 	}
 
 	@Test
