HHH-19846 Drop JUnit 4 usage

dreab8 · dreab8 · commit ec0b015ee9e1 · 2025-10-17T09:20:10.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/uniqueconstraint/UniqueConstraintBatchingTest.java
@@ -60,17 +60,17 @@ public void testBatching(EntityManagerFactoryScope scope) throws Exception {
 
 		scope.inTransaction(
 				entityManager -> {
-					livingRoom.setId( 1l );
+					livingRoom.setId( 1L );
 					livingRoom.setName( "livingRoom" );
 					entityManager.persist( livingRoom );
 				} );
 
 		scope.inTransaction(
 				entityManager -> {
 					House house = new House();
-					house.setId( 1l );
+					house.setId( 1L );
 					house.setCost( 100 );
-					house.setHeight( 1000l );
+					house.setHeight( 1000L );
 					house.setRoom( livingRoom );
 					entityManager.persist( house );
 				} );
@@ -79,9 +79,9 @@ public void testBatching(EntityManagerFactoryScope scope) throws Exception {
 			scope.inTransaction(
 					entityManager -> {
 						House house2 = new House();
-						house2.setId( 2l );
+						house2.setId( 2L );
 						house2.setCost( 100 );
-						house2.setHeight( 1001l );
+						house2.setHeight( 1001L );
 						house2.setRoom( livingRoom );
 						entityManager.persist( house2 );
 					} );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Conductor.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
+
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/DBTimestamped.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
+
 import java.util.Date;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/GeneratedTest.java
@@ -25,7 +25,7 @@ public void testGenerated(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
 					Antenna antenna = new Antenna();
-					antenna.id = new Integer( 1 );
+					antenna.id = 1;
 					session.persist( antenna );
 					assertNull( antenna.latitude );
 					assertNull( antenna.longitude );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneOneGeneratedValueTest.java
@@ -34,17 +34,17 @@ public class OneOneGeneratedValueTest {
 	public void testIt(SessionFactoryScope scope) {
 		scope.inTransaction(
 				session -> {
-					EntityA entityA = new EntityA( 1l );
+					EntityA entityA = new EntityA( 1L );
 					session.persist( entityA );
 				}
 		);
 		scope.inTransaction(
 				session -> {
-					EntityA entityA = session.get( EntityA.class, 1l );
+					EntityA entityA = session.get( EntityA.class, 1L );
 					assertThat( entityA ).isNotNull();
 					EntityB entityB = entityA.getB();
 					assertThat( entityB ).isNotNull();
-					assertThat( entityB.getB() ).isEqualTo( 5l );
+					assertThat( entityB.getB() ).isEqualTo( 5L );
 				}
 		);
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OneToOneOptimisticLockTest.java
@@ -43,7 +43,7 @@ public void setUp(SessionFactoryScope scope) {
 	public void testUpdateChildDoesNotIncrementParentVersion(SessionFactoryScope scope) {
 		Integer version = scope.fromTransaction(
 				session -> {
-					Parent parent = session.get( Parent.class, PARENT_ID );
+					Parent parent = session.find( Parent.class, PARENT_ID );
 					Integer vers = parent.getVersion();
 
 					Child child = new Child( 2 );
@@ -56,7 +56,7 @@ public void testUpdateChildDoesNotIncrementParentVersion(SessionFactoryScope sco
 
 		scope.inTransaction(
 				session -> {
-					Parent parent = session.get( Parent.class, PARENT_ID );
+					Parent parent = session.find( Parent.class, PARENT_ID );
 					assertThat( parent.getVersion() ).isEqualTo( version );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/OptimisticLockAnnotationTest.java
@@ -36,14 +36,14 @@ public void testOptimisticLockExcludeOnNameProperty(SessionFactoryScope scope) {
 
 					session.clear();
 
-					c = session.get( Conductor.class, c.getId() );
+					c = session.find( Conductor.class, c.getId() );
 					Long version = c.getVersion();
 					c.setName( "Don" );
 					session.flush();
 
 					session.clear();
 
-					c = session.get( Conductor.class, c.getId() );
+					c = session.find( Conductor.class, c.getId() );
 					assertEquals( version, c.getVersion() );
 				}
 		);
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/TimestampTest.java
@@ -10,29 +10,28 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
+import org.hibernate.testing.util.ServiceRegistryUtil;
 import org.hibernate.type.BasicType;
 import org.hibernate.type.BasicTypeReference;
 import org.hibernate.type.StandardBasicTypes;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import org.hibernate.testing.AfterClassOnce;
-import org.hibernate.testing.BeforeClassOnce;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.hibernate.testing.util.ServiceRegistryUtil;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Test for the @Timestamp annotation.
  *
  * @author Hardy Ferentschik
  */
-public class TimestampTest extends BaseUnitTestCase {
+@BaseUnitTest
+public class TimestampTest {
 	private StandardServiceRegistry ssr;
 	private MetadataImplementor metadata;
 
-	@BeforeClassOnce
+	@BeforeAll
 	public void setUp() {
 		ssr = ServiceRegistryUtil.serviceRegistry();
 		metadata = (MetadataImplementor) new MetadataSources( ssr )
@@ -42,7 +41,7 @@ public void setUp() {
 				.build();
 	}
 
-	@AfterClassOnce
+	@AfterAll
 	public void tearDown() {
 		if ( ssr != null ) {
 			StandardServiceRegistryBuilder.destroy( ssr );
@@ -65,9 +64,11 @@ private void assertTimestampSource(Class<?> clazz, BasicTypeReference<?> typeRef
 
 	private void assertTimestampSource(Class<?> clazz, BasicType<?> basicType) throws Exception {
 		PersistentClass persistentClass = metadata.getEntityBinding( clazz.getName() );
-		assertNotNull( persistentClass );
+		assertThat( persistentClass ).isNotNull();
 		Property versionProperty = persistentClass.getVersion();
-		assertNotNull( versionProperty );
-		assertEquals( "Wrong timestamp type", basicType, versionProperty.getType() );
+		assertThat( versionProperty ).isNotNull();
+		assertThat( versionProperty.getType() )
+				.describedAs( "Wrong timestamp type" )
+				.isEqualTo( basicType );
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Truck.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.various;
+
 import jakarta.persistence.Entity;
 import jakarta.persistence.Index;
 import jakarta.persistence.JoinColumn;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/various/Vehicule.java
@@ -40,7 +40,7 @@ public class Vehicule {
 	private Conductor currentConductor;
 	@Column(name = "`year`")
 	private Integer year;
-	@ManyToOne(optional = true)
+	@ManyToOne
 	private Conductor previousConductor;
 
 	public String getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/CarModel.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
+
 import jakarta.persistence.Column;
 import java.util.Date;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Company.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
+
 import java.util.HashMap;
 import java.util.Map;
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlElementCollectionTest.java
@@ -8,7 +8,6 @@
 import org.hibernate.models.spi.MemberDetails;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Test;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
@@ -37,12 +36,14 @@
 import jakarta.persistence.Temporal;
 import jakarta.persistence.TemporalType;
 import jakarta.persistence.UniqueConstraint;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SuppressWarnings("deprecation")
 @JiraKey("HHH-14529")
 public class Ejb3XmlElementCollectionTest extends Ejb3XmlTestCase {
+
 	@Test
 	public void testNoChildren() {
 		final MemberDetails memberDetails = getAttributeMember( Entity2.class, "field1", "element-collection.orm1.xml" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlManyToOneTest.java
@@ -13,7 +13,6 @@
 import org.hibernate.models.spi.MemberDetails;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Test;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
@@ -25,11 +24,13 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MapsId;
 import jakarta.persistence.UniqueConstraint;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @JiraKey("HHH-14529")
 public class Ejb3XmlManyToOneTest extends Ejb3XmlTestCase {
+
 	@Test
 	public void testNoJoins() {
 		final MemberDetails memberDetails = getAttributeMember( Entity1.class, "field1", "many-to-one.orm1.xml" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlOneToOneTest.java
@@ -12,7 +12,6 @@
 import org.hibernate.models.spi.MemberDetails;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.junit.Test;
 
 import jakarta.persistence.Access;
 import jakarta.persistence.AccessType;
@@ -26,11 +25,13 @@
 import jakarta.persistence.PrimaryKeyJoinColumn;
 import jakarta.persistence.PrimaryKeyJoinColumns;
 import jakarta.persistence.UniqueConstraint;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @JiraKey("HHH-14529")
 public class Ejb3XmlOneToOneTest extends Ejb3XmlTestCase {
+
 	@Test
 	public void testNoChildren() {
 		final MemberDetails memberDetails = getAttributeMember( Entity1.class, "field1", "one-to-one.orm1.xml" );
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
@@ -26,11 +26,11 @@
 import org.hibernate.models.spi.ModelsContext;
 
 import org.hibernate.testing.boot.BootstrapContextImpl;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
-import org.junit.After;
-import org.junit.Before;
+import org.hibernate.testing.orm.junit.BaseUnitTest;
 
 import jakarta.persistence.Transient;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import static org.hibernate.models.internal.SimpleClassLoading.SIMPLE_CLASS_LOADING;
 
@@ -39,18 +39,19 @@
  * XML to JPA annotations.  The configuration is built within each test, and no
  * database is used.  Thus, no schema generation or cleanup will be performed.
  */
-public abstract class Ejb3XmlTestCase extends BaseUnitTestCase {
+@BaseUnitTest
+public abstract class Ejb3XmlTestCase  {
 	private BootstrapContextImpl bootstrapContext;
 
 	protected Ejb3XmlTestCase() {
 	}
 
-	@Before
+	@BeforeEach
 	public void init() {
 		bootstrapContext = new BootstrapContextImpl();
 	}
 
-	@After
+	@AfterEach
 	public void destroy() {
 		bootstrapContext.close();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity2.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
+
 import java.util.List;
 
 public class Entity2 {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Entity3.java
@@ -3,6 +3,7 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.annotations.xml.ejb3;
+
 import java.util.Map;
 
 public class Entity3 {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Manufacturer.java
@@ -20,7 +20,7 @@
 @TableGenerator(name = "generator", table = "this is a broken name with select from and other SQL keywords")
 public class Manufacturer {
 	private Integer id;
-	private Set<Model> models = new HashSet<Model>();
+	private Set<Model> models = new HashSet<>();
 
 	@Id
 	public Integer getId() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java
@@ -8,28 +8,29 @@
 import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.BootstrapServiceRegistry;
 import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
-
+import org.hibernate.testing.orm.junit.BaseUnitTest;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.orm.junit.JiraKeyGroup;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import static org.junit.Assert.fail;
 
-@JiraKeyGroup( value = {
-		@JiraKey( value = "HHH-6271" ),
-		@JiraKey( value = "HHH-14529" )
-} )
-public class NonExistentOrmVersionTest extends BaseUnitTestCase {
+@JiraKeyGroup(value = {
+		@JiraKey(value = "HHH-6271"),
+		@JiraKey(value = "HHH-14529")
+})
+@BaseUnitTest
+public class NonExistentOrmVersionTest {
+
 	@Test
 	public void testNonExistentOrmVersion() {
 		try (BootstrapServiceRegistry serviceRegistry = new BootstrapServiceRegistryBuilder().build()) {
-			new MetadataSources( serviceRegistry )
-					.addResource( "org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml" )
-					.buildMetadata();
-			fail( "Expecting failure due to unsupported xsd version" );
-		}
-		catch ( InvalidMappingException expected ) {
+			assertThrows( InvalidMappingException.class, () -> new MetadataSources( serviceRegistry )
+							.addResource( "org/hibernate/orm/test/annotations/xml/ejb3/orm5.xml" )
+							.buildMetadata()
+					, "Expecting failure due to unsupported xsd version"
+			);
 		}
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/PreParsedOrmXmlTest.java
