HHH-19846 Drop JUnit 4 usage

# Conflicts:
#	hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/dom4j/DeprecationLoggingTest.java

@@ -9,36 +9,36 @@
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
 import org.hibernate.internal.log.DeprecationLogger;
 import org.hibernate.service.ServiceRegistry;
-
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.testing.logger.LoggerInspectionRule;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.orm.logger.LoggerInspectionExtension;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 /**
  * Tests that {@code hbm.xml} mappings that do not specify dom4j entity-mode information
  * do not trigger deprecation logging
  *
  * @author Steve Ebersole
  */
-public class DeprecationLoggingTest extends BaseUnitTestCase {
-
-	@Rule
-	public LoggerInspectionRule logInspection = new LoggerInspectionRule( DeprecationLogger.DEPRECATION_LOGGER );
+@BaseUnitTest
+public class DeprecationLoggingTest {
+	@RegisterExtension
+	public LoggerInspectionExtension logInspection = LoggerInspectionExtension.builder()
+			.setLogger( DeprecationLogger.DEPRECATION_LOGGER ).build();
 
 	@Test
 	public void basicTest() {
 		logInspection.registerListener( LogListenerImpl.INSTANCE );
 
 		MetadataSources metadataSources = new MetadataSources( ServiceRegistryUtil.serviceRegistry() )
-			.addResource( "org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml" );
+				.addResource( "org/hibernate/orm/test/entitymode/dom4j/Car.hbm.xml" );
 		try {
 			metadataSources.buildMetadata();
 		}
 		finally {
 			ServiceRegistry metaServiceRegistry = metadataSources.getServiceRegistry();
-			if(metaServiceRegistry instanceof BootstrapServiceRegistry ) {
+			if ( metaServiceRegistry instanceof BootstrapServiceRegistry ) {
 				BootstrapServiceRegistryBuilder.destroy( metaServiceRegistry );
 			}
 		}

hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/basic/DynamicClassTest.java

@@ -12,71 +12,76 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 
 /**
  * @author Gavin King
  */
-@SessionFactory
 @DomainModel(
 		xmlMappings = "org/hibernate/orm/test/entitymode/map/basic/ProductLine.hbm.xml"
 )
-class DynamicClassTest {
+@SessionFactory
+public class DynamicClassTest {
 
 	@Test
-	void testLazyDynamicClass(SessionFactoryScope scope) {
-		scope.inTransaction( s -> {
-			Map<String, Object> cars = new HashMap<>();
-			cars.put( "description", "Cars" );
-			Map<String, Object> monaro = new HashMap<>();
-			monaro.put( "productLine", cars );
-			monaro.put( "name", "monaro" );
-			monaro.put( "description", "Holden Monaro" );
-			Map<String, Object> hsv = new HashMap<>();
-			hsv.put( "productLine", cars );
-			hsv.put( "name", "hsv" );
-			hsv.put( "description", "Holden Commodore HSV" );
-			List<Map<String, Object>> models = new ArrayList<>();
-			cars.put( "models", models );
-			models.add( hsv );
-			models.add( monaro );
-			s.persist( "ProductLine", cars );
-		} );
-
-		scope.inTransaction( s -> {
-			Map<String, Object> cars = (Map<String, Object>) s.createQuery(
-					"from ProductLine pl order by pl.description" ).uniqueResult();
-			List<Map<String, Object>> models = (List<Map<String, Object>>) cars.get( "models" );
-			assertFalse( Hibernate.isInitialized( models ) );
-			assertEquals( 2, models.size() );
-			assertTrue( Hibernate.isInitialized( models ) );
-
-			s.clear();
-
-			List<?> list = s.createQuery( "from Model m" ).list();
-			for ( Iterator<?> i = list.iterator(); i.hasNext(); ) {
-				assertFalse( Hibernate.isInitialized( ((Map<String, Object>) i.next()).get( "productLine" ) ) );
-			}
-			Map<String, Object> model = (Map<String, Object>) list.get( 0 );
-			assertTrue( ((List<Map<String, Object>>) ((Map<String, Object>) model.get( "productLine" )).get(
-					"models" )).contains( model ) );
-			s.clear();
-
-		} );
-
-		scope.inTransaction( s -> {
-			Map<String, Object> cars = (Map<String, Object>) s.createQuery(
-					"from ProductLine pl order by pl.description" ).uniqueResult();
-			s.remove( cars );
-		} );
+	public void testLazyDynamicClass(SessionFactoryScope scope) {
+
+		scope.inTransaction(
+				session -> {
+					Map<String, Object> cars = new HashMap<>();
+					cars.put( "description", "Cars" );
+
+					Map<String, Object> monaro = new HashMap<>();
+					monaro.put( "productLine", cars );
+					monaro.put( "name", "monaro" );
+					monaro.put( "description", "Holden Monaro" );
+
+					Map<String, Object> hsv = new HashMap<>();
+					hsv.put( "productLine", cars );
+					hsv.put( "name", "hsv" );
+					hsv.put( "description", "Holden Commodore HSV" );
+
+					List<Map<String, Object>> models = new ArrayList<>();
+					cars.put( "models", models );
+					models.add( hsv );
+					models.add( monaro );
+
+					session.persist( "ProductLine", cars );
+				}
+		);
+
+		scope.inTransaction(
+				session -> {
+					Map<String, Object> cars = (Map<String, Object>) session
+							.createQuery( "from ProductLine pl order by pl.description" )
+							.uniqueResult();
+					List<Map<String, Object>> models = (List<Map<String, Object>>) cars.get( "models" );
+					assertThat( Hibernate.isInitialized( models ) ).isFalse();
+					assertThat( models ).hasSize( 2 );
+					assertThat( Hibernate.isInitialized( models ) ).isTrue();
+
+					session.clear();
+
+					List<Map<String, Map<String, Object>>> list = session.createQuery( "from Model m" ).list();
+					for ( Map<String, Map<String, Object>> stringObjectMap : list ) {
+						assertThat( Hibernate.isInitialized( stringObjectMap.get( "productLine" ) ) ).isFalse();
+					}
+					Map<String, Map<String, Object>> model = list.get( 0 );
+					assertThat( ((((List<Map<String, Object>>) (model.get( "productLine" )).get( "models" )) ).contains( model );
+					session.clear();
+				}
+		);
+
+
+		scope.inTransaction(
+				session -> {
+					session.remove(
+							session.createQuery( "from ProductLine pl order by pl.description" ).uniqueResult() );
+				}
+		);
 	}
 
 	@Test

hibernate-core/src/test/java/org/hibernate/orm/test/entitymode/map/subclass/SubclassDynamicMapTest.java

@@ -4,40 +4,33 @@
  */
 package org.hibernate.orm.test.entitymode.map.subclass;
 
-import java.util.HashMap;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import java.util.HashMap;
 
-import org.hibernate.Session;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 /**
  * @author Steve Ebersole
  */
-public class SubclassDynamicMapTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
-
-	@Override
-	public String[] getMappings() {
-		return new String[] { "entitymode/map/subclass/Mappings.hbm.xml" };
-	}
+@DomainModel(
+		xmlMappings = "org/hibernate/orm/test/entitymode/map/subclass/Mappings.hbm.xml"
+)
+@SessionFactory
+public class SubclassDynamicMapTest {
 
 	@Test
-	public void testConcreateSubclassDeterminationOnEmptyDynamicMap() {
-		Session s = openSession();
-		s.beginTransaction();
-		s.persist( "Superclass", new HashMap() );
-		s.getTransaction().commit();
-		s.close();
-
-		s = openSession();
-		s.beginTransaction();
-		s.createQuery( "delete Superclass" ).executeUpdate();
-		s.getTransaction().commit();
-		s.close();
+	public void testConcreateSubclassDeterminationOnEmptyDynamicMap(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session ->
+						session.persist( "Superclass", new HashMap<>() )
+		);
+
+		scope.inTransaction(
+				session ->
+						session.createMutationQuery( "delete Superclass" ).executeUpdate()
+		);
 	}
 }