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

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

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/MoneyConverterTest.java

@@ -9,21 +9,20 @@
 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 MoneyConverterTest extends BaseEntityManagerFunctionalTestCase {
+@Jpa(annotatedClasses = {MoneyConverterTest.Account.class})
+public class MoneyConverterTest {
 
 	@Test
-	public void testConverterMutability() {
+	public void testConverterMutability(EntityManagerFactoryScope scope) {
 
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			Account account = new Account();
 			account.setId(1L);
 			account.setOwner("John Doe");
@@ -32,7 +31,7 @@ public void testConverterMutability() {
 			entityManager.persist(account);
 		});
 
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			//tag::basic-jpa-convert-money-converter-mutability-plan-example[]
 			Account account = entityManager.find(Account.class, 1L);
 			account.getBalance().setCents(150 * 100L);
@@ -42,11 +41,6 @@ public void testConverterMutability() {
 	}
 
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { Account.class };
-	}
-
 	//tag::basic-jpa-convert-money-converter-mapping-example[]
 	public static class Money {
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/PeriodStringTest.java

@@ -11,38 +11,31 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Vlad Mihalcea
  */
-public class PeriodStringTest extends BaseEntityManagerFunctionalTestCase {
+@Jpa(annotatedClasses = {PeriodStringTest.Event.class})
+public class PeriodStringTest {
 
 	private Period period = Period.ofYears(1).plusMonths(2).plusDays(3);
 
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-				Event.class
-		};
-	}
-
 	@Test
-	public void testLifecycle() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void testLifecycle(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			Event event = new Event(period);
 			entityManager.persist(event);
 		});
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
 			assertEquals(period, event.getSpan());
 		});
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			//tag::basic-jpa-convert-period-string-converter-immutability-plan-example[]
 			Event event = entityManager.createQuery("from Event", Event.class).getSingleResult();
 			event.setSpan(Period

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.java

@@ -4,21 +4,20 @@
  */
 package org.hibernate.orm.test.mapping.converter.hbm;
 
-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 MoneyConverterHbmTest extends BaseEntityManagerFunctionalTestCase {
+@Jpa(xmlMappings = {"org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.hbm.xml"})
+public class MoneyConverterHbmTest {
 
 	@Test
-	public void testConverterMutability() {
+	public void testConverterMutability(EntityManagerFactoryScope scope) {
 
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			Account account = new Account();
 			account.setId(1L);
 			account.setOwner("John Doe");
@@ -27,7 +26,7 @@ public void testConverterMutability() {
 			entityManager.persist(account);
 		});
 
-		doInJPA(this::entityManagerFactory, entityManager -> {
+		scope.inTransaction( entityManager -> {
 			//tag::basic-hbm-convert-money-converter-mutability-plan-example[]
 			Account account = entityManager.find(Account.class, 1L);
 			account.getBalance().setCents(150 * 100L);
@@ -36,10 +35,4 @@ public void testConverterMutability() {
 		});
 	}
 
-	@Override
-	protected String[] getMappings() {
-		return new String[] {
-				"org/hibernate/orm/test/mapping/converter/hbm/MoneyConverterHbmTest.hbm.xml"
-		};
-	}
 }