[hibernate-commits] Hibernate SVN: r14124 - in core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2: collection and 1 other directories.

[hibernate-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2007-10-19 15:32:36 -0400 (Fri, 19 Oct 2007)
New Revision: 14124

Modified:
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java
   core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java
Log:
Add tests of Region.toMap()

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java	2007-10-19 19:29:57 UTC (rev 14123)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractGeneralDataRegionTestCase.java	2007-10-19 19:32:36 UTC (rev 14124)
@@ -21,6 +21,7 @@
 
 import org.hibernate.cache.GeneralDataRegion;
 import org.hibernate.cache.QueryResultsRegion;
+import org.hibernate.cache.Region;
 import org.hibernate.cache.jbc2.JBossCacheRegionFactory;
 import org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory;
 import org.hibernate.cache.jbc2.builder.MultiplexingCacheInstanceManager;
@@ -50,6 +51,16 @@
         super(name);
     }
 
+    @Override
+    protected void putInRegion(Region region, Object key, Object value) {
+        ((GeneralDataRegion) region).put(key, value);
+    }
+
+    @Override
+    protected void removeFromRegion(Region region, Object key) {
+        ((GeneralDataRegion) region).evict(key);        
+    }  
+
     /**
      * Test method for {@link QueryResultsRegion#evict(java.lang.Object)}.
      * 

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java	2007-10-19 19:29:57 UTC (rev 14123)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/AbstractRegionImplTestCase.java	2007-10-19 19:32:36 UTC (rev 14124)
@@ -16,6 +16,7 @@
 
 package org.hibernate.test.cache.jbc2;
 
+import java.util.Map;
 import java.util.Properties;
 
 import org.hibernate.cache.CacheDataDescription;
@@ -109,14 +110,40 @@
         assertNull("No region node", localCache.getRoot().getChild( regionFqn ));
     }
     
+    public void testToMap() throws Exception {
+        Configuration cfg = CacheTestUtil.buildConfiguration("test", SharedJBossCacheRegionFactory.class, true, true);
+        JBossCacheRegionFactory regionFactory = CacheTestUtil.startRegionFactory(cfg, getCacheTestSupport());
+        
+        Region region = createRegion(regionFactory, "test/test", cfg.getProperties(), getCacheDataDescription());
+        
+        putInRegion(region, "key1", "value1");
+        putInRegion(region, "key2", "value2");
+        
+        Map map = region.toMap();
+        assertNotNull(map);
+        assertEquals(2, map.size());
+        assertEquals("value1", map.get("key1"));
+        assertEquals("value2", map.get("key2"));
+        
+        removeFromRegion(region, "key1");
+        
+        map = region.toMap();
+        assertNotNull(map);
+        assertEquals(1, map.size());
+        assertEquals("value2", map.get("key2"));
+    }
+    
     protected abstract Cache getJBossCache(JBossCacheRegionFactory regionFactory);
     
     protected abstract Fqn getRegionFqn(String regionName, String regionPrefix);
     
     protected abstract Region createRegion(JBossCacheRegionFactory regionFactory, String regionName, Properties properties, CacheDataDescription cdd);
     
+    protected abstract void putInRegion(Region region, Object key, Object value);
+    protected abstract void removeFromRegion(Region region, Object key);
+    
     protected CacheDataDescription getCacheDataDescription() {
        return new CacheDataDescriptionImpl(true, true, ComparableComparator.INSTANCE);
-   }   
+    }   
 
 }

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java	2007-10-19 19:29:57 UTC (rev 14123)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/collection/CollectionRegionImplTestCase.java	2007-10-19 19:32:36 UTC (rev 14124)
@@ -49,6 +49,7 @@
         super(name);
     }
     
+    @Override
     protected void supportedAccessTypeTest(RegionFactory regionFactory, Properties properties) {
         
         CollectionRegion region = regionFactory.buildCollectionRegion("test", properties, null);
@@ -92,6 +93,15 @@
     protected Fqn getRegionFqn(String regionName, String regionPrefix) {
         return BasicRegionAdapter.getTypeLastRegionFqn(regionName, regionPrefix, CollectionRegionImpl.TYPE);
     }
+
+    @Override
+    protected void putInRegion(Region region, Object key, Object value) {
+        ((CollectionRegion) region).buildAccessStrategy(AccessType.TRANSACTIONAL).putFromLoad(key, value, System.currentTimeMillis(), new Integer(1));
+    }
+
+    @Override
+    protected void removeFromRegion(Region region, Object key) {
+        ((CollectionRegion) region).buildAccessStrategy(AccessType.TRANSACTIONAL).remove(key);        
+    }    
     
-    
 }

Modified: core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java
===================================================================
--- core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java	2007-10-19 19:29:57 UTC (rev 14123)
+++ core/trunk/cache-jbosscache2/src/test/java/org/hibernate/test/cache/jbc2/entity/EntityRegionImplTestCase.java	2007-10-19 19:32:36 UTC (rev 14124)
@@ -49,6 +49,7 @@
         super(name);
     } 
     
+    @Override
     protected void supportedAccessTypeTest(RegionFactory regionFactory, Properties properties) {
         
         EntityRegion region = regionFactory.buildEntityRegion("test", properties, null);
@@ -93,6 +94,16 @@
     protected Fqn getRegionFqn(String regionName, String regionPrefix) {
         return BasicRegionAdapter.getTypeLastRegionFqn(regionName, regionPrefix, EntityRegionImpl.TYPE);
     }
+
+    @Override
+    protected void putInRegion(Region region, Object key, Object value) {
+        ((EntityRegion) region).buildAccessStrategy(AccessType.TRANSACTIONAL).insert(key, value, new Integer(1));
+    }
+
+    @Override
+    protected void removeFromRegion(Region region, Object key) {
+        ((EntityRegion) region).buildAccessStrategy(AccessType.TRANSACTIONAL).remove(key);        
+    }  
     
     
 }