Skip to content

Commit 8656c83

Browse files
committed
HHH-19846 - Drop JUnit 4 usage
Cannot convert... * 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
1 parent e315f90 commit 8656c83

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/idgen/foreign/ForeignGeneratorResourceLocalTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.hibernate.testing.orm.junit.JiraKey;
3030
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
3131
import org.hibernate.testing.orm.junit.Jpa;
32-
import org.hibernate.testing.orm.junit.SessionFactoryScope;
3332
import org.junit.jupiter.api.AfterEach;
3433
import org.junit.jupiter.api.Test;
3534

@@ -49,7 +48,7 @@ public class ForeignGeneratorResourceLocalTest {
4948
private static final Logger log = Logger.getLogger( ForeignGeneratorResourceLocalTest.class );
5049

5150
@AfterEach
52-
void dropTestData(SessionFactoryScope factoryScope) {
51+
void dropTestData(EntityManagerFactoryScope factoryScope) {
5352
factoryScope.dropData();
5453
}
5554

hibernate-core/src/test/java/org/hibernate/orm/test/idgen/userdefined/ExportableValueGeneratorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.hibernate.generator.OnExecutionGenerator;
2222
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
2323
import org.hibernate.testing.orm.junit.Jpa;
24-
import org.hibernate.testing.orm.junit.SessionFactoryScope;
2524
import org.hibernate.testing.orm.junit.SkipForDialect;
2625
import org.junit.jupiter.api.AfterEach;
2726
import org.junit.jupiter.api.Test;
@@ -39,7 +38,7 @@
3938
@SkipForDialect( dialectClass = MySQLDialect.class)
4039
public class ExportableValueGeneratorTest {
4140
@AfterEach
42-
void dropTestData(SessionFactoryScope factoryScope) {
41+
void dropTestData(EntityManagerFactoryScope factoryScope) {
4342
factoryScope.dropData();
4443
}
4544

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/EntityManagerFactoryScope.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,7 @@ default Dialect getDialect() {
3838
return ((SessionFactoryImplementor) getEntityManagerFactory()).getJdbcServices().getDialect();
3939
}
4040

41+
default void dropData() {
42+
((SessionFactoryImplementor) getEntityManagerFactory()).getSchemaManager().truncateMappedObjects();
43+
}
4144
}

0 commit comments

Comments
 (0)