Skip to content

Commit 24d3eee

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)
1 parent 3ab1246 commit 24d3eee

36 files changed

+658
-774
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/id/sequence/SequenceExportTest.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.hibernate.boot.MetadataSources;
88
import org.hibernate.boot.model.relational.Namespace;
99
import org.hibernate.boot.model.relational.Sequence;
10-
import org.hibernate.boot.registry.BootstrapServiceRegistryBuilder;
1110
import org.hibernate.boot.registry.StandardServiceRegistry;
1211
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
1312
import org.hibernate.boot.spi.MetadataImplementor;
@@ -90,10 +89,6 @@ public StandardServiceRegistry produceServiceRegistry(StandardServiceRegistryBui
9089
return ServiceRegistryUtil.applySettings( builder ).build();
9190
}
9291

93-
@Override
94-
public void prepareBootstrapRegistryBuilder(BootstrapServiceRegistryBuilder bsrb) {
95-
}
96-
9792
@Entity( name = "Entity1" )
9893
@Table( name = "Entity1" )
9994
public static class Entity1 {

hibernate-core/src/test/java/org/hibernate/orm/test/tm/CMTTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@
4444
/**
4545
* @author Gavin King
4646
*/
47+
@SuppressWarnings("JUnitMalformedDeclaration")
4748
@SkipForDialect(dialectClass = SQLServerDialect.class)
4849
@DomainModel(
4950
xmlMappings = "org/hibernate/orm/test/tm/Item.hbm.xml",
5051
concurrencyStrategy = "transactional"
5152
)
52-
@SessionFactory(
53-
generateStatistics = true
54-
)
53+
@SessionFactory(generateStatistics = true)
5554
@ServiceRegistry(
5655
settings = {
5756
@Setting(name = AvailableSettings.AUTO_CLOSE_SESSION, value = "true"),
@@ -80,13 +79,12 @@
8079
provider = CMTTest.ConnectionHandlingProvider.class
8180
)
8281
}
83-
8482
)
8583
public class CMTTest {
8684

8785
@AfterEach
8886
public void tearDown(SessionFactoryScope scope) {
89-
scope.getSessionFactory().getSchemaManager().truncate();
87+
scope.dropData();
9088
scope.getSessionFactory().getCache().evictAllRegions();
9189
}
9290

0 commit comments

Comments
 (0)