HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.collections.custom.basic/declaredtype/parameterized

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

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeAnnotationsVariantTest.java

@@ -5,20 +5,22 @@
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
 import org.hibernate.Hibernate;
+import org.hibernate.testing.orm.junit.DomainModel;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		annotatedClasses = {User.class, Email.class},
+		concurrencyStrategy = "nonstrict-read-write"
+)
 public class UserCollectionTypeAnnotationsVariantTest extends UserCollectionTypeTest {
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { User.class, Email.class };
-	}
 
 	@Override
 	protected void checkEmailAddressInitialization(User user) {
 		assertTrue( Hibernate.isInitialized( user.getEmailAddresses() ) );
 	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeHbmVariantTest.java

@@ -5,25 +5,22 @@
 package org.hibernate.orm.test.mapping.collections.custom.basic;
 
 import org.hibernate.Hibernate;
+import org.hibernate.testing.orm.junit.DomainModel;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		xmlMappings = { "/org/hibernate/orm/test/mapping/collections/custom/basic/UserPermissions.hbm.xml" },
+		concurrencyStrategy = "nonstrict-read-write"
+)
 public class UserCollectionTypeHbmVariantTest extends UserCollectionTypeTest {
-	@Override
-	protected String getBaseForMappings() {
-		return "";
-	}
-
-	@Override
-	public String[] getMappings() {
-		return new String[] { "/org/hibernate/orm/test/mapping/collections/custom/basic/UserPermissions.hbm.xml" };
-	}
 
 	@Override
 	protected void checkEmailAddressInitialization(User user) {
 		assertFalse( Hibernate.isInitialized( user.getEmailAddresses() ) );
 	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/basic/UserCollectionTypeTest.java

@@ -8,55 +8,49 @@
 import jakarta.persistence.criteria.CriteriaQuery;
 
 
-import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Max Rydahl Andersen
  */
-public abstract class UserCollectionTypeTest extends BaseNonConfigCoreFunctionalTestCase {
-
-	@Override
-	protected String getCacheConcurrencyStrategy() {
-		return "nonstrict-read-write";
-	}
+@SessionFactory
+public abstract class UserCollectionTypeTest {
 
 	@Test
-	public void testBasicOperation() {
+	public void testBasicOperation(SessionFactoryScope scope) {
 		User u = new User( 1, "max" );
-		inTransaction(
+		scope.inTransaction(
 				s -> {
 					u.getEmailAddresses().add( new Email("[email protected]") );
 					u.getEmailAddresses().add( new Email("[email protected]") );
 					s.persist(u);
 				}
 		);
 
-		inTransaction(
+		scope.inTransaction(
 				s -> {
 					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
 					CriteriaQuery<User> criteria = criteriaBuilder.createQuery( User.class );
 					criteria.from( User.class );
 					User u2 = s.createQuery( criteria ).uniqueResult();
-//					User u2 = (User) s.createCriteria(User.class).uniqueResult();
 					checkEmailAddressInitialization( u2 );
-					assertEquals( u2.getEmailAddresses().size(), 2 );
+					assertEquals( 2, u2.getEmailAddresses().size() );
 
 				}
 		);
 
-		inTransaction(
+		scope.inTransaction(
 				s -> {
-					User u2 = s.get( User.class, u.getId() );
-					u2.getEmailAddresses().size();
-					assertEquals( 2, MyListType.lastInstantiationRequest );
-
+					User u2 = s.find( User.class, u.getId() );
+					assertEquals( u2.getEmailAddresses().size(), MyListType.lastInstantiationRequest );
 				}
 		);
 
-		inTransaction(
+		scope.inTransaction(
 				s -> s.remove( u )
 		);
 	}

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeAnnotationsVariantTest.java

@@ -5,20 +5,22 @@
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
 import org.hibernate.Hibernate;
+import org.hibernate.testing.orm.junit.DomainModel;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		annotatedClasses = {User.class, Email.class},
+		concurrencyStrategy = "nonstrict-read-write"
+)
 public class UserCollectionTypeAnnotationsVariantTest extends UserCollectionTypeTest {
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { User.class, Email.class };
-	}
 
 	@Override
 	protected void checkEmailAddressInitialization(User user) {
 		assertTrue( Hibernate.isInitialized( user.getEmailAddresses() ) );
 	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeHbmVariantTest.java

@@ -5,20 +5,22 @@
 package org.hibernate.orm.test.mapping.collections.custom.declaredtype;
 
 import org.hibernate.Hibernate;
+import org.hibernate.testing.orm.junit.DomainModel;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		xmlMappings = { "/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserPermissions.hbm.xml" },
+		concurrencyStrategy = "nonstrict-read-write"
+)
 public class UserCollectionTypeHbmVariantTest extends UserCollectionTypeTest {
-	@Override
-	public String[] getMappings() {
-		return new String[] { "mapping/collections/custom/declaredtype/UserPermissions.hbm.xml" };
-	}
 
 	@Override
 	protected void checkEmailAddressInitialization(User user) {
 		assertFalse( Hibernate.isInitialized( user.getEmailAddresses() ) );
 	}
+
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserCollectionTypeTest.java

@@ -7,27 +7,23 @@
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Max Rydahl Andersen
  * @author David Weinberg
  */
-public abstract class UserCollectionTypeTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected String getCacheConcurrencyStrategy() {
-		return "nonstrict-read-write";
-	}
+@SessionFactory
+public abstract class UserCollectionTypeTest {
 
 	@Test
-	public void testBasicOperation() {
-		inTransaction(
+	public void testBasicOperation(SessionFactoryScope scope) {
+		scope.inTransaction(
 				s -> {
 					User u = new User( 1, "max" );
 					u.getEmailAddresses().add( new Email("[email protected]") );
@@ -36,21 +32,19 @@ public void testBasicOperation() {
 				}
 		);
 
-		inTransaction(
+		scope.inTransaction(
 				s -> {
 					CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
 					CriteriaQuery<User> criteria = criteriaBuilder.createQuery( User.class );
 					criteria.from( User.class );
 					User u2 = s.createQuery( criteria ).uniqueResult();
-//		User u2 = (User) s.createCriteria(User.class).uniqueResult();
 					checkEmailAddressInitialization(u2);
-					assertEquals( u2.getEmailAddresses().size(), 2 );
+					assertEquals( 2, u2.getEmailAddresses().size() );
 					assertNotNull( u2.getEmailAddresses().head());
 				}
 		);
 	}
 
 	protected abstract void checkEmailAddressInitialization(User user);
 
-
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/declaredtype/UserWithUnimplementedCollectionTest.java

@@ -14,7 +14,7 @@
 import jakarta.persistence.OneToMany;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test that we get an exception when an attribute whose type is not a Collection

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeAnnotationsVariantTest.java

@@ -4,12 +4,13 @@
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
+import org.hibernate.testing.orm.junit.DomainModel;
+
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		annotatedClasses = {Entity.class}
+)
 public class ParameterizedUserCollectionTypeAnnotationsVariantTest extends ParameterizedUserCollectionTypeTest {
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class[] { Entity.class };
-	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeHbmVariantTest.java

@@ -4,11 +4,13 @@
  */
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
+import org.hibernate.testing.orm.junit.DomainModel;
+
 /**
  * @author Steve Ebersole
  */
+@DomainModel(
+		xmlMappings = { "/org/hibernate/orm/test/mapping/collections/custom/parameterized/Mapping.hbm.xml" }
+)
 public class ParameterizedUserCollectionTypeHbmVariantTest extends ParameterizedUserCollectionTypeTest {
-	public String[] getMappings() {
-		return new String[] { "mapping/collections/custom/parameterized/Mapping.hbm.xml" };
-	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/collections/custom/parameterized/ParameterizedUserCollectionTypeTest.java

@@ -5,41 +5,38 @@
 package org.hibernate.orm.test.mapping.collections.custom.parameterized;
 
 import org.hibernate.Hibernate;
-import org.hibernate.Session;
-import org.hibernate.Transaction;
 
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Tes for parameterized user collection types.
  *
  * @author Holger Brands
  * @author Steve Ebersole
  */
-public abstract class ParameterizedUserCollectionTypeTest extends BaseCoreFunctionalTestCase {
+@SessionFactory
+public abstract class ParameterizedUserCollectionTypeTest {
 	@SuppressWarnings( {"unchecked"})
 	@Test
-	public void testBasicOperation() {
-		Session s = openSession();
-		Transaction t = s.beginTransaction();
-		Entity entity = new Entity( "tester" );
-		entity.getValues().add( "value-1" );
-		s.persist( entity );
-		t.commit();
-		s.close();
+	public void testBasicOperation(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			Entity entity = new Entity( "tester" );
+			entity.getValues().add( "value-1" );
+			session.persist( entity );
+		} );
 
-		s = openSession();
-		t = s.beginTransaction();
-		entity = s.get( Entity.class, "tester" );
-		assertTrue( Hibernate.isInitialized( entity.getValues() ) );
-		assertEquals( 1, entity.getValues().size() );
-		assertEquals( "Hello", ( ( DefaultableList ) entity.getValues() ).getDefaultValue() );
-		s.remove( entity );
-		t.commit();
-		s.close();
+		scope.inTransaction( session -> {
+			Entity entity = session.find( Entity.class, "tester" );
+			assertTrue( Hibernate.isInitialized( entity.getValues() ) );
+			assertEquals( 1, entity.getValues().size() );
+			assertEquals( "Hello", ( ( DefaultableList ) entity.getValues() ).getDefaultValue() );
+			session.remove( entity );
+		} );
 	}
+
 }