Skip to content

Commit 3920d37

Browse files
SweetWuXiaoMeiliubao68
authored andcommitted
HHH-19365 - support identity and containsExactlyInAnyOrder
1 parent 12d09d3 commit 3920d37

File tree

3 files changed

+1
-7
lines changed

3 files changed

+1
-7
lines changed

hibernate-core/src/test/java/org/hibernate/orm/test/cid/CompositeIdAndMergeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import org.hibernate.dialect.GaussDBDialect;
1110

1211
import org.hibernate.testing.orm.junit.DomainModel;
1312
import org.hibernate.testing.orm.junit.JiraKey;
1413
import org.hibernate.testing.orm.junit.SessionFactory;
1514
import org.hibernate.testing.orm.junit.SessionFactoryScope;
16-
import org.hibernate.testing.orm.junit.SkipForDialect;
1715
import org.junit.jupiter.api.Test;
1816

1917
import jakarta.persistence.CascadeType;
@@ -41,7 +39,6 @@
4139
public class CompositeIdAndMergeTest {
4240

4341
@Test
44-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "opengauss don't support identity key generation")
4542
public void testMerge(SessionFactoryScope scope) {
4643
Integer lineItemIndex = 2;
4744
Order persistedOrder = scope.fromTransaction(

hibernate-core/src/test/java/org/hibernate/orm/test/entitygraph/EntityGraphAndJoinTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void executeQuery(SessionFactoryScope scope, boolean criteria, boolean l
113113
final List<Person> resultList = query.setHint( HINT_SPEC_FETCH_GRAPH, entityGraph ).getResultList();
114114
assertThat( resultList ).hasSize( 2 );
115115
// No order by, there is no guarantee of the data order.
116-
assertThat( resultList.stream().map( p -> p.getAddress().getId() ) ).contains( 1L, 2L );
116+
assertThat( resultList.stream().map( p -> p.getAddress().getId() ) ).containsExactlyInAnyOrder( 1L, 2L );
117117
inspector.assertExecutedCount( 1 );
118118
inspector.assertNumberOfOccurrenceInQuery( 0, "join", where ? 2 : 1 );
119119
} );

hibernate-core/src/test/java/org/hibernate/orm/test/merge/BidirectionalOneToManyMergeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
package org.hibernate.orm.test.merge;
66

77
import org.hibernate.testing.orm.junit.JiraKey;
8-
import org.hibernate.testing.orm.junit.SkipForDialect;
9-
import org.hibernate.dialect.GaussDBDialect;
108
import org.junit.Before;
119
import org.junit.Test;
1210

@@ -48,7 +46,6 @@ public void setUp() {
4846
}
4947

5048
@Test
51-
@SkipForDialect(dialectClass = GaussDBDialect.class, reason = "opengauss don't support identity key generation")
5249
public void testMerge() {
5350
doInJPA(this::entityManagerFactory, entityManager -> {
5451
Post post = entityManager.find(Post.class, 1L);

0 commit comments

Comments
 (0)