HHH-19846 - Remove JUnit4: org.hibernate.orm.test.jpa.metamodel/ops

jrenaat · jrenaat · commit b7d4f6d1b243 · 2025-10-21T20:33:12.000+02:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/AbstractJpaMetamodelPopulationTest.java
@@ -5,35 +5,32 @@
 package org.hibernate.orm.test.jpa.metamodel;
 
 import java.io.Serializable;
-import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 import jakarta.persistence.metamodel.EmbeddableType;
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.Metamodel;
 
-import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.junit.jupiter.api.Test;
 
 import org.hibernate.testing.orm.junit.JiraKey;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-12871")
-public abstract class AbstractJpaMetamodelPopulationTest extends BaseEntityManagerFunctionalTestCase {
+public abstract class AbstractJpaMetamodelPopulationTest {
 	@Entity(name = "SimpleAnnotatedEntity")
 	public static class SimpleAnnotatedEntity {
 		@Id
@@ -55,37 +52,16 @@ public static class CompositeIdId implements Serializable {
 		private Integer id2;
 	}
 
-	@Override
-	protected String[] getMappings() {
-		return new String[] {
-				"org/hibernate/jpa/test/metamodel/SimpleEntity.xml",
-				"org/hibernate/jpa/test/metamodel/CompositeIdEntity.hbm.xml",
-				"org/hibernate/jpa/test/metamodel/CompositeId2Entity.hbm.xml"
-		};
-	}
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { SimpleAnnotatedEntity.class, CompositeIdAnnotatedEntity.class };
-	}
-
 	protected abstract String getJpaMetamodelPopulationValue();
 
-	@Override
-	protected void addConfigOptions(Map options) {
-		super.addConfigOptions( options );
-		options.put( AvailableSettings.JPA_METAMODEL_POPULATION, getJpaMetamodelPopulationValue() );
-	}
-
 	@Test
-	public void testMetamodel() {
-		EntityManager entityManager = getOrCreateEntityManager();
-		try {
+	public void testMetamodel(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
 			final Metamodel metamodel = entityManager.getMetamodel();
 
 			if ( getJpaMetamodelPopulationValue().equalsIgnoreCase( "disabled" ) ) {
 				// In 5.1, metamodel returned null.
-				// In 5.2+, metamodel erturned as a non-null instance.
+				// In 5.2+, metamodel returned as a non-null instance.
 				assertNotNull( metamodel );
 				assertEquals( 0, metamodel.getManagedTypes().size() );
 				assertEquals( 0, metamodel.getEntities().size() );
@@ -98,10 +74,7 @@ public void testMetamodel() {
 			assertManagedTypes( metamodel );
 			assertEntityTypes( metamodel );
 			assertEmbeddableTypes( metamodel );
-		}
-		finally {
-			entityManager.close();
-		}
+		} );
 	}
 
 	private void assertManagedTypes(Metamodel metamodel) {
@@ -153,7 +126,7 @@ private void assertEntityTypes(Metamodel metamodel) {
 			// SimpleAnnotatedEntity
 			// SimpleEntity <-- this should not exist since its entity-type is filtered
 			// CompositeIdEntity <-- this should not exist since its entity-type is filtered
-			// CompsoiteId2Entity <-- this should not exist since its entity-type is filtered
+			// CompositeId2Entity <-- this should not exist since its entity-type is filtered
 			//
 			// In 5.2, this returns 5 elements too.
 			// In 5.3, this returns 5 elements too.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelDisabledPopulationTest.java
@@ -4,12 +4,24 @@
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-12871")
+@Jpa(
+		annotatedClasses = {AbstractJpaMetamodelPopulationTest.SimpleAnnotatedEntity.class, AbstractJpaMetamodelPopulationTest.CompositeIdAnnotatedEntity.class},
+		xmlMappings = {
+				"org/hibernate/jpa/test/metamodel/SimpleEntity.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeIdEntity.hbm.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeId2Entity.hbm.xml"
+		},
+		integrationSettings = {@Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "disabled")}
+)
 public class JpaMetamodelDisabledPopulationTest extends AbstractJpaMetamodelPopulationTest {
 	@Override
 	protected String getJpaMetamodelPopulationValue() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelEnabledPopulationTest.java
@@ -4,12 +4,24 @@
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-12871")
+@Jpa(
+		annotatedClasses = {AbstractJpaMetamodelPopulationTest.SimpleAnnotatedEntity.class, AbstractJpaMetamodelPopulationTest.CompositeIdAnnotatedEntity.class},
+		xmlMappings = {
+				"org/hibernate/jpa/test/metamodel/SimpleEntity.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeIdEntity.hbm.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeId2Entity.hbm.xml"
+		},
+		integrationSettings = {@Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "enabled")}
+)
 public class JpaMetamodelEnabledPopulationTest extends AbstractJpaMetamodelPopulationTest {
 	@Override
 	protected String getJpaMetamodelPopulationValue() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/metamodel/JpaMetamodelIgnoreUnsupportedPopulationTest.java
@@ -4,12 +4,24 @@
  */
 package org.hibernate.orm.test.jpa.metamodel;
 
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.testing.orm.junit.JiraKey;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-12871")
+@Jpa(
+		annotatedClasses = {AbstractJpaMetamodelPopulationTest.SimpleAnnotatedEntity.class, AbstractJpaMetamodelPopulationTest.CompositeIdAnnotatedEntity.class},
+		xmlMappings = {
+				"org/hibernate/jpa/test/metamodel/SimpleEntity.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeIdEntity.hbm.xml",
+				"org/hibernate/jpa/test/metamodel/CompositeId2Entity.hbm.xml"
+		},
+		integrationSettings = {@Setting(name = AvailableSettings.JPA_METAMODEL_POPULATION, value = "ignoreUnsupported")}
+)
 public class JpaMetamodelIgnoreUnsupportedPopulationTest extends AbstractJpaMetamodelPopulationTest {
 	@Override
 	protected String getJpaMetamodelPopulationValue() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/GetLoadTest.java
@@ -121,7 +121,7 @@ public void testLoad(EntityManagerFactoryScope scope) {
 					emp.getId();
 					assertFalse( Hibernate.isInitialized( emp ) );
 					Node node = s.getReference( Node.class, nodeName );
-					assertEquals( node.getName(), nodeName );
+					assertEquals( nodeName, node.getName() );
 					assertFalse( Hibernate.isInitialized( node ) );
 				}
 		);
@@ -133,7 +133,7 @@ public void testLoad(EntityManagerFactoryScope scope) {
 					emp.getId();
 					assertFalse( Hibernate.isInitialized( emp ) );
 					Node node = ( Node ) s.getReference( Node.class.getName(), nodeName );
-					assertEquals( node.getName(), nodeName );
+					assertEquals( nodeName, node.getName() );
 					assertFalse( Hibernate.isInitialized( node ) );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/ops/MergeJpaComplianceTest.java
@@ -7,7 +7,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EmbeddedId;
@@ -17,33 +16,27 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.OneToMany;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil2.fromTransaction;
-import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
 
 @JiraKey( value = "HHH-14608")
-public class MergeJpaComplianceTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] {
-				Person.class, Occupation.class, PersonOccupation.class
-		};
-	}
-
-	@Override
-	protected void addConfigOptions(Map config) {
-		config.put( org.hibernate.cfg.AvailableSettings.JPA_PROXY_COMPLIANCE, true );
-	}
+@Jpa(
+		annotatedClasses = {
+				MergeJpaComplianceTest.Person.class,
+				MergeJpaComplianceTest.Occupation.class,
+				MergeJpaComplianceTest.PersonOccupation.class
+		},
+		integrationSettings = {@Setting(name = AvailableSettings.JPA_PROXY_COMPLIANCE, value = "true")}
+)
+public class MergeJpaComplianceTest {
 
 	@Test
-	public void testMerge() {
-		Person person = fromTransaction(
-				entityManagerFactory(),
+	public void testMerge(EntityManagerFactoryScope scope) {
+		Person person = scope.fromTransaction(
 				entityManager -> {
 					Person p;
 					p = new Person( "1", "Fab" );
@@ -60,8 +53,7 @@ public void testMerge() {
 				}
 		);
 
-		inTransaction(
-				entityManagerFactory(),
+		scope.inTransaction(
 				entityManager -> {
 					person.setName( "Fabiana" );
 					entityManager.merge( person );
@@ -100,7 +92,7 @@ public List<PersonOccupation> getOccupations() {
 			return occupations;
 		}
 
-		protected void addOccupationPeoplet(PersonOccupation personOccupation) {
+		protected void addOccupationPeople(PersonOccupation personOccupation) {
 			if ( this.occupations == null ) {
 				occupations = new ArrayList<>();
 			}
@@ -173,7 +165,7 @@ protected PersonOccupation() {
 		}
 
 		public PersonOccupation(Person person, Occupation occupation) {
-			person.addOccupationPeoplet( this );
+			person.addOccupationPeople( this );
 			occupation.addPersonOccupation( this );
 		}
 
