HHH-11896 Fix test to be deterministic

hibernate · Dec 17, 2021 · 2e8d16e · 2e8d16e
1 parent 3e3d227
commit 2e8d16e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...ava/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java b/...ava/org/hibernate/orm/test/envers/integration/query/AssociationQueryWithOnClauseTest.java
@@ -22,6 +22,7 @@
 import org.hibernate.envers.AuditJoinTable;
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.query.AuditEntity;
+import org.hibernate.envers.query.order.NullPrecedence;
 import org.hibernate.orm.test.envers.BaseEnversJPAFunctionalTestCase;
 import org.hibernate.orm.test.envers.Priority;
 import org.hibernate.testing.TestForIssue;
@@ -182,7 +183,7 @@ public void testManyToOne() {
 		List list = getAuditReader().createQuery()
 				.forEntitiesAtRevision( EntityA.class, 1 )
 				.traverseRelation( "bManyToOne", JoinType.LEFT, "b", AuditEntity.property( "b", "type" ).eq( "T1" ) )
-				.addOrder( AuditEntity.property( "b", "number" ).asc() )
+				.addOrder( AuditEntity.property( "b", "number" ).asc().nulls( NullPrecedence.FIRST ) )
 				.up()
 				.addProjection( AuditEntity.id() )
 				.addProjection( AuditEntity.property( "b", "number" ) )
@@ -194,7 +195,7 @@ public void testManyToOne() {
 	public void testOneToMany() {
 		List list = getAuditReader().createQuery().forEntitiesAtRevision( EntityA.class, 1 )
 				.traverseRelation( "bOneToMany", JoinType.LEFT, "b", AuditEntity.property( "b", "type" ).eq( "T1" ) )
-				.addOrder( AuditEntity.property( "b", "number" ).asc() )
+				.addOrder( AuditEntity.property( "b", "number" ).asc().nulls( NullPrecedence.FIRST ) )
 				.up()
 				.addOrder( AuditEntity.id().asc() )
 				.addProjection( AuditEntity.id() )
@@ -208,9 +209,10 @@ public void testManyToMany() {
 		List list = getAuditReader().createQuery()
 				.forEntitiesAtRevision( EntityA.class, 1 )
 				.traverseRelation( "bManyToMany", JoinType.LEFT, "b", AuditEntity.property( "b", "type" ).eq( "T1" ) )
-				.addOrder( AuditEntity.property( "b", "number" ).asc() )
+				.addOrder( AuditEntity.property( "b", "number" ).asc().nulls( NullPrecedence.FIRST ) )
 				.up()
-				.addOrder( AuditEntity.id().asc() ).addProjection( AuditEntity.id() )
+				.addOrder( AuditEntity.id().asc().nulls( NullPrecedence.FIRST ) )
+				.addProjection(AuditEntity.id() )
 				.addProjection( AuditEntity.property( "b", "number" ) )
 				.getResultList();
 		assertArrayListEquals( list, tuple( a1.getId(), null ), tuple( a1.getId(), 1 ), tuple( a2.getId(), 3 ), tuple( a3.getId(), 3 ) );

diff --git a/...ers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java b/...ers/src/test/java/org/hibernate/orm/test/envers/integration/query/ComponentQueryTest.java
@@ -341,7 +341,7 @@ public void testOnClauseOnSingleSymbol() {
 				.forEntitiesAtRevision( Asset.class, 1 )
 				.addProjection( AuditEntity.id() )
 				.traverseRelation( "singleSymbol", JoinType.LEFT, "s", AuditEntity.property( "s", "type" ).eq( type1 ) )
-				.addOrder( AuditEntity.property( "s", "identifier" ).asc() )
+				.addOrder( AuditEntity.property( "s", "identifier" ).asc().nulls( NullPrecedence.FIRST ) )
 				.up()
 				.addOrder( AuditEntity.id().asc() )
 				.getResultList();
@@ -357,7 +357,7 @@ public void testOnClauseOnMultiSymbol() {
 				.forEntitiesAtRevision( Asset.class, 1 )
 				.addProjection( AuditEntity.id() )
 				.traverseRelation( "multiSymbols", JoinType.LEFT, "s", AuditEntity.property( "s", "type" ).eq( type1 ) )
-				.addOrder( AuditEntity.property( "s", "identifier" ).asc() )
+				.addOrder( AuditEntity.property( "s", "identifier" ).asc().nulls( NullPrecedence.FIRST ) )
 				.up()
 				.addOrder( AuditEntity.id().asc() )
 				.getResultList();