HHH-19846 - Remove JUnit4: org.hibernate.orm.test.dialect

jrenaat · jrenaat · commit 1e4516cb623e · 2025-10-14T14:21:45.000+02:00
Signed-off-by: Jan Schatteman &lt;jschatte@redhat.com&gt;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2390DialectTestCase.java
@@ -12,31 +12,43 @@
 import jakarta.persistence.Id;
 
 import org.hibernate.dialect.DB2zDialect;
-import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
-import org.hibernate.testing.RequiresDialect;
+import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 
-import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * @author Chris Cranford
  */
 @JiraKey(value = "HHH-11747")
 @RequiresDialect(DB2zDialect.class)
-public class DB2390DialectTestCase extends BaseEntityManagerFunctionalTestCase {
-	@Override
-	protected Class<?>[] getAnnotatedClasses() {
-		return new Class<?>[] { SimpleEntity.class };
+@Jpa(annotatedClasses =  {DB2390DialectTestCase.SimpleEntity.class})
+public class DB2390DialectTestCase {
+
+	@BeforeAll
+	public void populateSchema(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
+			for ( int i = 0; i < 10; ++i ) {
+				final SimpleEntity simpleEntity = new SimpleEntity( i, "Entity" + i );
+				entityManager.persist( simpleEntity );
+			}
+		} );
+	}
+
+	@AfterAll
+	public void cleanSchema(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> scope.getEntityManagerFactory().getSchemaManager().truncate() );
 	}
 
 	@Test
-	public void testLegacyLimitHandlerWithNoOffset() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
+	public void testLegacyLimitHandlerWithNoOffset(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			List<SimpleEntity> results = entityManager.createQuery( "FROM SimpleEntity", SimpleEntity.class )
 					.setMaxResults( 2 )
 					.getResultList();
@@ -45,8 +57,8 @@ public void testLegacyLimitHandlerWithNoOffset() {
 	}
 
 	@Test
-	public void testLegacyLimitHandlerWithOffset() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
+	public void testLegacyLimitHandlerWithOffset(EntityManagerFactoryScope scope) {
+		scope.inTransaction( entityManager -> {
 			List<SimpleEntity> results = entityManager.createQuery( "FROM SimpleEntity", SimpleEntity.class )
 					.setFirstResult( 2 )
 					.setMaxResults( 2 )
@@ -55,23 +67,6 @@ public void testLegacyLimitHandlerWithOffset() {
 		} );
 	}
 
-	@Before
-	public void populateSchema() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			for ( int i = 0; i < 10; ++i ) {
-				final SimpleEntity simpleEntity = new SimpleEntity( i, "Entity" + i );
-				entityManager.persist( simpleEntity );
-			}
-		} );
-	}
-
-	@After
-	public void cleanSchema() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			entityManager.createQuery( "DELETE FROM SimpleEntity" ).executeUpdate();
-		} );
-	}
-
 	@Entity(name = "SimpleEntity")
 	public static class SimpleEntity {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2DialectTestCase.java
@@ -12,14 +12,13 @@
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 
-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;
 
 /**
  * DB2 dialect related test cases
@@ -28,11 +27,11 @@
  */
 
 @RequiresDialect(DB2Dialect.class)
-public class DB2DialectTestCase extends BaseUnitTestCase {
+public class DB2DialectTestCase {
 	private final DB2Dialect dialect = new DB2Dialect();
 	private TypeConfiguration typeConfiguration;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		typeConfiguration = new TypeConfiguration();
 		dialect.contributeTypes( () -> typeConfiguration, null );
@@ -53,23 +52,23 @@ public void testGetDefaultBinaryTypeName() {
 	@JiraKey(value = "HHH-6866")
 	public void testGetExplicitBinaryTypeName() {
 		// lower bound
-		String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 1) );
+		String actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length(1) );
 		assertEquals(
 				"Wrong binary type",
 				"binary(1)",
 				actual
 		);
 
 		// upper bound
-		actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 254) );
+		actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length(254) );
 		assertEquals(
 				"Wrong binary type. 254 is the max length in DB2",
 				"binary(254)",
 				actual
 		);
 
 		// exceeding upper bound
