From ccc087b975aac58b8efb1eea910a784dcbeee29d Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Sun, 1 Jan 2012 18:52:17 -0600 Subject: [PATCH] HHH-5275 - Criteria.setLockMode does not work correctly --- .../java/org/hibernate/test/locking/LockModeTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java b/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java index 92d66edea5..d653d31703 100644 --- a/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java +++ b/hibernate-core/src/matrix/java/org/hibernate/test/locking/LockModeTest.java @@ -71,7 +71,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { session.close(); } - @Test + @Test( timeout = 6000 ) @SuppressWarnings( {"deprecation"}) public void testLoading() { // open a session, begin a transaction and lock row @@ -92,7 +92,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { } } - @Test + @Test( timeout = 6000 ) @FailureExpected( jiraKey = "HHH-5275" ) public void testLegacyCriteria() { // open a session, begin a transaction and lock row @@ -115,7 +115,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { } } - @Test + @Test( timeout = 6000 ) @FailureExpected( jiraKey = "HHH-5275" ) public void testLegacyCriteriaAliasSpecific() { // open a session, begin a transaction and lock row @@ -138,7 +138,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { } } - @Test + @Test( timeout = 6000 ) @FailureExpected( jiraKey = "HHH-5275" ) public void testQuery() { // open a session, begin a transaction and lock row @@ -161,7 +161,7 @@ public class LockModeTest extends BaseCoreFunctionalTestCase { } } - @Test + @Test( timeout = 6000 ) public void testQueryUsingLockOptions() { // todo : need an association here to make sure the alias-specific lock modes are applied correctly Session s1 = sessionFactory().openSession();