root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

This commit is contained in:
Juergen Hoeller 2025-06-25 22:36:44 +02:00
parent 6e6280a42c 511739e3de
commit b3dc75265d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateJpaDialectTests.java
View File

@ -17,11 +17,11 @@
package org.springframework.orm.jpa.hibernate; package org.springframework.orm.jpa.hibernate;
import jakarta.persistence.OptimisticLockException; import jakarta.persistence.OptimisticLockException;
import jakarta.persistence.PersistenceException;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.dialect.lock.OptimisticEntityLockException; import org.hibernate.dialect.lock.OptimisticEntityLockException;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.orm.ObjectOptimisticLockingFailureException; import org.springframework.orm.ObjectOptimisticLockingFailureException;
import org.springframework.orm.jpa.JpaDialect; import org.springframework.orm.jpa.JpaDialect;
import org.springframework.orm.jpa.JpaOptimisticLockingFailureException; import org.springframework.orm.jpa.JpaOptimisticLockingFailureException;
@ -40,7 +40,7 @@ class HibernateJpaDialectTests {
@Test @Test
void testTranslateException() { void testTranslateException() {
// Plain JPA exception // Plain JPA exception
PersistenceException ex = new OptimisticLockException(); RuntimeException ex = new OptimisticLockException();
assertThat(dialect.translateExceptionIfPossible(ex)) assertThat(dialect.translateExceptionIfPossible(ex))
.isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex); .isInstanceOf(JpaOptimisticLockingFailureException.class).hasCause(ex);
@ -53,6 +53,11 @@ class HibernateJpaDialectTests {
ex = new HibernateException(new OptimisticEntityLockException("", "")); ex = new HibernateException(new OptimisticEntityLockException("", ""));
assertThat(dialect.translateExceptionIfPossible(ex)) assertThat(dialect.translateExceptionIfPossible(ex))
.isInstanceOf(ObjectOptimisticLockingFailureException.class).hasCause(ex); .isInstanceOf(ObjectOptimisticLockingFailureException.class).hasCause(ex);
// IllegalArgumentException
ex = new IllegalArgumentException("");
assertThat(dialect.translateExceptionIfPossible(ex))
.isInstanceOf(InvalidDataAccessApiUsageException.class).hasCause(ex);
} }
} }