Skip to content

Commit c8f2a53

Browse files
committed
HHH-19846 - Drop JUnit 4 usage
Not converted... * org.hibernate.orm.test.hql.PostgreSQLFunctionSelectClauseTest - registering custom function * org.hibernate.orm.test.hql.PostgreSQLFunctionWhereClauseTest - aux-db-object * org.hibernate.orm.test.id.usertype - type registrations * org.hibernate.orm.test.idgen.enhanced.HiloOptimizerConcurrencyTest - recreation of SF during tests * org.hibernate.orm.test.type.AbstractJavaTimeTypeTest subtypes - crazy parameterization (see org.hibernate.orm.test.tm.InterceptorTransactionTest) * org.hibernate.orm.test.cdi.general.hibernatesearch.extended.HibernateSearchExtendedCdiSupportTest - not sure yet, all the other tests here pass with conversion - shelved for now
1 parent d5238a9 commit c8f2a53

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/schemafilter/SchemaFilterTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.hibernate.testing.orm.junit.RequiresDialect;
2020
import org.hibernate.testing.orm.junit.ServiceRegistry;
2121
import org.hibernate.testing.orm.junit.ServiceRegistryScope;
22+
import org.hibernate.testing.orm.junit.Setting;
2223
import org.hibernate.tool.schema.internal.DefaultSchemaFilter;
2324
import org.hibernate.tool.schema.internal.SchemaCreatorImpl;
2425
import org.hibernate.tool.schema.internal.SchemaDropperImpl;
@@ -30,11 +31,12 @@
3031
import java.util.Set;
3132

3233
import static org.hamcrest.MatcherAssert.assertThat;
34+
import static org.hibernate.cfg.JdbcSettings.FORMAT_SQL;
3335

3436
@JiraKey(value = "HHH-9876")
3537
@SuppressWarnings({"rawtypes", "unchecked", "JUnitMalformedDeclaration"})
3638
@RequiresDialect(value = SQLServerDialect.class, comment = "Unit test - limit to minimize complexity of checks")
37-
@ServiceRegistry
39+
@ServiceRegistry(settings = @Setting(name = FORMAT_SQL, value = "false"))
3840
@DomainModel(annotatedClasses = {
3941
SchemaFilterTest.SchemaNoneEntity0.class,
4042
SchemaFilterTest.Schema1Entity1.class,

hibernate-core/src/test/java/org/hibernate/orm/test/where/hbm/LazyManyToManyNonUniqueIdNotFoundWhereTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public void createSchema(SessionFactoryScope factoryScope) {
4141
factoryScope.inTransaction( session -> session.doWork( connection -> {
4242
final Dialect dialect = session.getDialect();
4343
try (final Statement statement = connection.createStatement()) {
44-
statement.executeUpdate( dialect.getDropTableString( "MAIN_TABLE" ) );
4544
statement.executeUpdate( dialect.getDropTableString( "BUILDING_RATINGS" ) );
4645
statement.executeUpdate( dialect.getDropTableString( "ASSOCIATION_TABLE" ) );
4746
statement.executeUpdate( dialect.getDropTableString( "MATERIAL_RATINGS" ) );
47+
statement.executeUpdate( dialect.getDropTableString( "MAIN_TABLE" ) );
4848

4949
statement.executeUpdate( """
5050
create table MAIN_TABLE(

0 commit comments

Comments
 (0)