Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-14529 Stop using two separate BootstrapServiceRegistries for the same SessionFactory in BaseCoreFunctionalTestCase

This commit is contained in:
Yoann Rodière 2021-03-31 16:51:42 +02:00
parent ebb30aa178
commit fcc63d9ab0
10 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
documentation/src/test/java/org/hibernate/userguide/collections/BasicTypeCollectionTest.java
View File

@ -51,12 +51,11 @@ public class BasicTypeCollectionTest extends BaseCoreFunctionalTestCase {
} }
@Override @Override
protected Configuration constructAndConfigureConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructAndConfigureConfiguration(); super.configure( configuration );
configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> { configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> {
typeContributions.contributeType( new CommaDelimitedStringsType() ); typeContributions.contributeType( new CommaDelimitedStringsType() );
} ); } );
return configuration;
} }
//tag::collections-comma-delimited-collection-example[] //tag::collections-comma-delimited-collection-example[]

5
documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetTypeTest.java
View File

@ -32,14 +32,13 @@ public class BitSetTypeTest extends BaseCoreFunctionalTestCase {
} }
@Override @Override
protected Configuration constructAndConfigureConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructAndConfigureConfiguration(); super.configure( configuration );
//tag::basic-custom-type-register-BasicType-example[] //tag::basic-custom-type-register-BasicType-example[]
configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> { configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> {
typeContributions.contributeType( BitSetType.INSTANCE ); typeContributions.contributeType( BitSetType.INSTANCE );
} ); } );
//end::basic-custom-type-register-BasicType-example[] //end::basic-custom-type-register-BasicType-example[]
return configuration;
} }
@Test @Test

5
documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserTypeTest.java
View File

@ -36,14 +36,13 @@ public class BitSetUserTypeTest extends BaseCoreFunctionalTestCase {
} }
@Override @Override
protected Configuration constructAndConfigureConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructAndConfigureConfiguration(); super.configure( configuration );
//tag::basic-custom-type-register-UserType-example[] //tag::basic-custom-type-register-UserType-example[]
configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> { configuration.registerTypeContributor( (typeContributions, serviceRegistry) -> {
typeContributions.contributeType( BitSetUserType.INSTANCE, "bitset"); typeContributions.contributeType( BitSetUserType.INSTANCE, "bitset");
} ); } );
//end::basic-custom-type-register-UserType-example[] //end::basic-custom-type-register-UserType-example[]
return configuration;
} }
@Test @Test

5
hibernate-core/src/test/java/org/hibernate/test/bulkid/AbstractBulkCompositeIdTest.java
View File

@ -33,13 +33,12 @@ public abstract class AbstractBulkCompositeIdTest extends BaseCoreFunctionalTest
} }
@Override @Override
protected Configuration constructConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructConfiguration(); super.configure( configuration );
Class<? extends MultiTableBulkIdStrategy> strategyClass = getMultiTableBulkIdStrategyClass(); Class<? extends MultiTableBulkIdStrategy> strategyClass = getMultiTableBulkIdStrategyClass();
if ( strategyClass != null ) { if ( strategyClass != null ) {
configuration.setProperty( AvailableSettings.HQL_BULK_ID_STRATEGY, strategyClass.getName() ); configuration.setProperty( AvailableSettings.HQL_BULK_ID_STRATEGY, strategyClass.getName() );
} }
return configuration;
} }
protected abstract Class<? extends MultiTableBulkIdStrategy> getMultiTableBulkIdStrategyClass(); protected abstract Class<? extends MultiTableBulkIdStrategy> getMultiTableBulkIdStrategyClass();

5
hibernate-core/src/test/java/org/hibernate/test/bulkid/AbstractBulkIdTest.java
View File

@ -32,10 +32,9 @@ public abstract class AbstractBulkIdTest extends BaseCoreFunctionalTestCase {
} }
@Override @Override
protected Configuration constructConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructConfiguration(); super.configure( configuration );
configuration.setProperty( AvailableSettings.HQL_BULK_ID_STRATEGY, getMultiTableBulkIdStrategyClass().getName() ); configuration.setProperty( AvailableSettings.HQL_BULK_ID_STRATEGY, getMultiTableBulkIdStrategyClass().getName() );
return configuration;
} }
protected abstract Class<? extends MultiTableBulkIdStrategy> getMultiTableBulkIdStrategyClass(); protected abstract Class<? extends MultiTableBulkIdStrategy> getMultiTableBulkIdStrategyClass();

9
hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectCollationTest.java
View File

