HHH-19846 Drop JUnit 4 usage

Author: dreab8

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Administration.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import jakarta.persistence.Basic;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/BusTrip.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import java.util.Date;
 import java.util.List;
 import java.util.Map;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/ElementCollectionConverterTest.java

@@ -4,43 +4,31 @@
  */
 package org.hibernate.orm.test.annotations.reflection;
 
-import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
-
+import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 import org.hibernate.testing.orm.junit.JiraKeyGroup;
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
-import static org.junit.Assert.assertEquals;
-
-@JiraKeyGroup( value = {
-		@JiraKey( value = "HHH-11924" ),
-		@JiraKey( value = "HHH-14529" )
-} )
-public class ElementCollectionConverterTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder builder) {
-		super.prepareBootstrapRegistryBuilder( builder );
-	}
-
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] {
-			Company.class,
-		};
-	}
-
-	@Override
-	protected String[] getOrmXmlFiles() {
-		return new String[] { "org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml" };
-	}
-
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@JiraKeyGroup(value = {
+		@JiraKey(value = "HHH-11924"),
+		@JiraKey(value = "HHH-14529")
+})
+@DomainModel(
+		annotatedClasses = {
+				Company.class
+		},
+		xmlMappings = "org/hibernate/orm/test/annotations/reflection/element-collection-converter-orm.xml"
+)
+@SessionFactory
+public class ElementCollectionConverterTest {
 
 	@Test
-	public void testConverterIsAppliedToElementCollection() {
-		doInHibernate( this::sessionFactory, session -> {
+	public void testConverterIsAppliedToElementCollection(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
 			Company company = new Company();
 			company.setId( 1L );
 
@@ -52,16 +40,16 @@ public void testConverterIsAppliedToElementCollection() {
 			session.persist( company );
 		} );
 
-		doInHibernate( this::sessionFactory, session -> {
-			String organizationId = (String) session
-					.createNativeQuery( "select organizations from Company_organizations" )
+		scope.inTransaction( session -> {
+			String organizationId = session
+					.createNativeQuery( "select organizations from Company_organizations", String.class )
 					.getSingleResult();
-			assertEquals( "ORG-ACME", organizationId );
+			assertThat( organizationId ).isEqualTo( "ORG-ACME" );
 
 			Company company = session.find( Company.class, 1L );
 
-			assertEquals( 1, company.getOrganizations().size() );
-			assertEquals( "ACME" , company.getOrganizations().get( 0 ).getOrganizationId());
+			assertThat( company.getOrganizations().size() ).isEqualTo( 1 );
+			assertThat( company.getOrganizations().get( 0 ).getOrganizationId() ).isEqualTo( "ACME" );
 		} );
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/Match.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Inheritance;
 import jakarta.persistence.InheritanceType;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityMoralAccount.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.IdClass;

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityNumber.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import java.io.Serializable;
 import jakarta.persistence.Embeddable;
 
@@ -21,9 +22,7 @@ public boolean equals(Object o) {
 		final SocialSecurityNumber that = (SocialSecurityNumber) o;
 
 		if ( !countryCode.equals( that.countryCode ) ) return false;
-		if ( !number.equals( that.number ) ) return false;
-
-		return true;
+		return number.equals( that.number );
 	}
 
 	public int hashCode() {

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/SocialSecurityPhysicalAccount.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import jakarta.persistence.Entity;
 
 /**

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/reflection/TennisMatch.java

@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.reflection;
+
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
 import jakarta.persistence.Column;