HHH-3949 - Intrumentated to one relations can not be join fetched

Author: sebersole

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/EnhancerTest.java

@@ -6,6 +6,7 @@
  */
 package org.hibernate.test.bytecode.enhancement;
 
+import org.hibernate.testing.FailureExpected;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseUnitTestCase;
 import org.hibernate.test.bytecode.enhancement.association.ManyToManyAssociationTestTask;
@@ -51,9 +52,22 @@ public void testLazy() {
 
 	@Test
 	@TestForIssue( jiraKey = "HHH-3949" )
-	public void testHHH3949() {
+	@FailureExpected( jiraKey = "HHH-3949" )
+	public void testJoinFetchLazyToOneAttributeHql() {
 		EnhancerTestUtils.runEnhancerTestTask( HHH3949TestTask1.class );
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-3949" )
+	@FailureExpected( jiraKey = "HHH-3949" )
+	public void testJoinFetchLazyToOneAttributeHql2() {
 		EnhancerTestUtils.runEnhancerTestTask( HHH3949TestTask2.class );
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-3949" )
+	@FailureExpected( jiraKey = "HHH-3949" )
+	public void testHHH3949() {
 		EnhancerTestUtils.runEnhancerTestTask( HHH3949TestTask3.class );
 		EnhancerTestUtils.runEnhancerTestTask( HHH3949TestTask4.class );
 	}

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949TestTask1.java

@@ -2,22 +2,37 @@
 
 import java.util.List;
 
+import org.hibernate.Hibernate;
 import org.hibernate.Session;
 
-import org.junit.Assert;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class HHH3949TestTask1 extends AbstractHHH3949TestTask {
 
-	@SuppressWarnings("unchecked")
 	public void execute() {
+		// verify the work around query
+		performQueryAndVerifyResults( "from Person p fetch all properties left join fetch p.vehicle" );
+		performQueryAndVerifyResults( "from Person p left join fetch p.vehicle" );
+	}
+
+	@SuppressWarnings("unchecked")
+	private void performQueryAndVerifyResults(String query) {
+		// 1) open session
 		Session session = getFactory().openSession();
-		List<Person> persons = (List<Person>) session.createQuery( "from Person p left join fetch p.vehicle" ).list();
+		// 2) perform the query
+		List<Person> persons = (List<Person>) session.createQuery( query ).list();
+		// 3) close the session : this ensures that no more queries and/or data loading happen
+		session.close();
+
+		// 4) verify the results
 		for ( Person person : persons ) {
+			assertTrue( Hibernate.isInitialized( person ) );
 			if ( person.getId() < 3 ) {
-				Assert.assertNotNull( person.getVehicle() );
-				Assert.assertNotNull( person.getVehicle().getDriver() );
+				assertNotNull( person.getVehicle() );
+				assertTrue( Hibernate.isInitialized( person.getVehicle() ) );
+				assertNotNull( person.getVehicle().getDriver() );
 			}
 		}
-		session.close();
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949TestTask2.java

@@ -8,17 +8,26 @@
 
 public class HHH3949TestTask2 extends AbstractHHH3949TestTask {
 
-	@SuppressWarnings("unchecked")
 	public void execute() {
+		performQueryAndVerifyResults( "from Vehicle v fetch all properties left join fetch v.driver" );
+		performQueryAndVerifyResults( "from Vehicle v left join fetch v.driver" );
+	}
+
+	@SuppressWarnings("unchecked")
+	public void performQueryAndVerifyResults(String query) {
+		// 1) open session
 		Session session = getFactory().openSession();
-		List<Vehicle> vehicles = (List<Vehicle>) session.createQuery( "from Vehicle v left join fetch v.driver" )
-				.list();
+		// 2) perform the query
+		List<Vehicle> vehicles = (List<Vehicle>) session.createQuery( query ).list();
+		// 3) close the session : this ensures that no more queries and/or data loading happen
+		session.close();
+
+		// 4) verify the results
 		for ( Vehicle vehicle : vehicles ) {
 			if ( vehicle.getId() < 3 ) {
 				Assert.assertNotNull( vehicle.getDriver() );
 				Assert.assertNotNull( vehicle.getDriver().getVehicle() );
 			}
 		}
-		session.close();
 	}
 }

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949TestTask3.java

@@ -12,10 +12,9 @@ public class HHH3949TestTask3 extends AbstractHHH3949TestTask {
 	@SuppressWarnings("unchecked")
 	public void execute() {
 		Session session = getFactory().openSession();
-		List<Person> persons = (List<Person>) session.createCriteria( Person.class ).setFetchMode(
-				"vehicle",
-				FetchMode.JOIN
-		).list();
+		List<Person> persons = (List<Person>) session.createCriteria( Person.class )
+				.setFetchMode( "vehicle", FetchMode.JOIN )
+				.list();
 		for ( Person person : persons ) {
 			if ( person.getId() < 3 ) {
 				Assert.assertNotNull( person.getVehicle() );

hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/join/HHH3949TestTask4.java

@@ -12,17 +12,17 @@ public class HHH3949TestTask4 extends AbstractHHH3949TestTask {
 	@SuppressWarnings("unchecked")
 	public void execute() {
 		Session session = getFactory().openSession();
-		List<Vehicle> vehicles = (List<Vehicle>) session.createCriteria( Vehicle.class ).setFetchMode(
-				"driver",
-				FetchMode.JOIN
-		).list();
+		List<Vehicle> vehicles = (List<Vehicle>) session.createCriteria( Vehicle.class )
+				.setFetchMode( "driver", FetchMode.JOIN )
+				.list();
+		session.close();
+
 		for ( Vehicle vehicle : vehicles ) {
 			if ( vehicle.getId() < 3 ) {
 				Assert.assertNotNull( vehicle.getDriver() );
 				Assert.assertNotNull( vehicle.getDriver().getVehicle() );
 			}
 		}
-		session.close();
 	}
 
 }