HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.inheritance/*

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

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/JoinedInheritanceEagerTest.java

@@ -17,7 +17,7 @@
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -77,7 +77,7 @@ public void joinUnrelatedCollectionOnBaseType(SessionFactoryScope scope) {
 						fail( "Expected a resolution exception for property 'attributes'!" );
 					}
 					catch (IllegalArgumentException ex) {
-						Assert.assertTrue( ex.getCause().getMessage().contains( "Could not resolve attribute 'attributes' "));
+						Assertions.assertTrue( ex.getCause().getMessage().contains( "Could not resolve attribute 'attributes' "));
 					}
 					finally {
 						session.getTransaction().commit();

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/MultiInheritanceDiscriminatorTest.java

@@ -68,7 +68,7 @@ public void testAbstractSuperClassMappingHbm(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					AccountOwner _owner = session.get( AccountOwner.class, ownerId );
+					AccountOwner _owner = session.find( AccountOwner.class, ownerId );
 					assertEquals( 2, _owner.getCreditAccounts().size() );
 					assertEquals( "CreditAccount", _owner.getCreditAccounts().iterator().next().getClass().getSimpleName() );
 
@@ -113,7 +113,7 @@ public void testAbstractSuperClassMappingAnn(SessionFactoryScope scope) {
 
 		scope.inTransaction(
 				session -> {
-					AccOwner _owner = session.get( AccOwner.class, ownerId );
+					AccOwner _owner = session.find( AccOwner.class, ownerId );
 					assertEquals( 2, _owner.getCreditAccs().size() );
 					assertEquals( "CreditAcc", _owner.getCreditAccs().iterator().next().getClass().getSimpleName() );
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/discriminator/joined/JoinedSubclassInheritanceTest.java

@@ -8,7 +8,7 @@
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -24,7 +24,7 @@
 @SessionFactory
 public class JoinedSubclassInheritanceTest {
 
-	@After
+	@AfterEach
 	public void tearDown(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session ->

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceSameTableDifferentSchemaTest.java

@@ -15,7 +15,7 @@
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.testing.orm.junit.Jira;
 import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceTest.java

@@ -26,7 +26,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Andrea Boriero

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithConcreteRootTest.java

@@ -26,7 +26,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Andrea Boriero

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedInheritanceWithExplicitDiscriminatorTest.java

@@ -25,7 +25,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Andrea Boriero

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/JoinedSubclassTest.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.orm.test.mapping.inheritance.joined;
 
-import java.util.Iterator;
 import java.util.List;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
@@ -66,46 +65,46 @@ public void testJoinedSubclass(SessionFactoryScope scope) {
 			s.persist( mark );
 			s.persist( joe );
 
-			assertEquals( s.createQuery( "from Person" ).list().size(), 3 );
-			assertEquals( s.createQuery( "from Person p where p.class = Customer" ).list().size(), 1 );
-			assertEquals( s.createQuery( "from Person p where p.class = Person" ).list().size(), 1 );
-			assertEquals( s.createQuery( "from Person p where type(p) in :who" )
+			assertEquals( 3, s.createQuery( "from Person" ).list().size() );
+			assertEquals( 1, s.createQuery( "from Person p where p.class = Customer" ).list().size() );
+			assertEquals( 1, s.createQuery( "from Person p where p.class = Person" ).list().size() );
+			assertEquals( 1, s.createQuery( "from Person p where type(p) in :who" )
 								.setParameter( "who", Customer.class )
 								.list()
-								.size(), 1 );
-			assertEquals( s.createQuery( "from Person p where type(p) in :who" ).setParameterList(
+								.size() );
+			assertEquals( 2, s.createQuery( "from Person p where type(p) in :who" ).setParameterList(
 					"who",
 					new Class[] {
 							Customer.class,
 							Person.class
 					}
-			).list().size(), 2 );
+			).list().size() );
 			s.clear();
 
 			List customers = s.createQuery( "from Customer c left join fetch c.salesperson" ).list();
-			for ( Iterator iter = customers.iterator(); iter.hasNext(); ) {
-				Customer c = (Customer) iter.next();
+			for ( Object o : customers ) {
+				Customer c = (Customer) o;
 				assertTrue( Hibernate.isInitialized( c.getSalesperson() ) );
-				assertEquals( c.getSalesperson().getName(), "Mark" );
+				assertEquals( "Mark", c.getSalesperson().getName() );
 			}
-			assertEquals( customers.size(), 1 );
+			assertEquals( 1, customers.size() );
 			s.clear();
 
 			customers = s.createQuery( "from Customer" ).list();
-			for ( Iterator iter = customers.iterator(); iter.hasNext(); ) {
-				Customer c = (Customer) iter.next();
+			for ( Object customer : customers ) {
+				Customer c = (Customer) customer;
 				assertFalse( Hibernate.isInitialized( c.getSalesperson() ) );
-				assertEquals( c.getSalesperson().getName(), "Mark" );
+				assertEquals( "Mark", c.getSalesperson().getName() );
 			}
-			assertEquals( customers.size(), 1 );
+			assertEquals( 1, customers.size() );
 			s.clear();
 
 
-			mark = (Employee) s.get( Employee.class, new Long( mark.getId() ) );
-			joe = (Customer) s.get( Customer.class, new Long( joe.getId() ) );
+			mark = s.find( Employee.class, mark.getId() );
+			joe = s.find( Customer.class, joe.getId() );
 
 			mark.setZip( "30306" );
-			assertEquals( s.createQuery( "from Person p where p.address.zip = '30306'" ).list().size(), 1 );
+			assertEquals( 1, s.createQuery( "from Person p where p.address.zip = '30306'" ).list().size() );
 
 			CriteriaBuilder criteriaBuilder = s.getCriteriaBuilder();
 			CriteriaQuery<Person> criteria = criteriaBuilder.createQuery( Person.class );

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/inheritance/joined/MixedInheritanceTest.java

@@ -28,8 +28,8 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
-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;
 
 /**
  * @author Andrea Boriero
@@ -155,7 +155,7 @@ public void subclassQueryExecutionTest(SessionFactoryScope scope) {
 								ForeignCustomer.class
 						).list();
 
-						assertEquals( results.size(), 2 );
+						assertEquals( 2, results.size() );
 
 						for ( ForeignCustomer foreignCustomer : results ) {
 							if ( foreignCustomer.getId() == 2 ) {