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)
* org.hibernate.orm.test.cdi.general.hibernatesearch.extended.HibernateSearchExtendedCdiSupportTest - not sure yet, all the other tests here pass with conversion - shelved for now

Author: sebersole

hibernate-core/src/main/java/org/hibernate/engine/spi/TransactionCompletionCallbacksImplementor.java

@@ -10,9 +10,8 @@
  * @since 7.2
  *
  * @author Gavin King
- *
  */
-@Incubating // is this separate interface really needed?
+@Incubating
 public interface TransactionCompletionCallbacksImplementor extends TransactionCompletionCallbacks {
 	/**
 	 * Are there any registered before-completion callbacks?

hibernate-core/src/main/java/org/hibernate/service/internal/AbstractServiceRegistryImpl.java

@@ -340,6 +340,7 @@ public <R extends Service> void startService(ServiceBinding<R> serviceBinding) {
 		}
 	}
 
+	@Override
 	public boolean isActive() {
 		return active.get();
 	}

hibernate-core/src/main/java/org/hibernate/service/spi/ServiceRegistryImplementor.java

@@ -30,6 +30,8 @@ default void close() {
 		destroy();
 	}
 
+	boolean isActive();
+
 	/**
 	 * Release resources
 	 */

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneMapsIdFlushModeTest.java

@@ -4,9 +4,6 @@
  */
 package org.hibernate.orm.test.annotations.manytoone;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import jakarta.persistence.Entity;
 import jakarta.persistence.FlushModeType;
 import jakarta.persistence.GeneratedValue;
@@ -15,56 +12,53 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.OneToMany;
-
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.junit.Test;
-
-import org.hibernate.testing.DialectChecks;
-import org.hibernate.testing.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.transaction.TransactionUtil;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @author Chris Cranford
  */
+@SuppressWarnings("JUnitMalformedDeclaration")
 @JiraKey(value = "HHH-13044")
-@RequiresDialectFeature(DialectChecks.SupportsIdentityColumns.class)
-public class ManyToOneMapsIdFlushModeTest extends BaseEntityManagerFunctionalTestCase {
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { ParentEntity.class, ChildEntity.class };
-	}
-
+@RequiresDialectFeature(feature= DialectFeatureChecks.SupportsIdentityColumns.class)
+@DomainModel(annotatedClasses = { ManyToOneMapsIdFlushModeTest.ParentEntity.class, ManyToOneMapsIdFlushModeTest.ChildEntity.class })
+@SessionFactory
+public class ManyToOneMapsIdFlushModeTest {
 	@Test
-	public void testFlushModeCommitWithMapsIdAndIdentity() {
-		final ParentEntity parent = TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-			entityManager.setFlushMode( FlushModeType.COMMIT );
+	public void testFlushModeCommitWithMapsIdAndIdentity(SessionFactoryScope factoryScope) {
+		final ParentEntity parent = factoryScope.fromTransaction( (session) -> {
+			session.setFlushMode( FlushModeType.COMMIT );
 
-			final ParentEntity parentEntity = new ParentEntity();
+			var parentEntity = new ParentEntity();
 			parentEntity.setData( "test" );
 
-			final ChildEntity childEntity = new ChildEntity();
+			var childEntity = new ChildEntity();
 			parentEntity.addChild( childEntity );
 
-			entityManager.persist( parentEntity );
-			entityManager.persist( childEntity );
+			session.persist( parentEntity );
+			session.persist( childEntity );
 
 			return parentEntity;
 		} );
 
-		TransactionUtil.doInJPA( this::entityManagerFactory, entityManager -> {
-			final ParentEntity parentEntity = entityManager.find( ParentEntity.class, parent.getId() );
-			assertNotNull( parentEntity );
-			assertNotNull( parentEntity.getChildren() );
-			assertTrue( !parentEntity.getChildren().isEmpty() );
+		factoryScope.inTransaction( (session) -> {
+			final ParentEntity parentEntity = session.find( ParentEntity.class, parent.getId() );
+			Assertions.assertNotNull( parentEntity );
+			Assertions.assertNotNull( parentEntity.getChildren() );
+			Assertions.assertFalse( parentEntity.getChildren().isEmpty() );
 
 			final ChildEntity childEntity = parentEntity.getChildren().iterator().next();
-			assertNotNull( childEntity );
-			assertEquals( parentEntity.getId(), childEntity.getId() );
+			Assertions.assertNotNull( childEntity );
+			Assertions.assertEquals( parentEntity.getId(), childEntity.getId() );
 		} );
 	}