HHH-19846 - Drop JUnit 4 usage

Not converted...
* org.hibernate.orm.test.hql.PostgreSQLFunctionSelectClauseTest - registering custom function
* org.hibernate.orm.test.hql.PostgreSQLFunctionWhereClauseTest - aux-db-object
* org.hibernate.orm.test.id.usertype - type registrations
* org.hibernate.orm.test.idgen.enhanced.HiloOptimizerConcurrencyTest - recreation of SF during tests
* org.hibernate.orm.test.type.AbstractJavaTimeTypeTest subtypes - crazy parameterization (see org.hibernate.orm.test.tm.InterceptorTransactionTest)

Author: sebersole

hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/delayed/DelayedCdiHostedConverterTest.java

@@ -6,34 +6,32 @@
 
 import jakarta.enterprise.inject.se.SeContainer;
 import jakarta.enterprise.inject.se.SeContainerInitializer;
-
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.tool.schema.Action;
-
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-
 import org.hibernate.orm.test.cdi.converters.ConverterBean;
 import org.hibernate.orm.test.cdi.converters.MonitorBean;
 import org.hibernate.orm.test.cdi.converters.TheEntity;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.ServiceRegistryUtil;
+import org.hibernate.tool.schema.Action;
+import org.junit.jupiter.api.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil2.inTransaction;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-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.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Steve Ebersole
  */
-public class DelayedCdiHostedConverterTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class DelayedCdiHostedConverterTest {
 	@Test
 	public void testIt() {
 		MonitorBean.reset();

hibernate-core/src/test/java/org/hibernate/orm/test/cdi/converters/legacy/ConversionAutoApplyTest.java

@@ -4,137 +4,113 @@
  */
 package org.hibernate.orm.test.cdi.converters.legacy;
 
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
 import jakarta.persistence.AttributeConverter;
 import jakarta.persistence.Column;
 import jakarta.persistence.Converter;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EntityManager;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-
-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;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Test AttributeConverter functioning in case where entity type is derived from jdbc type.
  *
  * @author Karthik Abram
  */
+@SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey( value = "HHH-10549" )
-public class ConversionAutoApplyTest extends BaseEntityManagerFunctionalTestCase {
-
+@Jpa(annotatedClasses = {
+		ConversionAutoApplyTest.Widget.class,
+		ConversionAutoApplyTest.MoneyConverter.class
+})
+public class ConversionAutoApplyTest {
 	@Test
-	public void testConverterIsNotIncorrectlyApplied() {
-		Widget w = new Widget();
-		w.setId( 1 );
-		w.setDimension( new BigDecimal( "1.0" ) );
-		w.setCost( new Money( "2.0" ) );
-
-		EntityManager em = entityManagerFactory().createEntityManager();
-		em.getTransaction().begin();
-		em.persist( w );
-		em.getTransaction().commit();
-		em.close();
-
-		em = entityManagerFactory().createEntityManager();
-		em.getTransaction().begin();
-		Widget recorded = em.find( Widget.class, 1 );
-		assertEquals( 1, recorded.getId() );
-
-		em.remove(recorded);
-		em.getTransaction().commit();
-		em.close();
+	public void testConverterIsNotIncorrectlyApplied(EntityManagerFactoryScope factoryScope) {
+		factoryScope.inTransaction( (em) -> {
+			Widget w = new Widget();
+			w.setId( 1 );
+			w.setDimension( new BigDecimal( "1.0" ) );
+			w.setCost( new Money( "2.0" ) );
+			em.persist( w );
+		} );
+
+		factoryScope.inTransaction( (em) -> {
+			Widget recorded = em.find( Widget.class, 1 );
+			assertEquals( 1, recorded.getId() );
+
+			em.remove(recorded);
+		} );
 	}
 
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { Widget.class, MoneyConverter.class };
-	}
-
-
 	public static class Money extends BigDecimal {
-
 		public Money(String value) {
 			super( value );
 		}
 
-
 		public Money(BigDecimal value) {
 			super( value.toString() );
 		}
 
-
 		@Override
 		public BigDecimal add(BigDecimal augend) {
 			return new Money( this.add( augend ).setScale( 10, RoundingMode.HALF_EVEN ) );
 		}
 	}
 
-
 	@Converter( autoApply = true )
 	public static class MoneyConverter implements AttributeConverter<Money, BigDecimal> {
-
 		@Override
 		public BigDecimal convertToDatabaseColumn(Money attribute) {
 			return attribute == null ? null : new BigDecimal(attribute.toString());
 		}
 
-
 		@Override
 		public Money convertToEntityAttribute(BigDecimal dbData) {
 			return dbData == null ? null : new Money( dbData.toString() );
 		}
-
 	}
 
 
 	@Entity
 	@Table( name = "Widget" )
 	public static class Widget {
-
 		private int id;
 		private BigDecimal dimension;
 		private Money cost;
 
-
 		@Id
 		public int getId() {
 			return id;
 		}
 
-
 		public void setId(int id) {
 			this.id = id;
 		}
 
-
 		public BigDecimal getDimension() {
 			return dimension;
 		}
 
-
 		public void setDimension(BigDecimal dimension) {
 			this.dimension = dimension;
 		}
 
-
 		@Column( name = "cost" )
 		public Money getCost() {
 			return cost;
 		}
 
-
 		public void setCost(Money cost) {
 			this.cost = cost;
 		}
-
 	}