[hibernate-commits] Hibernate SVN: r14498 - core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional.

[hibernate-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-04-07 22:33:26 -0400 (Mon, 07 Apr 2008)
New Revision: 14498

Modified:
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java
Log:
Fix broken functional tests

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java	2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractEntityCacheFunctionalTestCase.java	2008-04-08 02:33:26 UTC (rev 14498)
@@ -56,7 +56,7 @@
         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 @@
 
         // 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;

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java	2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/AbstractQueryCacheFunctionalTestCase.java	2008-04-08 02:33:26 UTC (rev 14498)
@@ -63,7 +63,7 @@
         s.close();
 
         SecondLevelCacheStatistics slcs = s.getSessionFactory().getStatistics().getSecondLevelCacheStatistics(
-                Item.class.getName());
+              getPrefixedRegionName(Item.class.getName()));
 
         assertEquals(slcs.getPutCount(), 1);
         assertEquals(slcs.getElementCountInMemory(), 1);

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java	2008-04-07 14:54:27 UTC (rev 14497)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/functional/CacheTestCaseBase.java	2008-04-08 02:33:26 UTC (rev 14498)
@@ -83,6 +83,12 @@
     protected String getRegionPrefix() {
         return "test";
     }
+    
+    protected String getPrefixedRegionName(String regionName)
+    {
+       String prefix = getRegionPrefix() == null ? "" : getRegionPrefix() + ".";
+       return prefix + regionName;
+    }
 
     public String getCacheConcurrencyStrategy() {
         return "transactional";