From 317e0b0ece19fac3300eb60ff03df950450c09ec Mon Sep 17 00:00:00 2001
From: Gail Badner <gbadner@redhat.com>
Date: Wed, 3 Jan 2018 21:43:20 -0800
Subject: [PATCH] HHH-10418 : test case showing inconsistency between
 SessionFactoryImpl and CacheImpl

---
 ...ntitiesAndCollectionsInSameRegionTest.java | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/EntitiesAndCollectionsInSameRegionTest.java b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/EntitiesAndCollectionsInSameRegionTest.java
index f3f6af3c32..b067b51822 100644
--- a/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/EntitiesAndCollectionsInSameRegionTest.java
+++ b/hibernate-infinispan/src/test/java/org/hibernate/test/cache/infinispan/functional/EntitiesAndCollectionsInSameRegionTest.java
@@ -19,6 +19,10 @@ import org.hibernate.Hibernate;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.cache.internal.DefaultCacheKeysFactory;
+import org.hibernate.cache.spi.EntityRegion;
+import org.hibernate.cache.spi.Region;
+import org.hibernate.cache.spi.access.EntityRegionAccessStrategy;
+import org.hibernate.cache.spi.access.RegionAccessStrategy;
 import org.hibernate.cfg.Environment;
 import org.hibernate.stat.SecondLevelCacheStatistics;
 import org.hibernate.stat.Statistics;
@@ -30,6 +34,8 @@ import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 /**
  * @author Gail Badner
@@ -208,6 +214,22 @@ public class EntitiesAndCollectionsInSameRegionTest extends SingleNodeTest {
 		);
 	}
 
+	@Test
+	@TestForIssue(jiraKey = "HHH-10418")
+	public void testSessionFactoryImplCachImplConsistent() {
+		// When there is an entity region and collection region with the same name,
+		// * SessionFactoryImplementor#getSecondLevelCacheRegionAccessStrategy should return an EntityRegionAccessStrategy;
+		// * SessionFactoryImplementor#getSecondLevelCacheRegionAccessStrategy should return an EntityRegion.
+
+		final RegionAccessStrategy regionAccessStrategy = sessionFactory().getSecondLevelCacheRegionAccessStrategy(
+				REGION_NAME
+		);
+		assertTrue( EntityRegionAccessStrategy.class.isInstance( regionAccessStrategy ) );
+		final EntityRegionAccessStrategy entityRegionAccessStrategy = (EntityRegionAccessStrategy) regionAccessStrategy;
+
+		assertSame( entityRegionAccessStrategy.getRegion(), sessionFactory().getSecondLevelCacheRegion( REGION_NAME ) );
+	}
+
 	@Entity(name = "AnEntity")
 	@Cache( usage = CacheConcurrencyStrategy.TRANSACTIONAL, region = REGION_NAME)
 	public static class AnEntity {