HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/IdManyToOneTest.java

@@ -9,31 +9,71 @@
 import jakarta.persistence.criteria.Join;
 import jakarta.persistence.criteria.JoinType;
 import jakarta.persistence.criteria.Root;
-
-import org.hibernate.Session;
+import org.hibernate.boot.model.naming.ImplicitNamingStrategy;
 import org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl;
-import org.hibernate.cfg.Configuration;
-
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SettingProvider;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Emmanuel Bernard
  */
-public class IdManyToOneTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = {
+				Store.class,
+				Customer.class,
+				StoreCustomer.class,
+				CardKey.class,
+				CardField.class,
+				Card.class,
+				Project.class,
+				Course.class,
+				Student.class,
+				CourseStudent.class,
+
+				//tested only through deployment
+				//ANN-590 testIdClassManyToOneWithReferenceColumn
+				Customers.class,
+				ShoppingBaskets.class,
+				ShoppingBasketsPK.class,
+				BasketItems.class,
+				BasketItemsPK.class
+		}
+)
+@ServiceRegistry(
+		settingProviders = @SettingProvider(settingName = AvailableSettings.IMPLICIT_NAMING_STRATEGY,
+				provider = IdManyToOneTest.ImplicitNameSettingProvider.class)
+)
+@SessionFactory
+public class IdManyToOneTest {
+
+	public static class ImplicitNameSettingProvider implements SettingProvider.Provider<ImplicitNamingStrategy> {
+
+		@Override
+		public ImplicitNamingStrategy getSetting() {
+			return ImplicitNamingStrategyJpaCompliantImpl.INSTANCE;
+		}
+	}
+
 	@Test
-	public void testFkCreationOrdering() {
+	public void testFkCreationOrdering(SessionFactoryScope scope) {
 		//no real test case, the sessionFactory building is tested
-		Session s = openSession();
-		s.close();
+		scope.inTransaction(
+				session -> {
+				}
+		);
 	}
 
 	@Test
-	public void testIdClassManyToOne() {
-		inTransaction( s-> {
+	public void testIdClassManyToOne(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
 			Store store = new Store();
 			Customer customer = new Customer();
 			s.persist( store );
@@ -43,18 +83,19 @@ public void testIdClassManyToOne() {
 			s.flush();
 			s.clear();
 
-			store = s.get(Store.class, store.id );
-			assertEquals( 1, store.customers.size() );
-			assertEquals( customer.id, store.customers.iterator().next().customer.id );
+			store = s.find( Store.class, store.id );
+			assertThat( store.customers.size() ).isEqualTo( 1 );
+			assertThat( store.customers.iterator().next().customer.id ).isEqualTo( customer.id );
 		} );
 		//TODO test Customers / ShoppingBaskets / BasketItems testIdClassManyToOneWithReferenceColumn
 	}
 
 	@Test
-	@JiraKey( value = "HHH-7767" )
-	public void testCriteriaRestrictionOnIdManyToOne() {
-		inTransaction( s -> {
-			s.createQuery( "from Course c join c.students cs join cs.student s where s.name = 'Foo'", Object[].class ).list();
+	@JiraKey(value = "HHH-7767")
+	public void testCriteriaRestrictionOnIdManyToOne(SessionFactoryScope scope) {
+		scope.inTransaction( s -> {
+			s.createQuery( "from Course c join c.students cs join cs.student s where s.name = 'Foo'", Object[].class )
+					.list();
 
 			CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
 			CriteriaQuery<Course> criteria = criteriaBuilder.createQuery( Course.class );
@@ -77,34 +118,4 @@ public void testCriteriaRestrictionOnIdManyToOne() {
 //        criteria2.list();
 		} );
 	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
-				Store.class,
-				Customer.class,
-				StoreCustomer.class,
-				CardKey.class,
-				CardField.class,
-				Card.class,
-				Project.class,
-				Course.class,
-				Student.class,
-				CourseStudent.class,
-
-				//tested only through deployment
-				//ANN-590 testIdClassManyToOneWithReferenceColumn
-				Customers.class,
-				ShoppingBaskets.class,
-				ShoppingBasketsPK.class,
-				BasketItems.class,
-				BasketItemsPK.class
-		};
-	}
-
-	@Override
-	protected void configure(Configuration configuration) {
-		super.configure( configuration );
-		configuration.setImplicitNamingStrategy( ImplicitNamingStrategyJpaCompliantImpl.INSTANCE );
-	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalIdManyToOneTest.java

@@ -4,21 +4,30 @@
  */
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 
-import org.junit.Test;
-
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+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;
 
 /**
  * @author Emmanuel Bernard
  */
-public class AlphabeticalIdManyToOneTest extends BaseCoreFunctionalTestCase {
+@DomainModel(
+		annotatedClasses = {
+				B.class,
+				C.class,
+				A.class
+		}
+)
+@SessionFactory
+public class AlphabeticalIdManyToOneTest {
+
 	@Test
-	public void testAlphabeticalTest() throws Exception {
+	public void testAlphabeticalTest(SessionFactoryScope scope) {
 		//test through deployment
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] { B.class, C.class, A.class };
+		scope.inTransaction(
+				session -> {
+				}
+		);
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idmanytoone/alphabetical/AlphabeticalManyToOneTest.java

@@ -4,26 +4,32 @@
  */
 package org.hibernate.orm.test.annotations.idmanytoone.alphabetical;
 
-import org.junit.Test;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+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;
 
 /**
  * @author Emmanuel Bernard
  */
-public class AlphabeticalManyToOneTest extends BaseCoreFunctionalTestCase {
-	@Test
-	public void testAlphabeticalTest() throws Exception {
-		//test through deployment
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
+@DomainModel(
+		annotatedClasses = {
 				Acces.class,
 				Droitacces.class,
 				Benefserv.class,
 				Service.class
-		};
+		}
+)
+@SessionFactory
+public class AlphabeticalManyToOneTest {
+
+	@Test
+	public void testAlphabeticalTest(SessionFactoryScope scope) {
+		//test through deployment
+		scope.inTransaction(
+				session -> {
+				}
+		);
 	}
 }