HHH-18023 fix questionable test

PESSIMISTIC_READ is not really a "more exclusive" lock than UPGRADE_NOWAIT Signed-off-by: Gavin King <gavin@hibernate.org>
Sanne · Apr 28, 2024 · fe7b3c9 · fe7b3c9
1 parent 1e0e0ac
commit fe7b3c9
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/locking/LockModeTest.java
@@ -7,7 +7,6 @@
 package org.hibernate.orm.test.locking;
 
 import java.util.Collections;
-import java.util.concurrent.CountDownLatch;
 
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.criteria.CriteriaBuilder;
@@ -17,7 +16,6 @@
 import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.community.dialect.AltibaseDialect;
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.SQLServerDialect;
@@ -56,8 +54,6 @@ public class LockModeTest extends BaseSessionFactoryFunctionalTest {
 
 	private Long id;
 
-	private CountDownLatch endLatch = new CountDownLatch( 1 );
-
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
 		return  new Class[] { A.class };
@@ -240,19 +236,30 @@ public void testRefreshWithExplicitLowerLevelLockMode() {
 	@Test
 	@TestForIssue(jiraKey = "HHH-12257")
 	@SkipForDialect( dialectClass = CockroachDialect.class )
-	public void testRefreshWithExplicitHigherLevelLockMode() {
+	public void testRefreshWithExplicitHigherLevelLockMode1() {
 		doInHibernate( this::sessionFactory, session -> {
 						   A a = session.get( A.class, id );
 						   checkLockMode( a, LockMode.READ, session );
 						   session.refresh( a, LockMode.UPGRADE_NOWAIT );
 						   checkLockMode( a, LockMode.UPGRADE_NOWAIT, session );
-						   session.refresh( a, LockModeType.PESSIMISTIC_READ );
-						   checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
 						   session.refresh( a, LockModeType.PESSIMISTIC_WRITE, Collections.emptyMap() );
 						   checkLockMode( a, LockMode.PESSIMISTIC_WRITE, session );
 					   } );
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-12257")
+	@SkipForDialect( dialectClass = CockroachDialect.class )
+	public void testRefreshWithExplicitHigherLevelLockMode2() {
+		doInHibernate( this::sessionFactory, session -> {
+			A a = session.get( A.class, id );
+			checkLockMode( a, LockMode.READ, session );
+			session.refresh( a, LockModeType.PESSIMISTIC_READ );
+			checkLockMode( a, LockMode.PESSIMISTIC_READ, session );
+			session.refresh( a, LockModeType.PESSIMISTIC_WRITE, Collections.emptyMap() );
+			checkLockMode( a, LockMode.PESSIMISTIC_WRITE, session );
+		} );
+	}
 
 	@Test
 	@TestForIssue(jiraKey = "HHH-12257")