Test PR

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

@@ -16,14 +16,12 @@
 
 package com.mongodb.hibernate;
 
-import static com.mongodb.hibernate.MongoTestAssertions.assertEquals;
+import static com.mongodb.hibernate.MongoTestAssertions.assertEq;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.mongodb.client.MongoCollection;
 import com.mongodb.hibernate.junit.InjectMongoCollection;
 import com.mongodb.hibernate.junit.MongoExtension;
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
@@ -39,10 +37,7 @@
 
 @SessionFactory(exportSchema = false)
 @DomainModel(
-        annotatedClasses = {
-            BasicCrudIntegrationTests.Book.class,
-            BasicCrudIntegrationTests.BookWithEmbeddedField.class,
-            BasicCrudIntegrationTests.BookDynamicallyUpdated.class
+        annotatedClasses = {BasicCrudIntegrationTests.Book.class, BasicCrudIntegrationTests.BookDynamicallyUpdated.class
         })
 @ExtendWith(MongoExtension.class)
 class BasicCrudIntegrationTests implements SessionFactoryScopeAware {
@@ -106,31 +101,6 @@ void testEntityWithNullFieldValueInsertion() {
                             .formatted(author));
             assertCollectionContainsExactly(expectedDocument);
         }
-
-        @Test
-        void testEntityWithEmbeddedFieldInsertion() {
-            sessionFactoryScope.inTransaction(session -> {
-                var book = new BookWithEmbeddedField();
-                book.id = 1;
-                book.title = "War and Peace";
-                var author = new Author();
-                author.firstName = "Leo";
-                author.lastName = "Tolstoy";
-                book.author = author;
-                book.publishYear = 1867;
-                session.persist(book);
-            });
-            var expectedDocument = BsonDocument.parse(
-                    """
-                    {
-                        _id: 1,
-                        title: "War and Peace",
-                        authorFirstName: "Leo",
-                        authorLastName: "Tolstoy",
-                        publishYear: 1867
-                    }""");
-            assertCollectionContainsExactly(expectedDocument);
-        }
     }
 
     @Nested
@@ -219,7 +189,7 @@ void testFindByPrimaryKeyWithoutNullValueField() {
 
             sessionFactoryScope.inTransaction(session -> session.persist(book));
             var loadedBook = sessionFactoryScope.fromTransaction(session -> session.find(Book.class, 1));
-            assertEquals(book, loadedBook);
+            assertEq(book, loadedBook);
         }
 
         @Test
@@ -236,7 +206,7 @@ void testFindByPrimaryKeyWithNullValueField() {
 
             sessionFactoryScope.inTransaction(session -> session.persist(book));
             var loadedBook = sessionFactoryScope.fromTransaction(session -> session.find(Book.class, 1));
-            assertEquals(book, loadedBook);
+            assertEq(book, loadedBook);
         }
     }
 
@@ -270,27 +240,4 @@ static class BookDynamicallyUpdated {
 
         int publishYear;
     }
-
-    @Entity
-    @Table(name = "books")
-    static class BookWithEmbeddedField {
-        @Id
-        int id;
-
-        String title;
-
-        Author author;
-
-        int publishYear;
-    }
-
-    @Embeddable
-    static class Author {
-
-        @Column(name = "authorFirstName")
-        String firstName;
-
-        @Column(name = "authorLastName")
-        String lastName;
-    }
 }

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

@@ -18,6 +18,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.util.function.BiConsumer;
+import org.assertj.core.api.RecursiveComparisonAssert;
 import org.jspecify.annotations.Nullable;
 
 public final class MongoTestAssertions {
@@ -28,11 +30,19 @@ private MongoTestAssertions() {}
      * {@link org.junit.jupiter.api.Assertions#assertEquals(Object, Object)}. It should work even if
      * {@code expected}/{@code actual} does not override {@link Object#equals(Object)}.
      */
-    public static void assertEquals(@Nullable Object expected, @Nullable Object actual) {
-        assertThat(actual)
-                .usingRecursiveComparison()
-                .usingOverriddenEquals()
-                .withStrictTypeChecking()
-                .isEqualTo(expected);
+    public static void assertEq(@Nullable Object expected, @Nullable Object actual) {
+        assertUsingRecursiveComparison(expected, actual, RecursiveComparisonAssert::isEqualTo);
+    }
+
+    public static void assertUsingRecursiveComparison(
+            @Nullable Object expected,
+            @Nullable Object actual,
+            BiConsumer<RecursiveComparisonAssert<?>, Object> assertion) {
+        assertion.accept(
+                assertThat(expected)
+                        .usingRecursiveComparison()
+                        .usingOverriddenEquals()
+                        .withStrictTypeChecking(),
+                actual);
     }
 }

src/integrationTest/java/com/mongodb/hibernate/boot/FailedBootstrappingIntegrationTests.java

@@ -23,7 +23,7 @@
 import com.mongodb.hibernate.junit.MongoExtension;
 import org.bson.BsonDocument;
 import org.bson.BsonString;
-import org.hibernate.cfg.Configuration;
+import org.hibernate.boot.MetadataSources;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -50,7 +50,7 @@ void couldNotInstantiateDialect() {
                                         }
                                     }
                                     """))) {
-                        new Configuration().buildSessionFactory().close();
+                        new MetadataSources().buildMetadata();
                     }
                 })
                 .hasRootCause(