Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix test, since locking strategy now wraps LockTimeoutException 

I'm conflicted about this, but it's more consistent, since we
wrap all other JDBCExceptions. And since LockTimeoutException
is a JDBCException, it must be interpreted as belonging to that
lower semantic layer.

Signed-off-by: Gavin King <gavin@hibernate.org>
This commit is contained in:
Gavin King 2024-05-14 14:43:33 +02:00
parent 54d34a445c
commit 7c8690592e
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/functional/SQLServerDialectTest.java
View File

@ -25,6 +25,7 @@ import org.hibernate.Transaction;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.SQLServerDialect; import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.lock.PessimisticEntityLockException;
import org.hibernate.exception.LockTimeoutException; import org.hibernate.exception.LockTimeoutException;
import org.hibernate.query.Query; import org.hibernate.query.Query;
@ -38,9 +39,6 @@ import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
//import org.hibernate.criterion.Order;
//import org.hibernate.criterion.Projections;
/** /**
* used driver hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver * used driver hibernate.connection.driver_class com.microsoft.sqlserver.jdbc.SQLServerDriver
* *
@ -372,14 +370,14 @@ public class SQLServerDialectTest extends BaseCoreFunctionalTestCase {
try { try {
s2.buildLockRequest( opt ).lock( kit2 ); s2.buildLockRequest( opt ).lock( kit2 );
} }
catch ( LockTimeoutException e ) { catch ( PessimisticEntityLockException e ) {
// OK assertTrue( e.getCause() instanceof LockTimeoutException );
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
thread.join(); thread.join();
long differenceInMillis = end - start; long differenceInMillis = end - start;
assertTrue( assertTrue(
"Lock NoWait blocked for " + differenceInMillis + " ms, this is definitely to much for Nowait", "Lock NoWait blocked for " + differenceInMillis + " ms, this is definitely too much for Nowait",
differenceInMillis < 2000 differenceInMillis < 2000
); );