HHH-19846 - Remove JUnit4: org.hibernate.orm.test.mapping.fetch/formula/generated

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

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/fetch/subselect/SubselectFetchCollectionFromBatchTest.java

@@ -34,9 +34,9 @@
 import jakarta.persistence.Table;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Stephen Fikes

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaBasicsTest.java

@@ -20,7 +20,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Nathan Xu

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaNativeQueryTest.java

@@ -27,7 +27,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hibernate.testing.hamcrest.CollectionMatchers.hasSize;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Алексей Макаров

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaTests.java

@@ -30,7 +30,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author Nathan Xu

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithAliasTest.java

@@ -25,7 +25,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Yanming Zhou

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/formula/FormulaWithPartitionByTest.java

@@ -22,8 +22,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.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 Vlad Mihalcea

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/AbstractGeneratedPropertyTest.java

@@ -3,66 +3,54 @@
  * Copyright Red Hat Inc. and Hibernate Authors
  */
 package org.hibernate.orm.test.mapping.generated;
-import org.junit.Test;
 
-import org.hibernate.Session;
-import org.hibernate.Transaction;
+
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
 
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * Implementation of AbstractGeneratedPropertyTest.
  *
  * @author Steve Ebersole
  */
-public abstract class AbstractGeneratedPropertyTest extends BaseCoreFunctionalTestCase {
-
-	@Override
-	protected String getBaseForMappings() {
-		return "org/hibernate/orm/test/";
-	}
+@SessionFactory
+public abstract class AbstractGeneratedPropertyTest {
 
 	@Test
 	@JiraKey( value = "HHH-2627" )
-	public final void testGeneratedProperty() {
+	public final void testGeneratedProperty(SessionFactoryScope scope) {
 		// The following block is repeated 300 times to reproduce HHH-2627.
 		// Without the fix, Oracle will run out of cursors using 10g with
 		// a default installation (ORA-01000: maximum open cursors exceeded).
-		// The number of loops may need to be adjusted depending on the how
+		// The number of loops may need to be adjusted depending on how
 		// Oracle is configured.
 		// Note: The block is not indented to avoid a lot of irrelevant differences.
 		for ( int i=0; i<300; i++ ) {
-			GeneratedPropertyEntity entity = new GeneratedPropertyEntity();
+			final GeneratedPropertyEntity entity = new GeneratedPropertyEntity();
 			entity.setName( "entity-1" );
-			Session s = openSession();
-			Transaction t = s.beginTransaction();
-			s.persist( entity );
-			s.flush();
-			assertNotNull( "no timestamp retrieved", entity.getLastModified() );
-			t.commit();
-			s.close();
+			scope.inTransaction( session -> {
+				session.persist( entity );
+				session.flush();
+				assertNotNull( entity.getLastModified(), "no timestamp retrieved" );
+			} );
 
 			byte[] bytes = entity.getLastModified();
 
-			s = openSession();
-			t = s.beginTransaction();
-			entity = ( GeneratedPropertyEntity ) s.get( GeneratedPropertyEntity.class, entity.getId() );
-			assertTrue( PrimitiveByteArrayJavaType.INSTANCE.areEqual( bytes, entity.getLastModified() ) );
-			t.commit();
-			s.close();
+			scope.inTransaction( session -> {
+				GeneratedPropertyEntity _entity = session.find( GeneratedPropertyEntity.class, entity.getId() );
+				assertTrue( PrimitiveByteArrayJavaType.INSTANCE.areEqual( bytes, _entity.getLastModified() ) );
+			} );
 
 			assertTrue( PrimitiveByteArrayJavaType.INSTANCE.areEqual( bytes, entity.getLastModified() ) );
 
-			s = openSession();
-			t = s.beginTransaction();
-			s.remove( entity );
-			t.commit();
-			s.close();
+			scope.inTransaction( session -> session.remove( entity ) );
 		}
 	}
 }

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/CreationTimestampTest.java

@@ -11,27 +11,20 @@
 import jakarta.persistence.Id;
 
 import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.junit.Test;
-
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Vlad Mihalcea
  */
-public class CreationTimestampTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Event.class
-		};
-	}
+@Jpa(annotatedClasses = {CreationTimestampTest.Event.class})
+public class CreationTimestampTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			//tag::mapping-generated-CreationTimestamp-persist-example[]
 			Event dateEvent = new Event();
 			entityManager.persist(dateEvent);

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DatabaseValueGenerationTest.java

@@ -14,32 +14,25 @@
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.EventTypeSets;
 import org.hibernate.generator.OnExecutionGenerator;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-
 /**
  * @author Vlad Mihalcea
  */
-public class DatabaseValueGenerationTest extends BaseEntityManagerFunctionalTestCase {
-
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] {
-			Event.class
-		};
-	}
+@Jpa(annotatedClasses = {DatabaseValueGenerationTest.Event.class})
+public class DatabaseValueGenerationTest {
 
 	@Test
-	public void test() {
-		doInJPA(this::entityManagerFactory, entityManager -> {
+	public void test(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			Event dateEvent = new Event();
 			entityManager.persist(dateEvent);
 		});

hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/DefaultGeneratedValueIdentityTest.java

@@ -46,9 +46,9 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 @RequiresDialectFeature( feature = DialectFeatureChecks.SupportsIdentityColumns.class)
 @RequiresDialectFeature( feature = DialectFeatureChecks.CurrentTimestampHasMicrosecondPrecision.class )
@@ -109,7 +109,7 @@ public void testGenerationWithIdentityInsert(SessionFactoryScope scope) {
 		assertEquals( "Bob", theEntity.name );
 
 		scope.inTransaction( (session) -> {
-			TheEntity _theEntity = session.get( TheEntity.class, theEntity.id );
+			TheEntity _theEntity = session.find( TheEntity.class, theEntity.id );
 			assertNotNull( _theEntity.createdDate );
 			assertNotNull( _theEntity.alwaysDate );
 			assertNotNull( _theEntity.vmCreatedDate );