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

HHH-16175 Fix sybase test failure

This commit is contained in:
Andrea Boriero 2023-02-21 10:38:12 +01:00 committed by Andrea Boriero
parent 0d729feb6a
commit 87bf20f1bb
1 changed files with 14 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/IncludeAllOrNoneGraphTest.java
View File

@ -1,7 +1,5 @@
package org.hibernate.orm.test.entitygraph; package org.hibernate.orm.test.entitygraph;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -20,11 +18,12 @@ import jakarta.persistence.CascadeType;
import jakarta.persistence.Entity; import jakarta.persistence.Entity;
import jakarta.persistence.FetchType; import jakarta.persistence.FetchType;
import jakarta.persistence.Id; import jakarta.persistence.Id;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.NamedEntityGraph; import jakarta.persistence.NamedEntityGraph;
import jakarta.persistence.OneToMany; import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne; import jakarta.persistence.OneToOne;
import static org.assertj.core.api.Assertions.assertThat;
@DomainModel( @DomainModel(
annotatedClasses = { annotatedClasses = {
IncludeAllOrNoneGraphTest.RootEntity.class, IncludeAllOrNoneGraphTest.RootEntity.class,
@ -49,21 +48,14 @@ public class IncludeAllOrNoneGraphTest {
ContainedEntity containedLazy = new ContainedEntity( i * 100 + 2 ); ContainedEntity containedLazy = new ContainedEntity( i * 100 + 2 );
entity.getContainedLazy().add( containedLazy ); entity.getContainedLazy().add( containedLazy );
containedLazy.setContainingLazy( entity );
session.persist( containedLazy ); session.persist( containedLazy );
} }
} ); } );
} }
@AfterEach @AfterEach
void cleanUp(SessionFactoryScope scope) { void cleanUp(SessionFactoryScope scope) {
scope.inTransaction( session -> {
List<ContainedEntity> containedList = session.createQuery(
"select c from ContainedEntity c", ContainedEntity.class ).list();
for ( ContainedEntity entity : containedList ) {
entity.setContainingLazy( null );
}
} );
scope.inTransaction( session -> { scope.inTransaction( session -> {
session.createMutationQuery( "delete RootEntity" ).executeUpdate(); session.createMutationQuery( "delete RootEntity" ).executeUpdate();
session.createMutationQuery( "delete ContainedEntity" ).executeUpdate(); session.createMutationQuery( "delete ContainedEntity" ).executeUpdate();
@ -73,37 +65,34 @@ public class IncludeAllOrNoneGraphTest {
@Test @Test
void includeAll_fetchGraph(SessionFactoryScope scope) { void includeAll_fetchGraph(SessionFactoryScope scope) {
// Before HHH-16175 gets fixed, this leads to AssertionError in StandardEntityGraphTraversalStateImpl.traverse // Before HHH-16175 gets fixed, this leads to AssertionError in StandardEntityGraphTraversalStateImpl.traverse
testLoadingWithGraph(scope, RootEntity.GRAPH_INCLUDE_ALL, GraphSemantic.FETCH, testLoadingWithGraph( scope, RootEntity.GRAPH_INCLUDE_ALL, GraphSemantic.FETCH, true, true );
true, true );
} }
@Test @Test
void includeAll_loadGraph(SessionFactoryScope scope) { void includeAll_loadGraph(SessionFactoryScope scope) {
// Before HHH-16175 gets fixed, this leads to AssertionError in StandardEntityGraphTraversalStateImpl.traverse // Before HHH-16175 gets fixed, this leads to AssertionError in StandardEntityGraphTraversalStateImpl.traverse
testLoadingWithGraph(scope, RootEntity.GRAPH_INCLUDE_ALL, GraphSemantic.LOAD, testLoadingWithGraph( scope, RootEntity.GRAPH_INCLUDE_ALL, GraphSemantic.LOAD, true, true );
true, true );
} }
@Test @Test
void includeNone_fetchGraph(SessionFactoryScope scope) { void includeNone_fetchGraph(SessionFactoryScope scope) {
testLoadingWithGraph(scope, RootEntity.GRAPH_INCLUDE_NONE, GraphSemantic.FETCH, testLoadingWithGraph( scope, RootEntity.GRAPH_INCLUDE_NONE, GraphSemantic.FETCH, false, false );
false, false );
} }
@Test @Test
void includeNone_loadGraph(SessionFactoryScope scope) { void includeNone_loadGraph(SessionFactoryScope scope) {
testLoadingWithGraph(scope, RootEntity.GRAPH_INCLUDE_NONE, GraphSemantic.LOAD, testLoadingWithGraph( scope, RootEntity.GRAPH_INCLUDE_NONE, GraphSemantic.LOAD, true, false );
true, false );
} }
private void testLoadingWithGraph(SessionFactoryScope scope, String graphName, GraphSemantic graphSemantic, private void testLoadingWithGraph(
SessionFactoryScope scope, String graphName, GraphSemantic graphSemantic,
boolean expectContainedEagerInitialized, boolean expectContainedLazyInitialized) { boolean expectContainedEagerInitialized, boolean expectContainedLazyInitialized) {
scope.inTransaction( session -> { scope.inTransaction( session -> {
assertThat( session.createQuery( "select e from RootEntity e where id in (:ids)", RootEntity.class ) assertThat( session.createQuery( "select e from RootEntity e where id in (:ids)", RootEntity.class )
.applyGraph( session.getEntityGraph( graphName ), graphSemantic ) .applyGraph( session.getEntityGraph( graphName ), graphSemantic )
.setFetchSize( 100 ) .setFetchSize( 100 )
.setParameter( "ids", List.of( 0L, 100L, 200L ) ) .setParameter( "ids", List.of( 0L, 100L, 200L ) )
.list() ) .list() )
.isNotEmpty() .isNotEmpty()
.allSatisfy( loaded -> assertThat( Hibernate.isInitialized( loaded.getContainedEager() ) ) .allSatisfy( loaded -> assertThat( Hibernate.isInitialized( loaded.getContainedEager() ) )
.as( "Hibernate::isInitialized for .getContainedEager() on %s", loaded ) .as( "Hibernate::isInitialized for .getContainedEager() on %s", loaded )
@ -133,7 +122,7 @@ public class IncludeAllOrNoneGraphTest {
@OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST) @OneToOne(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
private ContainedEntity containedEager; private ContainedEntity containedEager;
@OneToMany(mappedBy = "containingLazy", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST) @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
private List<ContainedEntity> containedLazy = new ArrayList<>(); private List<ContainedEntity> containedLazy = new ArrayList<>();
public RootEntity() { public RootEntity() {
@ -177,10 +166,6 @@ public class IncludeAllOrNoneGraphTest {
@OneToOne(mappedBy = "containedEager") @OneToOne(mappedBy = "containedEager")
private RootEntity containingEager; private RootEntity containingEager;
@ManyToOne
private RootEntity containingLazy;
public ContainedEntity() { public ContainedEntity() {
} }
@ -204,12 +189,5 @@ public class IncludeAllOrNoneGraphTest {
this.containingEager = containingEager; this.containingEager = containingEager;
} }
public RootEntity getContainingLazy() {
return containingLazy;
}
public void setContainingLazy(RootEntity containingLazy) {
this.containingLazy = containingLazy;
}
} }
} }