Merge branch 'main' into completed

Author: tboychuk

3-0-jpa-and-hibernate/3-1-3-author-book/src/test/java/com/bobocode/AuthorBookMappingTest.java

@@ -5,6 +5,7 @@
 import com.bobocode.util.EntityManagerUtil;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.hibernate.Session;
+import org.hibernate.exception.ConstraintViolationException;
 import org.junit.jupiter.api.*;
 
 import jakarta.persistence.*;
@@ -15,6 +16,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -66,8 +68,8 @@ void saveBookWithDuplicateIsbn() {
         Book bookWithDuplicateIsbn = createRandomBook();
         bookWithDuplicateIsbn.setIsbn(book.getIsbn());
 
-        assertThatExceptionOfType(RollbackException.class).isThrownBy(() ->
-                emUtil.performWithinTx(entityManager -> entityManager.persist(bookWithDuplicateIsbn)));
+        assertThatThrownBy(() -> emUtil.performWithinTx(entityManager -> entityManager.persist(bookWithDuplicateIsbn)))
+                .isInstanceOfAny(RollbackException.class, ConstraintViolationException.class);
     }
 
     @Test

3-0-jpa-and-hibernate/3-2-2-photo-comment-dao/src/test/java/com/bobocode/PhotoCommentMappingTest.java

@@ -234,7 +234,7 @@ void saveNewComments() {
 
     @Test
     @Order(16)
-    @DisplayName("Add a new comment")
+    @DisplayName("Add new comments")
     void addNewComments() {
         Photo photo = createRandomPhoto();
         emUtil.performWithinTx(entityManager -> entityManager.persist(photo));