Merge branch 'main' into HIBERNATE-70-new

Author: NathanQingyangXu

src/integrationTest/java/com/mongodb/hibernate/MongoTestAssertions.java

@@ -18,6 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.assertj.core.api.recursive.comparison.RecursiveComparisonConfiguration;
 import org.jspecify.annotations.Nullable;
 
 public final class MongoTestAssertions {
@@ -35,4 +36,19 @@ public static void assertEquals(@Nullable Object expected, @Nullable Object actu
                 .withStrictTypeChecking()
                 .isEqualTo(expected);
     }
+
+    /**
+     * This method is intended to be a drop-in replacement for
+     * {@link org.junit.jupiter.api.Assertions#assertIterableEquals(Iterable, Iterable)}. It should work even if
+     * elements in {@code expected}/{@code actual} do not override {@link Object#equals(Object)}.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> void assertIterableEq(Iterable<T> expectedResultList, Iterable<? extends T> actualResultList) {
+        assertThat((Iterable<T>) actualResultList)
+                .usingRecursiveFieldByFieldElementComparator(RecursiveComparisonConfiguration.builder()
+                        .withIgnoreAllOverriddenEquals(false)
+                        .withStrictTypeChecking(true)
+                        .build())
+                .containsExactlyElementsOf(expectedResultList);
+    }
 }

src/integrationTest/java/com/mongodb/hibernate/query/select/AbstractSelectionQueryIntegrationTests.java

@@ -16,6 +16,7 @@
 
 package com.mongodb.hibernate.query.select;
 
+import static com.mongodb.hibernate.MongoTestAssertions.assertIterableEq;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
@@ -65,9 +66,12 @@ <T> void assertSelectionQuery(
             Consumer<SelectionQuery<T>> queryPostProcessor,
             String expectedMql,
             List<T> expectedResultList) {
-        assertSelectionQuery(hql, resultType, queryPostProcessor, expectedMql, resultList -> assertThat(resultList)
-                .usingRecursiveFieldByFieldElementComparator()
-                .containsExactlyElementsOf(expectedResultList));
+        assertSelectionQuery(
+                hql,
+                resultType,
+                queryPostProcessor,
+                expectedMql,
+                resultList -> assertIterableEq(expectedResultList, resultList));
     }
 
     <T> void assertSelectionQuery(String hql, Class<T> resultType, String expectedMql, List<T> expectedResultList) {

src/integrationTest/java/com/mongodb/hibernate/query/select/Book.java

@@ -27,7 +27,7 @@ class Book {
     @Id
     int id;
 
-    // dummy values are set for currently null value is not supported
+    // TODO-HIBERNATE-48 dummy values are set for currently null value is not supported
     String title = "";
     Boolean outOfStock = false;
     Integer publishYear = 0;
@@ -43,9 +43,4 @@ class Book {
         this.publishYear = publishYear;
         this.outOfStock = outOfStock;
     }
-
-    @Override
-    public String toString() {
-        return "Book{" + "id=" + id + '}';
-    }
 }