Skip to content

Commit d38971f

Browse files
gavinkinggavinking
committed
HHH-18539 update tests after removal of load()
Signed-off-by: Gavin King <[email protected]>
1 parent 6fe0553 commit d38971f

File tree

120 files changed

+386
-386
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+386
-386
lines changed

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/bytecode/ProxyBreakingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testProxiedBridgeMethod() throws Exception {
3030
s.flush();
3131
s.clear();
3232
assertNotNull( "The proxy creation failure is breaking things", h.getId() );
33-
h = (Hammer) s.load( Hammer.class, h.getId() );
33+
h = (Hammer) s.getReference( Hammer.class, h.getId() );
3434
assertFalse( Hibernate.isInitialized( h ) );
3535
tx.rollback();
3636
s.close();

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/embedded/many2one/EmbeddableWithMany2OneTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testBasicOps(SessionFactoryScope scope) {
6161
// same query!
6262
session.createQuery( "from Person p where p.address.country.id = 'US'" )
6363
.list();
64-
Person p = session.load( Person.class, person.getId() );
64+
Person p = session.getReference( Person.class, person.getId() );
6565
session.remove( p );
6666
List countries = session.createQuery( "from Country" ).list();
6767
assertEquals( 1, countries.size() );

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/entity/BasicHibernateAnnotationsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,10 @@ public void testFilterOnCollection() {
295295

296296
s = openSession();
297297
tx = s.beginTransaction();
298-
topic = (Topic) s.load( Topic.class, topic.getId() );
298+
topic = (Topic) s.getReference( Topic.class, topic.getId() );
299299

300300
s.enableFilter("byState").setParameter("state", "published");
301-
topic = (Topic) s.load( Topic.class, topic.getId() );
301+
topic = (Topic) s.getReference( Topic.class, topic.getId() );
302302
assertNotNull(topic);
303303
assertTrue(topic.getNarratives().size() == 1);
304304
assertEquals("published", topic.getNarratives().iterator().next().getState());
@@ -392,8 +392,8 @@ public void testCascadedDeleteOfChildOneToOne() {
392392

393393
tx = s.beginTransaction();
394394
s.clear();
395-
team2 = (SoccerTeam)s.load(team2.getClass(), team2.getId());
396-
team = (SoccerTeam)s.load(team.getClass(), team.getId());
395+
team2 = (SoccerTeam)s.getReference(team2.getClass(), team2.getId());
396+
team = (SoccerTeam)s.getReference(team.getClass(), team.getId());
397397
int count = ( (Long) s.createQuery( "select count(*) from Player" ).list().get( 0 ) ).intValue();
398398
assertEquals("expected count of 2 but got = " + count, count, 2);
399399

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/idclassgeneratedvalue/IdClassGeneratedValueTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testBaseLine(SessionFactoryScope scope) {
6161
session -> {
6262
List<Simple> simpleList = session.createQuery( "select s from Simple s" ).list();
6363
assertEquals( 2, simpleList.size() );
64-
Simple s1 = session.load( Simple.class, new SimplePK( 1L, 2L ) );
64+
Simple s1 = session.getReference( Simple.class, new SimplePK( 1L, 2L ) );
6565
assertEquals( s1.getQuantity(), 10 );
6666
session.clear();
6767
}
@@ -82,7 +82,7 @@ public void testBaseLine2(SessionFactoryScope scope) {
8282
session -> {
8383
List<Simple> simpleList = session.createQuery( "select s from Simple s" ).list();
8484
assertEquals( 1, simpleList.size() );
85-
Simple s1 = session.load( Simple.class, new SimplePK( 1L, 2L ) );
85+
Simple s1 = session.getReference( Simple.class, new SimplePK( 1L, 2L ) );
8686
assertEquals( s1.getQuantity(), 10 );
8787
}
8888
);
@@ -105,7 +105,7 @@ public void testSingleGeneratedValue(SessionFactoryScope scope) {
105105
session -> {
106106
List<Simple2> simpleList = session.createQuery( "select s from Simple2 s" ).list();
107107
assertEquals( simpleList.size(), 2 );
108-
Simple2 s1 = session.load( Simple2.class, new SimplePK( s1Id1, 200L ) );
108+
Simple2 s1 = session.getReference( Simple2.class, new SimplePK( s1Id1, 200L ) );
109109
assertEquals( s1.getQuantity(), 10 );
110110
session.clear();
111111
}
@@ -132,7 +132,7 @@ public void testMultipleGeneratedValue(SessionFactoryScope scope) {
132132
session -> {
133133
List<Multiple> simpleList = session.createQuery( "select m from Multiple m" ).list();
134134
assertEquals( simpleList.size(), 2 );
135-
Multiple m1 = session.load(
135+
Multiple m1 = session.getReference(
136136
Multiple.class,
137137
new MultiplePK( m1Ids.get( 0 ), m1Ids.get( 1 ), 1000L )
138138
);

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/inheritance/joined/JoinedSubclassTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,13 @@ public void testManyToOneWithJoinTable(SessionFactoryScope scope) {
167167
session.flush();
168168
session.clear();
169169

170-
c1 = session.load( Client.class, c1.getId() );
170+
c1 = session.getReference( Client.class, c1.getId() );
171171
assertEquals( 5000.0, c1.getAccount().getBalance(), 0.01 );
172172

173173
session.flush();
174174
session.clear();
175175

176-
a1 = session.load( Account.class, a1.getId() );
176+
a1 = session.getReference( Account.class, a1.getId() );
177177
Set<Client> clients = a1.getClients();
178178
assertEquals( 1, clients.size() );
179179
Iterator<Client> it = clients.iterator();

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/loader/LoaderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void testBasic() throws Exception {
5050

5151
s = openSession();
5252
tx = s.beginTransaction();
53-
Team t2 = s.load( Team.class, t.getId() );
53+
Team t2 = s.getReference( Team.class, t.getId() );
5454
Set<Player> players = t2.getPlayers();
5555
Iterator<Player> iterator = players.iterator();
5656
assertEquals( "me", iterator.next().getName() );
@@ -75,7 +75,7 @@ public void testGetNotExisting() {
7575

7676
try {
7777
long notExistingId = 1l;
78-
s.load( Team.class, notExistingId );
78+
s.getReference( Team.class, notExistingId );
7979
s.get( Team.class, notExistingId );
8080
s.getTransaction().commit();
8181
}

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytomany/ManyToManyTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void testBasic() {
245245

246246
s = openSession();
247247
tx = s.beginTransaction();
248-
er = s.load( Employer.class, er.getId() );
248+
er = s.getReference( Employer.class, er.getId() );
249249
assertNotNull( er );
250250
assertNotNull( er.getEmployees() );
251251
assertEquals( 1, er.getEmployees().size() );
@@ -384,7 +384,7 @@ public void testRemoveInBetween() {
384384

385385
s = openSession();
386386
tx = s.beginTransaction();
387-
er = s.load( Employer.class, er.getId() );
387+
er = s.getReference( Employer.class, er.getId() );
388388
assertNotNull( er );
389389
assertNotNull( er.getEmployees() );
390390
assertEquals( 2, er.getEmployees().size() );
@@ -441,7 +441,7 @@ public void testSelf() {
441441

442442
s = openSession();
443443
tx = s.beginTransaction();
444-
f = s.load( Friend.class, f.getId() );
444+
f = s.getReference( Friend.class, f.getId() );
445445
assertNotNull( f );
446446
assertNotNull( f.getFriends() );
447447
assertEquals( 1, f.getFriends().size() );
@@ -509,10 +509,10 @@ public void testCompositePk() {
509509

510510
s = openSession();
511511
tx = s.beginTransaction();
512-
m1 = s.load( Man.class, m1pk );
512+
m1 = s.getReference( Man.class, m1pk );
513513
assertFalse( m1.getWomens().isEmpty() );
514514
assertEquals( 1, m1.getWomens().size() );
515-
w1 = s.load( Woman.class, w1pk );
515+
w1 = s.getReference( Woman.class, w1pk );
516516
assertFalse( w1.getMens().isEmpty() );
517517
assertEquals( 2, w1.getMens().size() );
518518

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/manytoone/ManyToOneTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void testFetch() {
189189

190190
s = openSession();
191191
tx = s.beginTransaction();
192-
discount = s.load( Discount.class, discount.getId() );
192+
discount = s.getReference( Discount.class, discount.getId() );
193193
assertNotNull( discount );
194194
assertFalse( Hibernate.isInitialized( discount.getOwner() ) );
195195
tx.commit();

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/onetomany/OneToManyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ public void testSimpleOneToManySet() throws Exception {
428428

429429
s = openSession();
430430
tx = s.beginTransaction();
431-
c = ( Customer ) s.load( Customer.class, c.getId() );
431+
c = ( Customer ) s.getReference( Customer.class, c.getId() );
432432
assertNotNull( c );
433433
assertTrue( Hibernate.isInitialized( c.getTickets() ) );
434434
assertNotNull( c.getTickets() );
@@ -458,7 +458,7 @@ public void testSimpleOneToManyCollection() throws Exception {
458458

459459
s = openSession();
460460
tx = s.beginTransaction();
461-
c = ( Customer ) s.load( Customer.class, c.getId() );
461+
c = ( Customer ) s.getReference( Customer.class, c.getId() );
462462
assertNotNull( c );
463463
assertFalse( Hibernate.isInitialized( c.getDiscountTickets() ) );
464464
assertNotNull( c.getDiscountTickets() );

‎hibernate-core/src/test/java/org/hibernate/orm/test/annotations/query/QueryAndSQLTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public void testEntitySQLOverriding(SessionFactoryScope scope) {
652652
session.clear();
653653
session.getSessionFactory().getCache().evictEntityData( Chaos.class );
654654

655-
Chaos resultChaos = session.load( Chaos.class, chaos.getId() );
655+
Chaos resultChaos = session.getReference( Chaos.class, chaos.getId() );
656656
assertEquals( upperName, resultChaos.getName() );
657657
assertEquals( "nickname", resultChaos.getNickname() );
658658
}
@@ -686,14 +686,14 @@ public void testCollectionSQLOverriding(SessionFactoryScope scope) {
686686
session.clear();
687687
session.getSessionFactory().getCache().evictEntityData( Chaos.class );
688688

689-
Chaos resultChaos = session.load( Chaos.class, chaos.getId() );
689+
Chaos resultChaos = session.getReference( Chaos.class, chaos.getId() );
690690
assertEquals( 2, resultChaos.getParticles().size() );
691691
resultChaos.getParticles().remove( resultChaos.getParticles().iterator().next() );
692692
resultChaos.getParticles().remove( resultChaos.getParticles().iterator().next() );
693693
session.flush();
694694

695695
session.clear();
696-
resultChaos = session.load( Chaos.class, chaos.getId() );
696+
resultChaos = session.getReference( Chaos.class, chaos.getId() );
697697
assertEquals( 0, resultChaos.getParticles().size() );
698698
}
699699
);

0 commit comments

Comments
 (0)