HHH-8276 fixing FooBarTest.testRefresh

Author: stliu

hibernate-core/src/main/java/org/hibernate/loader/entity/plan/LegacyBatchingEntityLoaderBuilder.java

@@ -127,7 +127,7 @@ public Object load(Serializable id, Object optionalObject, SessionImplementor se
 					return getObjectFromList( results, id, session );
 				}
 			}
-			return ( loaders[batchSizes.length-1] ).load( id, optionalObject, session );
+			return ( loaders[batchSizes.length-1] ).load( id, optionalObject, session, lockOptions );
 		}
 	}
 

hibernate-core/src/test/java/org/hibernate/test/legacy/FooBarTest.java

@@ -4311,11 +4311,11 @@ public void execute(Connection connection) throws SQLException {
 				}
 		);
 		s.refresh(foo);
-		assertTrue( foo.getLong().longValue() == -3l );
-		assertTrue( s.getCurrentLockMode(foo)==LockMode.READ );
+		assertEquals( Long.valueOf( -3l ), foo.getLong() );
+		assertEquals( LockMode.READ, s.getCurrentLockMode(foo) );
 		s.refresh(foo, LockMode.UPGRADE);
 		if ( getDialect().supportsOuterJoinForUpdate() ) {
-			assertTrue( s.getCurrentLockMode(foo)==LockMode.UPGRADE );
+			assertEquals( LockMode.UPGRADE, s.getCurrentLockMode(foo) );
 		}
 		s.delete(foo);
 		s.getTransaction().commit();
@@ -4329,7 +4329,7 @@ public void testAutoFlush() throws Exception {
 		FooProxy foo = new Foo();
 		s.save(foo);
 		assertTrue( "autoflush create", s.createQuery( "from Foo foo" ).list().size()==1 );
-		foo.setChar( new Character('X') );
+		foo.setChar( 'X' );
 		assertTrue( "autoflush update", s.createQuery( "from Foo foo where foo.char='X'" ).list().size()==1 );
 		txn.commit();
 		s.close();