[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/interceptors ...
Manik Surtani
msurtani at jboss.com
Wed Nov 15 18:48:32 EST 2006
User: msurtani
Date: 06/11/15 18:48:32
Modified: tests/functional/org/jboss/cache/interceptors
EvictionInterceptorTest.java
Log:
Fixed some failing UTs
Revision Changes Path
1.15 +29 -35 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- EvictionInterceptorTest.java 14 Nov 2006 14:17:11 -0000 1.14
+++ EvictionInterceptorTest.java 15 Nov 2006 23:48:32 -0000 1.15
@@ -9,12 +9,12 @@
import junit.framework.TestCase;
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.RegionManager;
+import org.jboss.cache.TreeCache;
+import org.jboss.cache.eviction.DummyEvictionConfiguration;
import org.jboss.cache.eviction.EvictedEventNode;
-import org.jboss.cache.eviction.LRUConfiguration;
+import org.jboss.cache.eviction.EvictionPolicyConfig;
import org.jboss.cache.eviction.NodeEventType;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.marshall.MethodCall;
@@ -44,8 +44,11 @@
{
super.setUp();
regionManager = new RegionManager();
- LRUConfiguration config = new LRUConfiguration();
- config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
+ EvictionPolicyConfig config = new DummyEvictionConfiguration();
+ regionManager.setUsingEvictions(true);
+
+ regionManager.getRegion(RegionManager.DEFAULT_REGION, true).setEvictionPolicy(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);
@@ -58,15 +61,6 @@
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.DummyTransactionManagerLookup");
cache.getConfiguration().setIsolationLevel(IsolationLevel.SERIALIZABLE);
-/*CacheMgmtInterceptor
-TxInterceptor
-Unlock
-PessimisticLockInterceptor
-CallInterceptor
-UnlockInterceptor
-TxInterceptor
-CacheMgmtInterceptor */
-
// make the interceptor chain (separate from the TreeCache object.
interceptor = new CacheMgmtInterceptor();
@@ -112,7 +106,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.getNodeMethodLocal,
Fqn.fromString(fqn1));
interceptor.invoke(mc);
- Region regionABC = regionManager.getRegion(fqn1, true);
+ Region regionABC = regionManager.getRegion(fqn1, false);
assertNull(regionABC.takeLastEventNode());
cache.put(fqn1, "key", "value");
@@ -132,7 +126,7 @@
Fqn.fromString(fqn1));
interceptor.invoke(mc);
- regionABC = regionManager.getRegion(fqn1, true);
+ regionABC = regionManager.getRegion(fqn1, false);
EvictedEventNode event = regionABC.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn1, event.getFqn().toString());
@@ -142,7 +136,7 @@
Fqn.fromString(fqn2));
interceptor.invoke(mc);
- Region regionAB = regionManager.getRegion(fqn2, true);
+ Region regionAB = regionManager.getRegion(fqn2, false);
event = regionAB.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn2, event.getFqn().toString());
@@ -150,7 +144,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getDataMapMethodLocal, Fqn.fromString(fqn3));
interceptor.invoke(mc);
- Region regionABD = regionManager.getRegion(fqn3, true);
+ Region regionABD = regionManager.getRegion(fqn3, false);
event = regionABD.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn3, event.getFqn().toString());
@@ -165,13 +159,13 @@
for (int i = 0; i < 10; i++)
{
- Region region = regionManager.getRegion(fqn3, true);
+ Region region = regionManager.getRegion(fqn3, false);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn3, event.getFqn().toString());
}
- assertNull(regionManager.getRegion(fqn3, true).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn3, false).takeLastEventNode());
// check null handling.
mc = MethodCallFactory.create(MethodDeclarations.getDataMapMethodLocal, new Object[]{null});
@@ -187,7 +181,7 @@
Object key = "key";
MethodCall mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
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 +206,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString(), true);
+ region = regionManager.getRegion(fqn.toString(), false);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
@@ -231,7 +225,7 @@
interceptor.invoke(mc);
}
- region = regionManager.getRegion(fqn.toString(), true);
+ region = regionManager.getRegion(fqn.toString(), false);
for (int i = 0; i < 1000; i++)
{
event = region.takeLastEventNode();
@@ -244,7 +238,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString(), true);
+ region = regionManager.getRegion(fqn.toString(), false);
event = region.takeLastEventNode();
assertNull(region.takeLastEventNode());
@@ -298,7 +292,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.putDataMethodLocal, null, fqn, data, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
@@ -336,12 +330,12 @@
fqn = Fqn.fromString("/a/b");
mc = MethodCallFactory.create(MethodDeclarations.putDataEraseMethodLocal, null, fqn, data, false, false);
interceptor.invoke(mc);
- event = regionManager.getRegion(fqn.toString(), true).takeLastEventNode();
+ event = regionManager.getRegion(fqn.toString(), false).takeLastEventNode();
assertFalse(event.isResetElementCount());
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
assertEquals(100, event.getElementDifference());
- assertNull(regionManager.getRegion(fqn.toString(), true).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn.toString(), false).takeLastEventNode());
node = cache.get(fqn.toString());
assertEquals(100, node.numAttributes());
@@ -355,12 +349,12 @@
mc = MethodCallFactory.create(MethodDeclarations.putDataEraseMethodLocal, null, fqn, data, false, true);
interceptor.invoke(mc);
- event = regionManager.getRegion(fqn.toString(), true).takeLastEventNode();
+ event = regionManager.getRegion(fqn.toString(), false).takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
assertEquals(100, event.getElementDifference());
assertTrue(event.isResetElementCount());
- assertNull(regionManager.getRegion(fqn.toString(), true).takeLastEventNode());
+ assertNull(regionManager.getRegion(fqn.toString(), false).takeLastEventNode());
node = cache.get(fqn.toString());
@@ -378,7 +372,7 @@
public void testCreateElement() throws Throwable
{
Fqn fqn = Fqn.fromString("/d/e/f");
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
Object key = "key";
Object value = "value";
@@ -416,7 +410,7 @@
interceptor.invoke(mc);
assertEquals(0, cache.get(fqn).numAttributes());
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.REMOVE_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
@@ -443,7 +437,7 @@
interceptor.invoke(mc);
assertNull(cache.get(fqn, "a"));
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.REMOVE_ELEMENT_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
@@ -483,7 +477,7 @@
MethodCall mc = MethodCallFactory.create(MethodDeclarations.putDataMethodLocal, null, fqn, data, false);
interceptor.invoke(mc);
- Region region = regionManager.getRegion(fqn.toString(), true);
+ Region region = regionManager.getRegion(fqn.toString(), false);
EvictedEventNode event = region.takeLastEventNode();
assertEquals(NodeEventType.ADD_NODE_EVENT, event.getEventType());
@@ -522,7 +516,7 @@
mc = MethodCallFactory.create(MethodDeclarations.getKeyValueMethodLocal, fqn, key, false);
interceptor.invoke(mc);
- region = regionManager.getRegion(fqn.toString(), true);
+ region = regionManager.getRegion(fqn.toString(), false);
event = region.takeLastEventNode();
assertEquals(NodeEventType.VISIT_NODE_EVENT, event.getEventType());
assertEquals(fqn, event.getFqn());
More information about the jboss-cvs-commits
mailing list