[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/interceptors ...
Manik Surtani
msurtani at jboss.com
Tue Nov 14 09:17:11 EST 2006
User: msurtani
Date: 06/11/14 09:17:11
Modified: tests/functional/org/jboss/cache/interceptors
EvictionInterceptorTest.java
Log:
Merged eviction.Region and Region, eviction.RegionManager and RegionManager (lots of changes, now needs v. thorough testing)
Revision Changes Path
1.14 +29 -29 JBossCache/tests/functional/org/jboss/cache/interceptors/EvictionInterceptorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionInterceptorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/interceptors/EvictionInterceptorTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- EvictionInterceptorTest.java 27 Oct 2006 19:26:08 -0000 1.13
+++ EvictionInterceptorTest.java 14 Nov 2006 14:17:11 -0000 1.14
@@ -10,12 +10,12 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.NodeImpl;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.Region;
import org.jboss.cache.eviction.DummyEvictionPolicy;
import org.jboss.cache.eviction.EvictedEventNode;
import org.jboss.cache.eviction.LRUConfiguration;
import org.jboss.cache.eviction.NodeEventType;
-import org.jboss.cache.eviction.Region;
-import org.jboss.cache.eviction.RegionManager;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
@@ -46,13 +46,13 @@
regionManager = new RegionManager();
LRUConfiguration config = new LRUConfiguration();
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
- regionManager.createRegion("/a/b/c", config);
- regionManager.createRegion("/a/b/d", config);
- regionManager.createRegion("/a/b", config);
-
- regionManager.createRegion("/d/e/f", config);
- regionManager.createRegion("/d/e/g", config);
- regionManager.createRegion("/d/e", config);
+ regionManager.getRegion("/a/b/c", true).setEvictionPolicy(config);
+ regionManager.getRegion("/a/b/c/d", true).setEvictionPolicy(config);
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
+
+ regionManager.getRegion("/d/e/f", true).setEvictionPolicy(config);
+ regionManager.getRegion("/d/e/g", true).setEvictionPolicy(config);
+ regionManager.getRegion("/d/e", true).setEvictionPolicy(config);
cache = new TreeCache();
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
@@ -112,7 +112,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.getNodeMethodLocal,
Fqn.fromString(fqn1));
interceptor.invoke(mc);
- Region regionABC = regionManager.getRegion(fqn1);
+ Region regionABC = regionManager.getRegion(fqn1, true);
assertNull(regionABC.takeLastEventNode());
cache.put(fqn1, "key", "value");
@@ -132,7 +132,7 @@
Fqn.fromString(fqn1));
interceptor.invoke(mc);
- regionABC = regionManager.getRegion(fqn1);
+ regionABC = regionManager.getRegion(fqn1, true);
EvictedEventNode event = regionABC.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn1, event.getFqn().toString());
@@ -142,7 +142,7 @@
Fqn.fromString(fqn2));
interceptor.invoke(mc);
- Region regionAB = regionManager.getRegion(fqn2);
+ Region regionAB = regionManager.getRegion(fqn2, true);
event = regionAB.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn2, event.getFqn().toString());
@@ -150,7 +150,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getDataMapMethodLocal, Fqn.fromString(fqn3));
interceptor.invoke(mc);
- Region regionABD = regionManager.getRegion(fqn3);
+ Region regionABD = regionManager.getRegion(fqn3, true);
event = regionABD.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn3, event.getFqn().toString());
@@ -165,13 +165,13 @@
for (int i = 0; i < 10; i++)
{
- Region region = regionManager.getRegion(fqn3);
+ Region region = regionManager.getRegion(fqn3, true);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn3, event.getFqn().toString());
}
- assertNull(regionManager.getRegion(fqn3).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn3, true).takeLastEventNode());
// check null handling.
mc = MethodCallFactory.create(MethodDeclarations.getDataMapMethodLocal, new Object[]{null});
@@ -187,7 +187,7 @@
Object key = "key";
MethodCall mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
assertNull(region.takeLastEventNode());
// add the node but try to get on a null element should result in no cache events being added to MarshRegion.
@@ -212,7 +212,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString());
+ region = regionManager.getRegion(fqn.toString(), true);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
@@ -231,7 +231,7 @@
interceptor.invoke(mc);
}
- region = regionManager.getRegion(fqn.toString());
+ region = regionManager.getRegion(fqn.toString(), true);
for (int i = 0; i < 1000; i++)
{
event = region.takeLastEventNode();
@@ -244,7 +244,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString());
+ region = regionManager.getRegion(fqn.toString(), true);
event = region.takeLastEventNode();
assertNull(region.takeLastEventNode());
@@ -298,7 +298,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.putDataMethodLocal, null, fqn, data, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
@@ -336,12 +336,12 @@
fqn = Fqn.fromString("/a/b");
mc = MethodCallFactory.create(MethodDeclarations.putDataEraseMethodLocal, null, fqn, data, false, false);
interceptor.invoke(mc);
- event = regionManager.getRegion(fqn.toString()).takeLastEventNode();
+ event = regionManager.getRegion(fqn.toString(), true).takeLastEventNode();
assertFalse(event.isResetElementCount());
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
assertEquals(100, event.getElementDifference());
- assertNull(regionManager.getRegion(fqn.toString()).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn.toString(), true).takeLastEventNode());
node = cache.get(fqn.toString());
assertEquals(100, node.numAttributes());
@@ -355,12 +355,12 @@
mc = MethodCallFactory.create(MethodDeclarations.putDataEraseMethodLocal, null, fqn, data, false, true);
interceptor.invoke(mc);
- event = regionManager.getRegion(fqn.toString()).takeLastEventNode();
+ event = regionManager.getRegion(fqn.toString(), true).takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
assertEquals(100, event.getElementDifference());
assertTrue(event.isResetElementCount());
- assertNull(regionManager.getRegion(fqn.toString()).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn.toString(), true).takeLastEventNode());
node = cache.get(fqn.toString());
@@ -378,7 +378,7 @@
public void testCreateElement() throws Throwable
{
Fqn fqn = Fqn.fromString("/d/e/f");
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
Object key = "key";
Object value = "value";
@@ -416,7 +416,7 @@
interceptor.invoke(mc);
assertEquals(0, cache.get(fqn).numAttributes());
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
@@ -443,7 +443,7 @@
interceptor.invoke(mc);
assertNull(cache.get(fqn, "a"));
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.REMOVE_ELEMENT_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
@@ -483,7 +483,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.putDataMethodLocal, null, fqn, data, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString());
+ Region region = regionManager.getRegion(fqn.toString(), true);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
@@ -522,7 +522,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString());
+ region = regionManager.getRegion(fqn.toString(), true);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
More information about the jboss-cvs-commits
mailing list