HHH-19916 - Drop JUnit 4 usage

sebersole · sebersole · commit 08c1559407eb · 2025-11-11T12:21:18.000-07:00
Not converted...
* org.hibernate.orm.test.type.AbstractJavaTimeTypeTest subtypes - crazy parameterization (see org.hibernate.orm.test.tm.InterceptorTransactionTest)
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/PostgreSQLMultipleTypesContributorTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/json/PostgreSQLMultipleTypesContributorTest.java
@@ -65,6 +65,7 @@ public void tearDown(SessionFactoryScope factoryScope) {
 	@Test
 	public void testMultipleTypeContributions(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
+			//noinspection removal
 			var inets = entityManager.createNativeQuery(
 				"select e.ip " +
 				"from Event e " +
@@ -80,6 +81,7 @@ public void testMultipleTypeContributions(SessionFactoryScope factoryScope) {
 	@Test
 	public void testMultipleTypeContributionsExplicitBinding(SessionFactoryScope factoryScope) {
 		factoryScope.inTransaction( entityManager -> {
+			//noinspection unchecked,deprecation
 			List<Inet> inets = entityManager.createNativeQuery(
 				"select e.ip " +
 				"from Event e " +
@@ -96,7 +98,7 @@ public void testMultipleTypeContributionsExplicitBinding(SessionFactoryScope fac
 
 	@Entity(name = "Event")
 	@Table(name = "event")
-	public class Event {
+	public static class Event {
 
 		@Id
 		private Long id;
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/foreignkeys/crossschema/CrossSchemaForeignKeyGenerationTest.java
@@ -4,6 +4,7 @@
  */
 package org.hibernate.orm.test.schemaupdate.foreignkeys.crossschema;
 
+import org.hamcrest.MatcherAssert;
 import org.hibernate.engine.config.spi.ConfigurationService;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
@@ -50,11 +51,11 @@
 
 import static org.hamcrest.core.Is.is;
 import static org.hibernate.cfg.SchemaToolingSettings.JAKARTA_HBM2DDL_CREATE_SCHEMAS;
-import static org.junit.Assert.assertThat;
 
 /**
  * @author Andrea Boriero
  */
+@SuppressWarnings("JUnitMalformedDeclaration")
 @RequiresDialectFeature(feature = DialectFeatureChecks.SupportSchemaCreation.class)
 @ServiceRegistry(settings = @Setting(name = JAKARTA_HBM2DDL_CREATE_SCHEMAS, value = "true"))
 @DomainModel(annotatedClasses = {SchemaOneEntity.class, SchemaTwoEntity.class})
@@ -78,11 +79,8 @@ public void testSchemaExportForeignKeysAreGeneratedAfterAllTheTablesAreCreated(
 				.create( EnumSet.of( TargetType.SCRIPT, TargetType.STDOUT ), modelScope.getDomainModel() );
 
 		final List<String> sqlLines = Files.readAllLines( scriptFile.toPath(), Charset.defaultCharset() );
-		assertThat(
-				"Expected alter table SCHEMA1.Child add constraint but is : " + sqlLines.get( 4 ),
-				sqlLines.get( sqlLines.size() - 1 ).startsWith( "alter table " ),
-				is( true )
-		);
+		MatcherAssert.assertThat( "Expected alter table SCHEMA1.Child add constraint but is : " + sqlLines.get( 4 ),
+				sqlLines.get( sqlLines.size() - 1 ).startsWith( "alter table " ), is( true ) );
 	}
 
 	@Test
@@ -112,8 +110,7 @@ public void testSchemaUpdateDoesNotFailResolvingCrossSchemaForeignKey(
 	@JiraKey(value = "HHH-10420")
 	public void testSchemaMigrationForeignKeysAreGeneratedAfterAllTheTablesAreCreated(
 			ServiceRegistryScope registryScope,
-			DomainModelScope modelScope,
-			@TempDir File tmpDir) throws Exception {
+			DomainModelScope modelScope) throws Exception {
 		final var metadata = modelScope.getDomainModel();
 
 		final HibernateSchemaManagementTool tool = (HibernateSchemaManagementTool) registryScope
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemaupdate/uniqueconstraint/UniqueConstraintDropTest.java
@@ -85,18 +85,18 @@ public void testUniqueConstraintIsDropped(
 
 		if ( !(dialect.getUniqueDelegate() instanceof SkipNullableUniqueDelegate) ) {
 			if ( dialect.getUniqueDelegate() instanceof AlterTableUniqueIndexDelegate) {
-				assertTrue( checkDropIndex( "test_entity_item", "item", scriptFile ) );
+				assertTrue( checkDropIndex( scriptFile ) );
 			}
 			else if ( dialect.getUniqueDelegate() instanceof AlterTableUniqueDelegate ) {
 				MatcherAssert.assertThat( "The test_entity_item table unique constraint has not been dropped",
-						checkDropConstraint( "test_entity_item", "item", dialect, scriptFile ),
+						checkDropConstraint( "test_entity_item", dialect, scriptFile ),
 						is( true )
 				);
 			}
 		}
 
 		MatcherAssert.assertThat(
-				checkDropConstraint( "test_entity_children", "child",  dialect, scriptFile ),
+				checkDropConstraint( "test_entity_children", dialect, scriptFile ),
 				is( true )
 		);
 	}
@@ -123,7 +123,6 @@ public ExceptionHandler getExceptionHandler() {
 
 	private boolean checkDropConstraint(
 			String tableName,
-			String columnName,
 			Dialect dialect,
 			File scriptFile) throws IOException {
 		String regex = dialect.getAlterTableString( tableName ) + ' ' + dialect.getDropUniqueKeyString();
@@ -138,8 +137,8 @@ private boolean checkDropConstraint(
 		return isMatching( regex, scriptFile );
 	}
 
-	private boolean checkDropIndex(String tableName, String columnName, File scriptFile) throws IOException {
-		String regex = "drop index " + tableName + ".uk.*";
+	private boolean checkDropIndex(File scriptFile) throws IOException {
+		String regex = "drop index test_entity_item.uk.*";
 		return isMatching( regex, scriptFile );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/EnumValidationTest.java
@@ -74,18 +74,16 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui
 	}
 
 	@BeforeEach
-	void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {
+	void setUp(DomainModelScope modelScope) {
 		final var model = modelScope.getDomainModel();
 		model.orderColumns( false );
 		model.validate();
 
 		dropSchema( model );
-
-		final var registry = registryScope.getRegistry();
-		createSchema( model, registry );
+		createSchema( model );
 	}
 
-	private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {
+	private void createSchema(MetadataImplementor model) {
 		new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/InstantValidationTest.java
@@ -71,22 +71,20 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui
 	}
 
 	@BeforeEach
-	void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {
+	void setUp(DomainModelScope modelScope) {
 		final var model = modelScope.getDomainModel();
 		model.orderColumns( false );
 		model.validate();
 
 		dropSchema( model );
-
-		final var registry = registryScope.getRegistry();
-		createSchema( model, registry );
+		createSchema( model );
 	}
 
 	private void dropSchema(MetadataImplementor model) {
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), model );
 	}
 
-	private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {
+	private void createSchema(MetadataImplementor model) {
 		new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );
 	}
 
@@ -131,6 +129,7 @@ public ExceptionHandler getExceptionHandler() {
 		tool.getSchemaValidator( null ).doValidation( newModel, execOptions, ContributableMatcher.ALL );
 	}
 
+	@SuppressWarnings("unused")
 	@Entity(name = "TestEntity")
 	public static class TestEntityOld {
 		@Id
@@ -140,6 +139,7 @@ public static class TestEntityOld {
 		Instant instantVal;
 	}
 
+	@SuppressWarnings("unused")
 	@Entity(name = "TestEntity")
 	public static class TestEntity {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/schemavalidation/NumericValidationTest.java
@@ -70,22 +70,20 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui
 	}
 
 	@BeforeEach
-	void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {
+	void setUp(DomainModelScope modelScope) {
 		final var model = modelScope.getDomainModel();
 		model.orderColumns( false );
 		model.validate();
 
 		dropSchema( model );
-
-		final var registry = registryScope.getRegistry();
-		createSchema( model, registry );
+		createSchema( model );
 	}
 
 	private void dropSchema(MetadataImplementor model) {
 		new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), model );
 	}
 
-	private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {
+	private void createSchema(MetadataImplementor model) {
 		new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );
 	}
 
@@ -125,6 +123,7 @@ public ExceptionHandler getExceptionHandler() {
 	}
 
 
+	@SuppressWarnings("unused")
 	@Entity(name = "TestEntity")
 	public static class TestEntity {
 		@Id

Original file line number	Diff line number	Diff line change
`@@ -85,18 +85,18 @@ public void testUniqueConstraintIsDropped(`
`85`	`85`
`86`	`86`	`if ( !(dialect.getUniqueDelegate() instanceof SkipNullableUniqueDelegate) ) {`
`87`	`87`	`if ( dialect.getUniqueDelegate() instanceof AlterTableUniqueIndexDelegate) {`
`88`		`- assertTrue( checkDropIndex( "test_entity_item", "item", scriptFile ) );`
	`88`	`+ assertTrue( checkDropIndex( scriptFile ) );`
`89`	`89`	`}`
`90`	`90`	`else if ( dialect.getUniqueDelegate() instanceof AlterTableUniqueDelegate ) {`
`91`	`91`	`MatcherAssert.assertThat( "The test_entity_item table unique constraint has not been dropped",`
`92`		`- checkDropConstraint( "test_entity_item", "item", dialect, scriptFile ),`
	`92`	`+ checkDropConstraint( "test_entity_item", dialect, scriptFile ),`
`93`	`93`	`is( true )`
`94`	`94`	`);`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`MatcherAssert.assertThat(`
`99`		`- checkDropConstraint( "test_entity_children", "child", dialect, scriptFile ),`
	`99`	`+ checkDropConstraint( "test_entity_children", dialect, scriptFile ),`
`100`	`100`	`is( true )`
`101`	`101`	`);`
`102`	`102`	`}`
`@@ -123,7 +123,6 @@ public ExceptionHandler getExceptionHandler() {`
`123`	`123`
`124`	`124`	`private boolean checkDropConstraint(`
`125`	`125`	`String tableName,`
`126`		`- String columnName,`
`127`	`126`	`Dialect dialect,`
`128`	`127`	`File scriptFile) throws IOException {`
`129`	`128`	`String regex = dialect.getAlterTableString( tableName ) + ' ' + dialect.getDropUniqueKeyString();`
`@@ -138,8 +137,8 @@ private boolean checkDropConstraint(`
`138`	`137`	`return isMatching( regex, scriptFile );`
`139`	`138`	`}`
`140`	`139`
`141`		`- private boolean checkDropIndex(String tableName, String columnName, File scriptFile) throws IOException {`
`142`		`- String regex = "drop index " + tableName + ".uk.*";`
	`140`	`+ private boolean checkDropIndex(File scriptFile) throws IOException {`
	`141`	`+ String regex = "drop index test_entity_item.uk.*";`
`143`	`142`	`return isMatching( regex, scriptFile );`
`144`	`143`	`}`
`145`	`144`
Original file line number	Diff line number	Diff line change
`@@ -74,18 +74,16 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@BeforeEach`
`77`		`- void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {`
	`77`	`+ void setUp(DomainModelScope modelScope) {`
`78`	`78`	`final var model = modelScope.getDomainModel();`
`79`	`79`	`model.orderColumns( false );`
`80`	`80`	`model.validate();`
`81`	`81`
`82`	`82`	`dropSchema( model );`
`83`		`-`
`84`		`- final var registry = registryScope.getRegistry();`
`85`		`- createSchema( model, registry );`
	`83`	`+ createSchema( model );`
`86`	`84`	`}`
`87`	`85`
`88`		`- private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {`
	`86`	`+ private void createSchema(MetadataImplementor model) {`
`89`	`87`	`new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );`
`90`	`88`	`}`
`91`	`89`
Original file line number	Diff line number	Diff line change
`@@ -71,22 +71,20 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@BeforeEach`
`74`		`- void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {`
	`74`	`+ void setUp(DomainModelScope modelScope) {`
`75`	`75`	`final var model = modelScope.getDomainModel();`
`76`	`76`	`model.orderColumns( false );`
`77`	`77`	`model.validate();`
`78`	`78`
`79`	`79`	`dropSchema( model );`
`80`		`-`
`81`		`- final var registry = registryScope.getRegistry();`
`82`		`- createSchema( model, registry );`
	`80`	`+ createSchema( model );`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`private void dropSchema(MetadataImplementor model) {`
`86`	`84`	`new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), model );`
`87`	`85`	`}`
`88`	`86`
`89`		`- private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {`
	`87`	`+ private void createSchema(MetadataImplementor model) {`
`90`	`88`	`new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );`
`91`	`89`	`}`
`92`	`90`
`@@ -131,6 +129,7 @@ public ExceptionHandler getExceptionHandler() {`
`131`	`129`	`tool.getSchemaValidator( null ).doValidation( newModel, execOptions, ContributableMatcher.ALL );`
`132`	`130`	`}`
`133`	`131`
	`132`	`+ @SuppressWarnings("unused")`
`134`	`133`	`@Entity(name = "TestEntity")`
`135`	`134`	`public static class TestEntityOld {`
`136`	`135`	`@Id`
`@@ -140,6 +139,7 @@ public static class TestEntityOld {`
`140`	`139`	`Instant instantVal;`
`141`	`140`	`}`
`142`	`141`
	`142`	`+ @SuppressWarnings("unused")`
`143`	`143`	`@Entity(name = "TestEntity")`
`144`	`144`	`public static class TestEntity {`
`145`	`145`	`@Id`
Original file line number	Diff line number	Diff line change
`@@ -70,22 +70,20 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`@BeforeEach`
`73`		`- void setUp(ServiceRegistryScope registryScope, DomainModelScope modelScope) {`
	`73`	`+ void setUp(DomainModelScope modelScope) {`
`74`	`74`	`final var model = modelScope.getDomainModel();`
`75`	`75`	`model.orderColumns( false );`
`76`	`76`	`model.validate();`
`77`	`77`
`78`	`78`	`dropSchema( model );`
`79`		`-`
`80`		`- final var registry = registryScope.getRegistry();`
`81`		`- createSchema( model, registry );`
	`79`	`+ createSchema( model );`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`private void dropSchema(MetadataImplementor model) {`
`85`	`83`	`new SchemaExport().drop( EnumSet.of( TargetType.DATABASE ), model );`
`86`	`84`	`}`
`87`	`85`
`88`		`- private void createSchema(MetadataImplementor model, StandardServiceRegistry registry) {`
	`86`	`+ private void createSchema(MetadataImplementor model) {`
`89`	`87`	`new SchemaExport().create( EnumSet.of( TargetType.DATABASE ), model );`
`90`	`88`	`}`
`91`	`89`
`@@ -125,6 +123,7 @@ public ExceptionHandler getExceptionHandler() {`
`125`	`123`	`}`
`126`	`124`
`127`	`125`
	`126`	`+ @SuppressWarnings("unused")`
`128`	`127`	`@Entity(name = "TestEntity")`
`129`	`128`	`public static class TestEntity {`
`130`	`129`	`@Id`