diff --git a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java index 1ee1fce761..45ceb63df4 100644 --- a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java +++ b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java @@ -56,7 +56,7 @@ public abstract class AbstractEntityCacheFunctionalTestCase extends CacheTestCas getSessions().evictEntity(Item.class.getName()); Statistics stats = getSessions().getStatistics(); stats.clear(); - SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics(Item.class.getName()); + SecondLevelCacheStatistics statistics = stats.getSecondLevelCacheStatistics(getPrefixedRegionName(Item.class.getName())); Map cacheEntries = statistics.getEntries(); assertEquals(0, cacheEntries.size()); } @@ -102,7 +102,7 @@ public abstract class AbstractEntityCacheFunctionalTestCase extends CacheTestCas // check the version value in the cache... SecondLevelCacheStatistics slcs = sfi().getStatistics().getSecondLevelCacheStatistics( - VersionedItem.class.getName()); + getPrefixedRegionName(VersionedItem.class.getName())); Object entry = slcs.getEntries().get(item.getId()); Long cachedVersionValue; diff --git a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java index cd25b833ae..1622c23034 100755 --- a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java +++ b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java @@ -63,7 +63,7 @@ public abstract class AbstractQueryCacheFunctionalTestCase extends AbstractEntit s.close(); SecondLevelCacheStatistics slcs = s.getSessionFactory().getStatistics().getSecondLevelCacheStatistics( - Item.class.getName()); + getPrefixedRegionName(Item.class.getName())); assertEquals(slcs.getPutCount(), 1); assertEquals(slcs.getElementCountInMemory(), 1); diff --git a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java index 87eca7b066..b907bc432d 100755 --- a/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java +++ b/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java @@ -83,6 +83,12 @@ public abstract class CacheTestCaseBase extends FunctionalTestCase { protected String getRegionPrefix() { return "test"; } + + protected String getPrefixedRegionName(String regionName) + { + String prefix = getRegionPrefix() == null ? "" : getRegionPrefix() + "."; + return prefix + regionName; + } public String getCacheConcurrencyStrategy() { return "transactional";