Amend existing tests to adapt fix of HHH-16144

Author: quaff

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/EmbeddedIdGenericsSuperclassTest.java

@@ -31,6 +31,7 @@
 
 /**
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @DomainModel(annotatedClasses = {
 		EmbeddedIdGenericsSuperclassTest.Customer.class,
@@ -81,7 +82,7 @@ public void testCustomerCriteria(SessionFactoryScope scope) {
 			final CriteriaQuery<Customer> query = cb.createQuery( Customer.class );
 			final Root<Customer> root = query.from( Customer.class );
 			final Path<DomainEntityId> id = root.get( "id" );
-			assertThat( id.getJavaType() ).isEqualTo( DomainEntityId.class );
+			assertThat( id.getJavaType() ).isEqualTo( CustomerId.class );
 			assertThat( id.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
 			assertThat( ( (SqmPath<?>) id ).getResolvedModel().getBindableJavaType() ).isEqualTo( CustomerId.class );
 			query.select( root ).where( cb.equal( id.get( "someDomainField" ), 1 ) );
@@ -111,7 +112,7 @@ public void testInvoiceCriteria(SessionFactoryScope scope) {
 			final CriteriaQuery<Invoice> query = cb.createQuery( Invoice.class );
 			final Root<Invoice> root = query.from( Invoice.class );
 			final Path<DomainEntityId> id = root.get( "id" );
-			assertThat( id.getJavaType() ).isEqualTo( DomainEntityId.class );
+			assertThat( id.getJavaType() ).isEqualTo( InvoiceId.class );
 			assertThat( id.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
 			assertThat( ( (SqmPath<?>) id ).getResolvedModel().getBindableJavaType() ).isEqualTo( InvoiceId.class );
 			query.select( root ).where( cb.equal( id.get( "someOtherDomainField" ), 1 ) );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericBasicValuedPathTest.java

@@ -28,6 +28,7 @@
 
 /**
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @SessionFactory
 @DomainModel( annotatedClasses = {
@@ -53,8 +54,7 @@ public void testId(SessionFactoryScope scope) {
 			final CriteriaQuery<Object> query = cb.createQuery();
 			final Root<MyEntity> root = query.from( MyEntity.class );
 			final Path<String> idPath = root.get( "id" );
-			// generic attributes are always reported as Object java type
-			assertThat( idPath.getJavaType() ).isEqualTo( Object.class );
+			assertThat( idPath.getJavaType() ).isEqualTo( Integer.class );
 			assertThat( idPath.getModel() ).isSameAs( root.getModel().getAttribute( "id" ) );
 			assertThat( ( (SqmPath<?>) idPath ).getResolvedModel().getBindableJavaType() ).isEqualTo( Integer.class );
 			final Object result = session.createQuery( query.select( idPath ) ).getSingleResult();
@@ -69,8 +69,7 @@ public void testProperty(SessionFactoryScope scope) {
 			final CriteriaQuery<Object> query = cb.createQuery();
 			final Root<MyEntity> root = query.from( MyEntity.class );
 			final Path<String> dataPath = root.get( "data" );
-			// generic attributes are always reported as Object java type
-			assertThat( dataPath.getJavaType() ).isEqualTo( Object.class );
+			assertThat( dataPath.getJavaType() ).isEqualTo( String.class );
 			assertThat( dataPath.getModel() ).isSameAs( root.getModel().getAttribute( "data" ) );
 			assertThat( ( (SqmPath<?>) dataPath ).getResolvedModel().getBindableJavaType() ).isEqualTo( String.class );
 			final Object result = session.createQuery( query.select( dataPath ) ).getSingleResult();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMapAssociationTest.java

@@ -34,6 +34,7 @@
 
 /**
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @SessionFactory
 @DomainModel( annotatedClasses = {
@@ -81,8 +82,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<Long> query = cb.createQuery( Long.class );
 			final Root<MapContainerEntity> root = query.from( MapContainerEntity.class );
 			final Join<MapContainerEntity, MapValueEntity> join = root.join( "map" );
-			// generic attributes are always reported as Object java type
-			assertThat( join.getJavaType() ).isEqualTo( Object.class );
+			assertThat( join.getJavaType() ).isEqualTo( MapValueEntity.class );
 			assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "map" ) );
 			assertThat( ( (SqmPath<?>) join ).getResolvedModel()
 								.getBindableJavaType() ).isEqualTo( MapValueEntity.class );

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericMappedSuperclassAssociationTest.java

@@ -34,6 +34,7 @@
 
 /**
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @DomainModel( annotatedClasses = {
 		GenericMappedSuperclassAssociationTest.Parent.class,
@@ -86,7 +87,7 @@ public void testCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<ChildB> cq = cb.createQuery( ChildB.class );
 			final Root<ChildB> from = cq.from( ChildB.class );
 			final Path<Object> parent = from.get( "parent" );
-			assertThat( parent.getModel().getBindableJavaType() ).isEqualTo( Parent.class );
+			assertThat( parent.getModel().getBindableJavaType() ).isEqualTo( ParentB.class );
 			assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( ParentB.class );
 			cq.select( from ).where( cb.equal( from.get( "parent" ).get( "id" ), 2L ) );
 			final ChildB result = session.createQuery( cq ).getSingleResult();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToManyAssociationTest.java

@@ -34,6 +34,7 @@
 /**
  * @author Yoann Rodière
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @SessionFactory
 @DomainModel( annotatedClasses = {
@@ -82,8 +83,7 @@ public void testParentCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<Long> query = cb.createQuery( Long.class );
 			final Root<Child> root = query.from( Child.class );
 			final Path<Parent> parent = root.get( "parent" );
-			// generic attributes are always reported as Object java type
-			assertThat( parent.getJavaType() ).isEqualTo( Object.class );
+			assertThat( parent.getJavaType() ).isEqualTo( Parent.class );
 			assertThat( parent.getModel() ).isSameAs( root.getModel().getAttribute( "parent" ) );
 			assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( Parent.class );
 			final Long result = session.createQuery( query.select( parent.get( "id" ) ) ).getSingleResult();
@@ -106,8 +106,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<Long> query = cb.createQuery( Long.class );
 			final Root<Parent> root = query.from( Parent.class );
 			final Join<Parent, Child> join = root.join( "children" );
-			// generic attributes are always reported as Object java type
-			assertThat( join.getJavaType() ).isEqualTo( Object.class );
+			assertThat( join.getJavaType() ).isEqualTo( Child.class );
 			assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "children" ) );
 			assertThat( ( (SqmPath<?>) join ).getResolvedModel().getBindableJavaType() ).isEqualTo( Child.class );
 			final Long result = session.createQuery( query.select( join.get( "id" ) ) ).getSingleResult();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/GenericToOneAssociationTest.java

@@ -30,6 +30,7 @@
 /**
  * @author Yoann Rodière
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @SessionFactory
 @DomainModel( annotatedClasses = {
@@ -78,8 +79,7 @@ public void testParentCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<Long> query = cb.createQuery( Long.class );
 			final Root<Child> root = query.from( Child.class );
 			final Path<Parent> parent = root.get( "parent" );
-			// generic attributes are always reported as Object java type
-			assertThat( parent.getJavaType() ).isEqualTo( Object.class );
+			assertThat( parent.getJavaType() ).isEqualTo( Parent.class );
 			assertThat( parent.getModel() ).isSameAs( root.getModel().getAttribute( "parent" ) );
 			assertThat( ( (SqmPath<?>) parent ).getResolvedModel().getBindableJavaType() ).isEqualTo( Parent.class );
 			final Long result = session.createQuery( query.select( parent.get( "id" ) ) ).getSingleResult();
@@ -102,8 +102,7 @@ public void testChildCriteriaQuery(SessionFactoryScope scope) {
 			final CriteriaQuery<Long> query = cb.createQuery( Long.class );
 			final Root<Parent> root = query.from( Parent.class );
 			final Join<Parent, Child> join = root.join( "child" );
-			// generic attributes are always reported as Object java type
-			assertThat( join.getJavaType() ).isEqualTo( Object.class );
+			assertThat( join.getJavaType() ).isEqualTo( Child.class );
 			assertThat( join.getModel() ).isSameAs( root.getModel().getAttribute( "child" ) );
 			assertThat( ( (SqmPath<?>) join ).getResolvedModel().getBindableJavaType() ).isEqualTo( Child.class );
 			final Long result = session.createQuery( query.select( join.get( "id" ) ) ).getSingleResult();

hibernate-core/src/test/java/org/hibernate/orm/test/annotations/generics/MultipleEmbeddedGenericsTest.java

@@ -30,6 +30,7 @@
 
 /**
  * @author Marco Belladelli
+ * @author Yanming Zhou
  */
 @DomainModel(annotatedClasses = {
 		MultipleEmbeddedGenericsTest.Customer.class,
@@ -74,12 +75,12 @@ public void testCustomerCriteria(SessionFactoryScope scope) {
 			final CriteriaQuery<Customer> query = cb.createQuery( Customer.class );
 			final Root<Customer> root = query.from( Customer.class );
 			final Path<CustomerEmbeddableOne> firstEmbedded = root.get( "firstEmbedded" );
-			assertThat( firstEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableOne.class );
+			assertThat( firstEmbedded.getJavaType() ).isEqualTo( CustomerEmbeddableOne.class );
 			assertThat( firstEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "firstEmbedded" ) );
 			assertThat( ( (SqmPath<?>) firstEmbedded ).getResolvedModel().getBindableJavaType() )
 					.isEqualTo( CustomerEmbeddableOne.class );
 			final Path<CustomerEmbeddableTwo> secondEmbedded = root.get( "secondEmbedded" );
-			assertThat( secondEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableTwo.class );
+			assertThat( secondEmbedded.getJavaType() ).isEqualTo( CustomerEmbeddableTwo.class );
 			assertThat( secondEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "secondEmbedded" ) );
 			assertThat( ( (SqmPath<?>) secondEmbedded ).getResolvedModel().getBindableJavaType() )
 					.isEqualTo( CustomerEmbeddableTwo.class );
@@ -110,12 +111,12 @@ public void testInvoiceCriteria(SessionFactoryScope scope) {
 			final CriteriaQuery<Invoice> query = cb.createQuery( Invoice.class );
 			final Root<Invoice> root = query.from( Invoice.class );
 			final Path<InvoiceEmbeddableOne> firstEmbedded = root.get( "firstEmbedded" );
-			assertThat( firstEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableOne.class );
+			assertThat( firstEmbedded.getJavaType() ).isEqualTo( InvoiceEmbeddableOne.class );
 			assertThat( firstEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "firstEmbedded" ) );
 			assertThat( ( (SqmPath<?>) firstEmbedded ).getResolvedModel().getBindableJavaType() )
 					.isEqualTo( InvoiceEmbeddableOne.class );
 			final Path<InvoiceEmbeddableTwo> secondEmbedded = root.get( "secondEmbedded" );
-			assertThat( secondEmbedded.getJavaType() ).isEqualTo( GenericEmbeddableTwo.class );
+			assertThat( secondEmbedded.getJavaType() ).isEqualTo( InvoiceEmbeddableTwo.class );
 			assertThat( secondEmbedded.getModel() ).isSameAs( root.getModel().getAttribute( "secondEmbedded" ) );
 			assertThat( ( (SqmPath<?>) secondEmbedded ).getResolvedModel().getBindableJavaType() )
 					.isEqualTo( InvoiceEmbeddableTwo.class );