HHH-18992 - a few tweaks to the MultiLoadLockingTest

- added an @AfterEach tearDown method
- the testMultiLoadSimpleIdEntityPessimisticWriteLockSomeInL1CAndSomeInL2C was missing the enableSessionCheck(true) setting
- removed the tests that use optimistic/optimistic_force_increment since these modes are only legal for versioned entities

Signed-off-by: Jan Schatteman <[email protected]>

Author: jrenaat

hibernate-core/src/test/java/org/hibernate/orm/test/loading/multiLoad/MultiLoadLockingTest.java

@@ -4,9 +4,9 @@
  */
 package org.hibernate.orm.test.loading.multiLoad;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -23,6 +23,7 @@
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
 import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -49,41 +50,41 @@
 @JiraKey(value = "HHH-18992")
 public class MultiLoadLockingTest {
 
-	private List<Customer> customerList = List.of(
+	private final List<Customer> customerList = List.of(
 			new Customer(1L, "Customer A"),
 			new Customer(2L, "Customer B"),
 			new Customer(3L, "Customer C"),
 			new Customer(4L, "Customer D"),
 			new Customer(5L, "Customer E")
 		);
 
-	private List<Long> customerIds = customerList
+	private final List<Long> customerIds = customerList
 		.stream()
 		.map(Customer::getId)
 		.collect(Collectors.toList());
 
-	private List<EntityWithAggregateId> entityWithAggregateIdList = List.of(
+	private final List<EntityWithAggregateId> entityWithAggregateIdList = List.of(
 			new EntityWithAggregateId( new EntityWithAggregateId.Key( "1", "1" ), "Entity A" ),
 			new EntityWithAggregateId( new EntityWithAggregateId.Key( "2", "2" ), "Entity B" ),
 			new EntityWithAggregateId( new EntityWithAggregateId.Key( "3", "3" ), "Entity C" ),
 			new EntityWithAggregateId( new EntityWithAggregateId.Key( "4", "4" ), "Entity D" ),
 			new EntityWithAggregateId( new EntityWithAggregateId.Key( "5", "5" ), "Entity E" )
 	);
 
-	private List<EntityWithAggregateId.Key> entityWithAggregateIdKeys = entityWithAggregateIdList
+	private final List<EntityWithAggregateId.Key> entityWithAggregateIdKeys = entityWithAggregateIdList
 		.stream()
 		.map(EntityWithAggregateId::getKey)
 		.collect(Collectors.toList());
 
-	public List<User> userList = List.of(
+	public final List<User> userList = List.of(
 			new User(1, null),
 			new User(2, null),
 			new User(3, null),
 			new User(4, null),
 			new User(5, null)
 	);
 
-	private List<Integer> userIds = userList
+	private final List<Integer> userIds = userList
 		.stream()
 		.map(User::getId)
 		.collect(Collectors.toList());
@@ -99,8 +100,17 @@ public void prepareTestDataAndClearL2C(SessionFactoryScope scope) {
 		scope.getSessionFactory().getCache().evictAll();
 	}
 
-	// (1) simple Id entity w/ pessimistic read lock
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(session -> {
+			session.createMutationQuery( "delete from Customer" ).executeUpdate();
+			session.createMutationQuery( "delete from EntityWithAggregateId" ).executeUpdate();
+			session.createMutationQuery( "delete from User" ).executeUpdate();
+		});
+	}
+
 
+	// (1) simple Id entity w/ pessimistic read lock
 	@Test
 	void testMultiLoadSimpleIdEntityPessimisticReadLock(SessionFactoryScope scope) {
 		scope.inTransaction( session -> {
@@ -109,14 +119,11 @@ void testMultiLoadSimpleIdEntityPessimisticReadLock(SessionFactoryScope scope) {
 				.multiLoad(customerIds);
 			assertNotNull(customersLoaded);
 			assertEquals(customerList.size(), customersLoaded.size());
-			customersLoaded.forEach(customer -> {
-				assertEquals(LockMode.PESSIMISTIC_READ, session.getCurrentLockMode(customer));
-			});
+			customersLoaded.forEach(customer -> assertEquals(LockMode.PESSIMISTIC_READ, session.getCurrentLockMode(customer)) );
 		} );
 	}
 
 	// (2) composite Id entity w/ pessimistic read lock (one of the entities already in L1C)
-
 	@Test
 	void testMultiLoadCompositeIdEntityPessimisticReadLockAlreadyInSession(
 		SessionFactoryScope scope) {
@@ -130,14 +137,11 @@ void testMultiLoadCompositeIdEntityPessimisticReadLockAlreadyInSession(
 				.multiLoad(entityWithAggregateIdKeys);
 			assertNotNull(entitiesLoaded);
 			assertEquals(entityWithAggregateIdList.size(), entitiesLoaded.size());
-			entitiesLoaded.forEach(entity -> {
-				assertEquals(LockMode.PESSIMISTIC_READ, session.getCurrentLockMode(entity));
-			});
+			entitiesLoaded.forEach(entity -> assertEquals(LockMode.PESSIMISTIC_READ, session.getCurrentLockMode(entity)) );
 		} );
 	}
 
 	// (3) simple Id entity w/ pessimistic write lock (one in L1C & some in L2C)
-
 	@Test
 	public void testMultiLoadSimpleIdEntityPessimisticWriteLockSomeInL1CAndSomeInL2C(
 		SessionFactoryScope scope) {
@@ -152,56 +156,18 @@ public void testMultiLoadSimpleIdEntityPessimisticWriteLockSomeInL1CAndSomeInL2C
 			User userInL1C = session.find(User.class, userInL1CId);
 			assertNotNull(userInL1C);
 			List<User> usersLoaded = session.byMultipleIds(User.class)
+				.enableSessionCheck( true )
 				.with(new LockOptions(LockMode.PESSIMISTIC_WRITE))
 				.multiLoad(userIds);
 			assertNotNull(usersLoaded);
 			assertEquals(userList.size(), usersLoaded.size());
-			usersLoaded.forEach(user -> {
-				assertEquals(LockMode.PESSIMISTIC_WRITE, session.getCurrentLockMode(user));
-			});
+			usersLoaded.forEach(user -> assertEquals(LockMode.PESSIMISTIC_WRITE, session.getCurrentLockMode(user)) );
 		} );
 	}
 
 
-
-	// (4) simple Id entity w/ optimistic read lock
-
-	@Test
-	void testMultiLoadSimpleIdEntityOptimisticReadLock(SessionFactoryScope scope) {
-		scope.inTransaction( session -> {
-			List<Customer> customersLoaded = session.byMultipleIds(Customer.class)
-				.with(new LockOptions(LockMode.OPTIMISTIC))
-				.multiLoad(customerIds);
-			assertNotNull(customersLoaded);
-			assertEquals(customerList.size(), customersLoaded.size());
-			customersLoaded.forEach(customer -> {
-				assertEquals(LockMode.OPTIMISTIC, session.getCurrentLockMode(customer));
-			});
-		} );
-	}
-
-
-	// (5) simple Id entity w/ optimistic force increment lock
-
-	@Test
-	void testMultiLoadSimpleIdEntityOptimisticForceIncrementLock(SessionFactoryScope scope) {
-		scope.inTransaction( session -> {
-			List<Customer> customersLoaded = session.byMultipleIds(Customer.class)
-				.with(new LockOptions(LockMode.OPTIMISTIC_FORCE_INCREMENT))
-				.multiLoad(customerIds);
-			assertNotNull(customersLoaded);
-			assertEquals(customerList.size(), customersLoaded.size());
-			customersLoaded.forEach(customer -> {
-				assertEquals(LockMode.OPTIMISTIC_FORCE_INCREMENT, session.getCurrentLockMode(customer));
-			});
-		} );
-	}
-
-
-
-	@Entity
+	@Entity( name = "Customer" )
 	public static class Customer {
-
 		@Id
 		private Long id;
 		@Basic
@@ -230,6 +196,6 @@ public String getName() {
 		public void setName(String name) {
 			this.name = name;
 		}
-
 	}
+
 }