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

HHH-15473 Actually set enableCollectionInDefaultFetchGroup(true) in relevant tests 

The previous setup code was being ignored, so
enableCollectionInDefaultFetchGroup was actually `false` in these
tests...
This commit is contained in:
Yoann Rodière 2022-09-01 16:59:20 +02:00 committed by Sanne Grinovero
parent febfd9d4b8
commit 1399f3e65e
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingCollectionInDefaultFetchGroupTest.java
View File

@ -22,8 +22,8 @@ import jakarta.persistence.Table;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryBuilderImpl;
import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.SessionFactoryBuilderService; import org.hibernate.boot.spi.SessionFactoryBuilderService;
import org.hibernate.cfg.Configuration;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
@ -48,9 +48,8 @@ public class DirtyTrackingCollectionInDefaultFetchGroupTest extends BaseCoreFunc
} }
@Override @Override
protected void configure(Configuration configuration) { protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
super.configure( configuration ); serviceRegistryBuilder.addService(
configuration.getStandardServiceRegistryBuilder().addService(
SessionFactoryBuilderService.class, SessionFactoryBuilderService.class,
(SessionFactoryBuilderService) (metadata, bootstrapContext) -> { (SessionFactoryBuilderService) (metadata, bootstrapContext) -> {
SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder( SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder(

10
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/dirty/DirtyTrackingPersistTest.java
View File

@ -27,8 +27,8 @@ import jakarta.persistence.TemporalType;
import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryBuilderImpl;
import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.SessionFactoryBuilderService; import org.hibernate.boot.spi.SessionFactoryBuilderService;
import org.hibernate.cfg.Configuration;
import org.hibernate.testing.TestForIssue; import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner; import org.hibernate.testing.bytecode.enhancement.BytecodeEnhancerRunner;
@ -37,9 +37,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate; import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;
import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/** /**
* @author Christian Beikov * @author Christian Beikov
@ -54,9 +51,8 @@ public class DirtyTrackingPersistTest extends BaseCoreFunctionalTestCase {
} }
@Override @Override
protected void configure(Configuration configuration) { protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
super.configure( configuration ); serviceRegistryBuilder.addService(
configuration.getStandardServiceRegistryBuilder().addService(
SessionFactoryBuilderService.class, SessionFactoryBuilderService.class,
(SessionFactoryBuilderService) (metadata, bootstrapContext) -> { (SessionFactoryBuilderService) (metadata, bootstrapContext) -> {
SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder( SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder(

6
hibernate-core/src/test/java/org/hibernate/orm/test/bytecode/enhancement/lazy/MultipleBagsInLazyFetchGroupTest.java
View File

@ -17,6 +17,7 @@ import jakarta.persistence.Table;
import org.hibernate.boot.internal.SessionFactoryBuilderImpl; import org.hibernate.boot.internal.SessionFactoryBuilderImpl;
import org.hibernate.boot.internal.SessionFactoryOptionsBuilder; import org.hibernate.boot.internal.SessionFactoryOptionsBuilder;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.boot.spi.SessionFactoryBuilderService; import org.hibernate.boot.spi.SessionFactoryBuilderService;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
@ -42,9 +43,8 @@ public class MultipleBagsInLazyFetchGroupTest extends BaseCoreFunctionalTestCase
} }
@Override @Override
protected void configure(Configuration configuration) { protected void prepareBasicRegistryBuilder(StandardServiceRegistryBuilder serviceRegistryBuilder) {
super.configure( configuration ); serviceRegistryBuilder.addService(
configuration.getStandardServiceRegistryBuilder().addService(
SessionFactoryBuilderService.class, SessionFactoryBuilderService.class,
(SessionFactoryBuilderService) (metadata, bootstrapContext) -> { (SessionFactoryBuilderService) (metadata, bootstrapContext) -> {
SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder( SessionFactoryOptionsBuilder optionsBuilder = new SessionFactoryOptionsBuilder(