HHH-19846 - Remove JUnit4: org.hibernate.orm.test.jpa.graphs/*

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/CacheableEntityGraphTest.java

@@ -11,7 +11,6 @@
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityGraph;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
@@ -23,43 +22,38 @@
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
-public class CacheableEntityGraphTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { Product.class, Color.class, Tag.class };
-	}
+@Jpa(annotatedClasses = {CacheableEntityGraphTest.Product.class, CacheableEntityGraphTest.Color.class, CacheableEntityGraphTest.Tag.class})
+public class CacheableEntityGraphTest {
 
 	@Test
 	@JiraKey(value = "HHH-15964")
-	public void test() {
-		EntityManager em = getOrCreateEntityManager();
-
-		em.getTransaction().begin();
-		Tag tag = new Tag( Set.of( TagType.FOO ) );
-		em.persist( tag );
-
-		Color color = new Color();
-		em.persist( color );
-
-		Product product = new Product( tag, color );
-		em.persist( product );
-		em.getTransaction().commit();
-
-		em.clear();
-
-		EntityGraph<Product> entityGraph = em.createEntityGraph( Product.class );
-		entityGraph.addAttributeNodes( "tag" );
-
-		em.createQuery( "select p from Product p", Product.class )
-				.setMaxResults( 2 )
-				.setHint( "jakarta.persistence.loadgraph", entityGraph )
-				.getSingleResult();
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inEntityManager( entityManager -> {
+			entityManager.getTransaction().begin();
+			Tag tag = new Tag( Set.of( TagType.FOO ) );
+			entityManager.persist( tag );
+
+			Color color = new Color();
+			entityManager.persist( color );
+
+			Product product = new Product( tag, color );
+			entityManager.persist( product );
+			entityManager.getTransaction().commit();
+
+			EntityGraph<Product> entityGraph = entityManager.createEntityGraph( Product.class );
+			entityGraph.addAttributeNodes( "tag" );
+
+			entityManager.createQuery( "select p from Product p", Product.class )
+					.setMaxResults( 2 )
+					.setHint( "jakarta.persistence.loadgraph", entityGraph )
+					.getSingleResult();
+		} );
 	}
 
 	@Entity(name = "Product")

hibernate-core/src/test/java/org/hibernate/orm/test/jpa/graphs/EntityGraphAttributeResolutionTest.java

@@ -25,81 +25,76 @@
 import jakarta.persistence.Table;
 
 import org.hibernate.graph.GraphSemantic;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Before;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-
 
 /**
  * @author Benjamin M.
  * @author Nathan Xu
  */
 @JiraKey( value = "HHH-14113" )
 @SuppressWarnings({ "unchecked", "rawtypes" })
-public class EntityGraphAttributeResolutionTest extends BaseEntityManagerFunctionalTestCase {
+@Jpa(annotatedClasses = {EntityGraphAttributeResolutionTest.User.class, EntityGraphAttributeResolutionTest.Group.class})
+public class EntityGraphAttributeResolutionTest {
 
 	private User u;
 	private Group g1, g2;
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { User.class, Group.class };
-	}
-
-	@Before
-	public void setUp() {
-		doInJPA( this::entityManagerFactory, em -> {
+	@BeforeEach
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			g1 = new Group();
 			g1.addPermission( Permission.BAR );
-			em.persist( g1 );
+			entityManager.persist( g1 );
 
 			g2 = new Group();
 			g2.addPermission( Permission.BAZ );
-			em.persist( g2 );
+			entityManager.persist( g2 );
 
 			u = new User();
-			em.persist( u );
+			entityManager.persist( u );
 			u.addGroup( g1 );
 			u.addGroup( g2 );
 		} );
 	}
 
 	@Test
-	public void fetchAssocWithNamedFetchGraph() {
-		doInJPA( this::entityManagerFactory, em -> {
-			List result = em.createQuery( "SELECT u.groups FROM User u WHERE u.id = ?1" )
+	public void fetchAssocWithNamedFetchGraph(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			List result = entityManager.createQuery( "SELECT u.groups FROM User u WHERE u.id = ?1" )
 					.setParameter(1, u.getId() )
-					.setHint( GraphSemantic.FETCH.getJpaHintName(), em.getEntityGraph( Group.ENTITY_GRAPH ) )
+					.setHint( GraphSemantic.FETCH.getJpaHintName(), entityManager.getEntityGraph( Group.ENTITY_GRAPH ) )
 					.getResultList();
 
 			assertThat( result ).containsExactlyInAnyOrder( g1, g2 );
 		} );
 	}
 
 	@Test
-	public void fetchAssocWithNamedFetchGraphAndJoin() {
-		doInJPA( this::entityManagerFactory, em -> {
-			List result = em.createQuery( "SELECT g FROM User u JOIN u.groups g WHERE u.id = ?1" )
+	public void fetchAssocWithNamedFetchGraphAndJoin(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			List result = entityManager.createQuery( "SELECT g FROM User u JOIN u.groups g WHERE u.id = ?1" )
 					.setParameter( 1, u.getId() )
-					.setHint( GraphSemantic.FETCH.getJpaHintName(), em.getEntityGraph( Group.ENTITY_GRAPH ) )
+					.setHint( GraphSemantic.FETCH.getJpaHintName(), entityManager.getEntityGraph( Group.ENTITY_GRAPH ) )
 					.getResultList();
 
 			assertThat( result ).containsExactlyInAnyOrder( g1, g2 );
 		} );
 	}
 
 	@Test
-	public void fetchAssocWithAdhocFetchGraph() {
-		doInJPA( this::entityManagerFactory, em -> {
-			EntityGraph<Group> eg = em.createEntityGraph( Group.class );
+	public void fetchAssocWithAdhocFetchGraph(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			EntityGraph<Group> eg = entityManager.createEntityGraph( Group.class );
 			eg.addAttributeNodes( "permissions" );
 
-			List result = em.createQuery( "SELECT u.groups FROM User u WHERE u.id = ?1" )
+			List result = entityManager.createQuery( "SELECT u.groups FROM User u WHERE u.id = ?1" )
 					.setParameter(1, u.getId() )
 					.setHint( GraphSemantic.FETCH.getJpaHintName(), eg )
 					.getResultList();