-		actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length( 255) );
+		actual = typeConfiguration.getDdlTypeRegistry().getTypeName( Types.BINARY, Size.length(255) );
 		assertEquals(
 				"Wrong binary type. Should be varchar for length > 254",
 				"varbinary(255)",
@@ -85,8 +84,8 @@ public void testIntegerOverflowForMaxResults() {
 		rowSelection.setMaxRows(Integer.MAX_VALUE);
 		String sql = dialect.getLimitHandler().processSql( "select a.id from tbl_a a order by a.id", -1, null, new LimitQueryOptions( rowSelection ) );
 		assertTrue(
-				"Integer overflow for max rows in: " + sql,
-				sql.contains("fetch next ? rows only")
-		);
+				sql.contains("fetch next ? rows only"),
+				"Integer overflow for max rows in: " + sql
+				);
 	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/Db2VariantDialectInitTests.java
@@ -8,9 +8,9 @@
 import org.hibernate.dialect.DB2zDialect;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 /**
  * @author Steve Ebersole
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DialectMinimumVersionTest.java
@@ -15,8 +15,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-
-
 import static org.hibernate.internal.CoreMessageLogger.CORE_LOGGER;
 
 /**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/HANADialectTestCase.java
@@ -26,8 +26,8 @@
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 @SuppressWarnings("JUnitMalformedDeclaration")
 @ServiceRegistry
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/PostgreSQLDialectTestCase.java
@@ -31,27 +31,26 @@
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.JiraKey;
-import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.type.spi.TypeConfiguration;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.mockito.Mockito;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 /**
  * Test case for PostgreSQL specific things.
  * @author Bryan Varner
  * @author Christoph Dreis
  */
 @RequiresDialect(PostgreSQLDialect.class)
-public class PostgreSQLDialectTestCase extends BaseUnitTestCase {
+public class PostgreSQLDialectTestCase {
 
 	@Test
 	@JiraKey( value = "HHH-7251")
@@ -61,7 +60,7 @@ public void testDeadlockException() {
 		assertNotNull(delegate);
 
 		JDBCException exception = delegate.convert(new SQLException("Deadlock Detected", "40P01"), "", "");
-		assertTrue(exception instanceof LockAcquisitionException);
+		assertInstanceOf( LockAcquisitionException.class, exception );
 	}
 
 	@Test
@@ -72,7 +71,7 @@ public void testTimeoutException() {
 		assertNotNull(delegate);
 
 		JDBCException exception = delegate.convert(new SQLException("Lock Not Available", "55P03"), "", "");
-		assertTrue(exception instanceof PessimisticLockException);
+		assertInstanceOf( PessimisticLockException.class, exception );
 	}
 
 	@Test
@@ -83,23 +82,24 @@ public void testQueryTimeoutException() {
 		assertNotNull( delegate );
 
 		final JDBCException exception = delegate.convert( new SQLException("Client cancelled operation", "57014"), "", "" );
-		assertTrue( exception instanceof QueryTimeoutException );
+		assertInstanceOf( QueryTimeoutException.class, exception );
 	}
 
 	/**
 	 * Tests that getForUpdateString(String aliases, LockOptions lockOptions) will return a String
 	 * that will effect the SELECT ... FOR UPDATE OF tableAlias1, ..., tableAliasN
 	 */
 	@JiraKey( value = "HHH-5654" )
+	@Test
 	public void testGetForUpdateStringWithAliasesAndLockOptions() {
 		PostgreSQLDialect dialect = new PostgreSQLDialect();
 		LockOptions lockOptions = new LockOptions( LockMode.PESSIMISTIC_WRITE );
 
 		String forUpdateClause = dialect.getForUpdateString("tableAlias1", lockOptions);
-		assertEquals( "for update of tableAlias1", forUpdateClause );
+		assertEquals( " for no key update of tableAlias1", forUpdateClause );
 
 		forUpdateClause = dialect.getForUpdateString("tableAlias1,tableAlias2", lockOptions);
-		assertEquals("for update of tableAlias1,tableAlias2", forUpdateClause);
+		assertEquals(" for no key update of tableAlias1,tableAlias2", forUpdateClause);
 	}
 
 	@Test
@@ -121,7 +121,7 @@ public void testMessageException() {
 			fail( "Expected UnsupportedOperationException" );
 		}
 		catch (Exception e) {
-			assertTrue( e instanceof UnsupportedOperationException );
+			assertInstanceOf( UnsupportedOperationException.class, e );
 			assertEquals( "PostgreSQL only supports accessing REF_CURSOR parameters by position", e.getMessage() );
 		}
 	}
