HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.access

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

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/ElementCollectionAccessTest.java

@@ -15,27 +15,19 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class ElementCollectionAccessTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Book.class
-		};
-	}
+@Jpa(annotatedClasses = {ElementCollectionAccessTest.Book.class})
+public class ElementCollectionAccessTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
 			Book book = new Book();
 			book.setId(1L);
 			book.setTitle("High-Performance Java Persistence");

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/EmbeddableAccessTest.java

@@ -11,27 +11,19 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class EmbeddableAccessTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Book.class
-		};
-	}
+@Jpa(annotatedClasses = {EmbeddableAccessTest.Book.class})
+public class EmbeddableAccessTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
 			Book book = new Book();
 			book.setId(1L);
 			book.setTitle("High-Performance Java Persistence");

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/FieldAccessTest.java

@@ -7,27 +7,19 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class FieldAccessTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Book.class
-		};
-	}
+@Jpa(annotatedClasses = {FieldAccessTest.Book.class})
+public class FieldAccessTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
 			Book book = new Book();
 			book.setId(1L);
 			book.setTitle("High-Performance Java Persistence");

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessOverrideTest.java

@@ -10,27 +10,19 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Version;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class PropertyAccessOverrideTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Book.class
-		};
-	}
+@Jpa(annotatedClasses = {PropertyAccessOverrideTest.Book.class})
+public class PropertyAccessOverrideTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
 			Book book = new Book();
 			book.setId(1L);
 			book.setTitle("High-Performance Java Persistence");

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/access/PropertyAccessTest.java

@@ -7,27 +7,19 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class PropertyAccessTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Book.class
-		};
-	}
+@Jpa(annotatedClasses = {PropertyAccessTest.Book.class})
+public class PropertyAccessTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction(entityManager -> {
 			Book book = new Book();
 			book.setId(1L);
 			book.setTitle("High-Performance Java Persistence");