@ -47,15 +47,16 @@ import static org.junit.Assert.fail;
public class SQLServerDialectCollationTest extends BaseCoreFunctionalTestCase { public class SQLServerDialectCollationTest extends BaseCoreFunctionalTestCase {
@Override @Override
protected Configuration constructConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructConfiguration(); super.configure( configuration );
configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() ); configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() );
return configuration;
} }
@Override
protected void buildSessionFactory() { protected void buildSessionFactory() {
BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry(); BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry();
StandardServiceRegistryImpl _serviceRegistry = buildServiceRegistry( bootRegistry, constructConfiguration() ); StandardServiceRegistryImpl _serviceRegistry =
buildServiceRegistry( bootRegistry, constructAndConfigureConfiguration( bootRegistry ) );
try { try {
try { try {

10
hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTempTableCollationTest.java
View File

@ -43,10 +43,9 @@ public class SQLServerDialectTempTableCollationTest extends BaseCoreFunctionalTe
private boolean collationChanged; private boolean collationChanged;
@Override @Override
protected Configuration constructConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructConfiguration(); super.configure( configuration );
configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() ); configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() );
return configuration;
} }
@Override @Override
@ -56,7 +55,7 @@ public class SQLServerDialectTempTableCollationTest extends BaseCoreFunctionalTe
BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry(); BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry();
StandardServiceRegistryImpl serviceRegistry = buildServiceRegistry( StandardServiceRegistryImpl serviceRegistry = buildServiceRegistry(
bootRegistry, bootRegistry,
constructConfiguration() constructAndConfigureConfiguration( bootRegistry )
); );
try { try {
TransactionUtil.doWithJDBC( TransactionUtil.doWithJDBC(
@ -92,7 +91,8 @@ public class SQLServerDialectTempTableCollationTest extends BaseCoreFunctionalTe
@Override @Override
protected void buildSessionFactory() { protected void buildSessionFactory() {
BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry(); BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry();
StandardServiceRegistryImpl serviceRegistry = buildServiceRegistry( bootRegistry, constructConfiguration() ); StandardServiceRegistryImpl serviceRegistry =
buildServiceRegistry( bootRegistry, constructAndConfigureConfiguration( bootRegistry ) );
try { try {
try { try {

5
hibernate-core/src/test/java/org/hibernate/test/dialect/functional/SQLServerDialectTest.java
View File

@ -44,10 +44,9 @@ import static org.junit.Assert.assertTrue;
public class SQLServerDialectTest extends BaseCoreFunctionalTestCase { public class SQLServerDialectTest extends BaseCoreFunctionalTestCase {
@Override @Override
protected Configuration constructConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructConfiguration(); super.configure( configuration );
configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() ); configuration.setProperty( AvailableSettings.KEYWORD_AUTO_QUOTING_ENABLED, Boolean.TRUE.toString() );
return configuration;
} }
@Test @Test

5
hibernate-core/src/test/java/org/hibernate/test/multitenancy/schema/TenantResolverConfigurationTest.java
View File

@ -24,10 +24,9 @@ public class TenantResolverConfigurationTest extends BaseCoreFunctionalTestCase
private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver(); private TestCurrentTenantIdentifierResolver currentTenantResolver = new TestCurrentTenantIdentifierResolver();
@Override @Override
protected Configuration constructAndConfigureConfiguration() { protected void configure(Configuration configuration) {
Configuration configuration = super.constructAndConfigureConfiguration(); super.configure( configuration );
configuration.setCurrentTenantIdentifierResolver( currentTenantResolver ); configuration.setCurrentTenantIdentifierResolver( currentTenantResolver );
return configuration;
} }
@Test @Test

18
hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
View File

@ -112,11 +112,11 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
protected void buildSessionFactory(Consumer<Configuration> configurationAdapter) { protected void buildSessionFactory(Consumer<Configuration> configurationAdapter) {
// for now, build the configuration to get all the property settings // for now, build the configuration to get all the property settings
configuration = constructAndConfigureConfiguration(); BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry();
configuration = constructAndConfigureConfiguration( bootRegistry );
if ( configurationAdapter != null ) { if ( configurationAdapter != null ) {
configurationAdapter.accept(configuration); configurationAdapter.accept(configuration);
} }
BootstrapServiceRegistry bootRegistry = buildBootstrapServiceRegistry();
serviceRegistry = buildServiceRegistry( bootRegistry, configuration ); serviceRegistry = buildServiceRegistry( bootRegistry, configuration );
// this is done here because Configuration does not currently support 4.0 xsd // this is done here because Configuration does not currently support 4.0 xsd
afterConstructAndConfigureConfiguration( configuration ); afterConstructAndConfigureConfiguration( configuration );
@ -145,14 +145,8 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
buildSessionFactory( configurationAdapter ); buildSessionFactory( configurationAdapter );
} }
protected Configuration buildConfiguration() { protected Configuration constructAndConfigureConfiguration(BootstrapServiceRegistry bootstrapServiceRegistry) {
Configuration cfg = constructAndConfigureConfiguration(); Configuration cfg = constructConfiguration( bootstrapServiceRegistry );
afterConstructAndConfigureConfiguration( cfg );
return cfg;
}
protected Configuration constructAndConfigureConfiguration() {
Configuration cfg = constructConfiguration();
configure( cfg ); configure( cfg );
return cfg; return cfg;
} }
@ -163,8 +157,8 @@ public abstract class BaseCoreFunctionalTestCase extends BaseUnitTestCase {
afterConfigurationBuilt( cfg ); afterConfigurationBuilt( cfg );
} }
protected Configuration constructConfiguration() { protected Configuration constructConfiguration(BootstrapServiceRegistry bootstrapServiceRegistry) {
Configuration configuration = new Configuration(); Configuration configuration = new Configuration( bootstrapServiceRegistry );
configuration.setProperty( AvailableSettings.CACHE_REGION_FACTORY, CachingRegionFactory.class.getName() ); configuration.setProperty( AvailableSettings.CACHE_REGION_FACTORY, CachingRegionFactory.class.getName() );
configuration.setProperty( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" ); configuration.setProperty( AvailableSettings.USE_NEW_ID_GENERATOR_MAPPINGS, "true" );
if ( createSchema() ) { if ( createSchema() ) {