HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyConstraintMapsIdTest.java

@@ -11,22 +11,50 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
-
 import org.hibernate.boot.model.relational.Namespace;
+import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.mapping.Table;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-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.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.fail;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-12320")
-public class ForeignKeyConstraintMapsIdTest extends BaseNonConfigCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = {
+				ForeignKeyConstraintMapsIdTest.Post.class,
+				ForeignKeyConstraintMapsIdTest.PostDetails.class
+		}
+)
+@SessionFactory
+public class ForeignKeyConstraintMapsIdTest {
+
+	@Test
+	public void testForeignKeyNameSetForMapsIdJoinColumn(SessionFactoryScope scope) {
+		MetadataImplementor metadata = scope.getMetadataImplementor();
+		for ( Namespace namespace : metadata.getDatabase().getNamespaces() ) {
+			for ( Table table : namespace.getTables() ) {
+				if ( table.getName().equals( "Post" ) ) {
+					for ( var foreignKey : table.getForeignKeyCollection() ) {
+						if ( foreignKey.getColumn( 0 ).getName().equals( "PD_ID" ) ) {
+							assertThat( foreignKey.getName() ).isEqualTo( "FK_PD" );
+							return;
+						}
+					}
+				}
+			}
+		}
+		fail( "Expected to find a Foreign Key mapped to column PD_ID but failed to locate it" );
+	}
+
 	@Entity(name = "Post")
 	public static class Post {
 		@Id
@@ -76,26 +104,4 @@ public void setUserName(String userName) {
 			this.userName = userName;
 		}
 	}
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { Post.class, PostDetails.class };
-	}
-
-	@Test
-	public void testForeignKeyNameSetForMapsIdJoinColumn() {
-		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
-			for ( Table table : namespace.getTables() ) {
-				if ( table.getName().equals( "Post" ) ) {
-					for ( var foreignKey : table.getForeignKeyCollection() ) {
-						if ( foreignKey.getColumn( 0 ).getName().equals( "PD_ID" ) ) {
-							assertEquals( "FK_PD", foreignKey.getName() );
-							return;
-						}
-					}
-				}
-			}
-		}
-		fail( "Expected to find a Foreign Key mapped to column PD_ID but failed to locate it" );
-	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/constraint/ForeignKeyNoConstraintTest.java

@@ -13,49 +13,49 @@
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.PrimaryKeyJoinColumn;
-
 import org.hibernate.boot.model.relational.Namespace;
 import org.hibernate.mapping.Table;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-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.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Chris Cranford
  */
-public class ForeignKeyNoConstraintTest extends BaseNonConfigCoreFunctionalTestCase {
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class<?>[] {
-				Car.class,
-				VehicleNumber.class,
-				Post.class,
-				PostDetails.class
-		};
-	}
+@DomainModel(
+		annotatedClasses = {
+				ForeignKeyNoConstraintTest.Car.class,
+				ForeignKeyNoConstraintTest.VehicleNumber.class,
+				ForeignKeyNoConstraintTest.Post.class,
+				ForeignKeyNoConstraintTest.PostDetails.class
+		}
+)
+@SessionFactory
+public class ForeignKeyNoConstraintTest {
 
 	@Test
 	@JiraKey(value = "HHH-12975")
-	public void testPrimaryKeyJoinColumnForeignKeyNoConstraint() {
-		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
+	public void testPrimaryKeyJoinColumnForeignKeyNoConstraint(SessionFactoryScope scope) {
+		for ( Namespace namespace : scope.getMetadataImplementor().getDatabase().getNamespaces() ) {
 			for ( Table table : namespace.getTables() ) {
 				if ( "Car".equals( table.getName() ) ) {
-					assertEquals( 0, table.getForeignKeyCollection().size() );
+					assertThat( table.getForeignKeyCollection() ).hasSize( 0 );
 				}
 			}
 		}
 	}
 
 	@Test
 	@JiraKey(value = "HHH-12975")
-	public void testMapsIdJoinColumnForeignKeyNoConstraint() {
-		for ( Namespace namespace : metadata().getDatabase().getNamespaces() ) {
+	public void testMapsIdJoinColumnForeignKeyNoConstraint(SessionFactoryScope scope) {
+		for ( Namespace namespace : scope.getMetadataImplementor().getDatabase().getNamespaces() ) {
 			for ( Table table : namespace.getTables() ) {
 				if ( "Post".equals( table.getName() ) ) {
-					assertEquals( 0, table.getForeignKeyCollection().size() );
+					assertThat( table.getForeignKeyCollection() ).hasSize( 0 );
 				}
 			}
 		}
@@ -68,7 +68,7 @@ public static class Car {
 
 		@PrimaryKeyJoinColumn
 		@OneToOne(optional = false)
-		@JoinColumn(name = "V_ID", foreignKey = @ForeignKey( ConstraintMode.NO_CONSTRAINT ) )
+		@JoinColumn(name = "V_ID", foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
 		private VehicleNumber vehicleNumber;
 
 		public Integer getId() {