Skip to content

Commit 4cd03f1

Browse files
committed
HHH-19892 fix the test
1 parent 23ad772 commit 4cd03f1

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/LoadGraphMergeTest.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import org.junit.jupiter.api.BeforeAll;
2020
import org.junit.jupiter.api.Test;
2121

22-
import java.util.Collections;
2322

24-
import static org.hibernate.jpa.SpecHints.HINT_SPEC_LOAD_GRAPH;
2523
import static org.junit.jupiter.api.Assertions.assertFalse;
2624
import static org.junit.jupiter.api.Assertions.assertTrue;
2725

@@ -58,21 +56,11 @@ public static void init(EntityManagerFactoryScope scope) {
5856
@Test
5957
public void testGrandChildHasNotBeenInitializedByMerge(EntityManagerFactoryScope scope) {
6058
Parent parent = scope.fromTransaction( entityManager ->
61-
entityManager.find(
62-
Parent.class,
63-
PARENT_ID_1,
64-
Collections.singletonMap(
65-
HINT_SPEC_LOAD_GRAPH,
66-
entityManager.getEntityGraph( "parent.child" ) ) )
59+
entityManager.find( LoadGraphMergeTest_.Parent_._parent_child, PARENT_ID_1 )
6760
);
6861

6962
Parent parent2 = scope.fromTransaction( entityManager ->
70-
entityManager.find(
71-
Parent.class,
72-
PARENT_ID_2,
73-
Collections.singletonMap(
74-
HINT_SPEC_LOAD_GRAPH,
75-
entityManager.getEntityGraph( "parent.child" ) ) )
63+
entityManager.find( LoadGraphMergeTest_.Parent_._parent_child, PARENT_ID_2)
7664
);
7765

7866
scope.inTransaction( entityManager -> {
@@ -81,8 +69,7 @@ public void testGrandChildHasNotBeenInitializedByMerge(EntityManagerFactoryScope
8169

8270
Session session = entityManager.unwrap( Session.class );
8371

84-
Parent mergedParent = session.merge( parent,
85-
entityManager.getEntityGraph( "parent.child" ) );
72+
Parent mergedParent = session.merge( parent, LoadGraphMergeTest_.Parent_._parent_child );
8673

8774
Child child = mergedParent.getChild();
8875
assertTrue( Hibernate.isInitialized( child ) );
@@ -113,7 +100,7 @@ public void testChildHasNotBeenInitializedByMerge(EntityManagerFactoryScope scop
113100
assertFalse( Hibernate.isInitialized( child1 ) );
114101

115102
Session session = entityManager.unwrap( Session.class );
116-
Parent mergedParent = session.merge( parent, session.createEntityGraph( "parent" ) );
103+
Parent mergedParent = session.merge( parent, LoadGraphMergeTest_.Parent_._parent );
117104

118105
Child child = mergedParent.getChild();
119106
assertFalse( Hibernate.isInitialized( child ),

0 commit comments

Comments
 (0)