HHH-19605 Add test for issue

Author: mbellade

hibernate-core/src/test/java/org/hibernate/orm/test/batch/BatchCacheCircularAssociationTest.java

@@ -0,0 +1,149 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.orm.test.batch;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.cache.spi.CacheImplementor;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+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.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+@DomainModel(annotatedClasses = {
+		BatchCacheCircularAssociationTest.EntityA.class,
+		BatchCacheCircularAssociationTest.EntityB.class
+})
+@ServiceRegistry(settings = {
+		@Setting(name = AvailableSettings.DEFAULT_BATCH_FETCH_SIZE, value = "5"),
+		@Setting(name = AvailableSettings.USE_SECOND_LEVEL_CACHE, value = "true"),
+})
+@SessionFactory
+@Jira("https://hibernate.atlassian.net/browse/HHH-19605")
+public class BatchCacheCircularAssociationTest {
+	@Test
+	public void testDirtiness(SessionFactoryScope scope) {
+		final CacheImplementor cache = scope.getSessionFactory().getCache();
+		cache.evictAllRegions();
+		scope.inTransaction( session -> {
+			final List<EntityA> resultList = session.createSelectionQuery(
+					"select a from EntityA a order by a.id",
+					EntityA.class
+			).getResultList();
+			assertThat( resultList ).hasSize( 2 );
+			assertThat( session.isDirty() ).isFalse();
+
+			final EntityA entityA1 = resultList.get( 0 );
+			assertThat( entityA1.getId() ).isEqualTo( 1L );
+			assertThat( entityA1.getName() ).isEqualTo( "A1" );
+			assertThat( entityA1.getEntityB() ).isNull();
+
+			final EntityA entityA2 = resultList.get( 1 );
+			assertThat( entityA2.getId() ).isEqualTo( 2L );
+			assertThat( entityA2.getName() ).isEqualTo( "A2" );
+			assertThat( entityA2.getEntityB() ).isNotNull();
+			assertThat( entityA2.getEntityB().getEntityA() ).isSameAs( entityA1 );
+		} );
+	}
+
+	@BeforeAll
+	public void setUp(SessionFactoryScope scope) {
+		scope.inTransaction( session -> {
+			final EntityA entityA1 = new EntityA( 1L, "A1" );
+			final EntityA entityA2 = new EntityA( 2L, "A2" );
+			final EntityB entityB = new EntityB( 1L, "B1" );
+			entityB.entityA = entityA1;
+			entityA2.entityB = entityB;
+			session.persist( entityA1 );
+			session.persist( entityA2 );
+			session.persist( entityB );
+		} );
+	}
+
+	@AfterAll
+	public void tearDown(SessionFactoryScope scope) {
+		scope.getSessionFactory().getSchemaManager().truncateMappedObjects();
+	}
+
+	@Entity(name = "EntityA")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	static class EntityA {
+		@Id
+		Long id;
+
+		String name;
+
+		@ManyToOne
+		@JoinColumn(name = "entity_b")
+		EntityB entityB;
+
+		public EntityA() {
+		}
+
+		public EntityA(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public EntityB getEntityB() {
+			return entityB;
+		}
+	}
+
+	@Entity(name = "EntityB")
+	@Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
+	static class EntityB {
+		@Id
+		Long id;
+
+		String name;
+
+		@ManyToOne
+		@JoinColumn(name = "entity_a")
+		EntityA entityA;
+
+		public EntityB() {
+		}
+
+		public EntityB(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public EntityA getEntityA() {
+			return entityA;
+		}
+	}
+}