[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/eviction ...
Manik Surtani
msurtani at jboss.com
Wed Nov 15 10:16:39 EST 2006
User: msurtani
Date: 06/11/15 10:16:39
Modified: tests/functional/org/jboss/cache/eviction
LRUPolicyTest.java LRUConfigurationTest.java
LFUAlgorithmTest.java
ProgrammaticLRUPolicyTest.java
EvictionConfigurationTest.java
RegionManagerTest.java
DummyEvictionConfiguration.java
Log:
Updated to fix failures after patching up region managers
Revision Changes Path
1.17 +2 -2 JBossCache/tests/functional/org/jboss/cache/eviction/LRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUPolicyTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- LRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.16
+++ LRUPolicyTest.java 15 Nov 2006 15:16:39 -0000 1.17
@@ -14,7 +14,7 @@
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang - dhuang at jboss.org
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class LRUPolicyTest extends TestCase
{
@@ -73,7 +73,7 @@
}
TestingUtil.sleepThread(wakeupIntervalMillis_ + 500);
- cache_.getRegionManager().getRegion(Fqn.fromString(rootStr + 5), true).markNodeCurrentlyInUse(0);
+ cache_.getRegionManager().getRegion(Fqn.fromString(rootStr + 5), true).markNodeCurrentlyInUse(Fqn.fromString(rootStr + 5), 0);
for (int i = 10; i < 15; i++)
{
1.5 +1 -1 JBossCache/tests/functional/org/jboss/cache/eviction/LRUConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUConfigurationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LRUConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.4
+++ LRUConfigurationTest.java 15 Nov 2006 15:16:39 -0000 1.5
@@ -16,7 +16,7 @@
* Unit tests for LRUConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class LRUConfigurationTest extends TestCase
{
1.6 +36 -27 JBossCache/tests/functional/org/jboss/cache/eviction/LFUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LFUAlgorithmTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LFUAlgorithmTest.java 14 Nov 2006 14:17:10 -0000 1.5
+++ LFUAlgorithmTest.java 15 Nov 2006 15:16:39 -0000 1.6
@@ -12,6 +12,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
+import org.jboss.cache.TreeCache;
import java.util.Iterator;
@@ -19,7 +20,7 @@
* Unit test for LFUAlgorithm.
*
* @author Daniel Huang - dhuang at jboss.org - 10/2005
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class LFUAlgorithmTest extends TestCase
{
@@ -38,9 +39,11 @@
algo = new LFUAlgorithm();
LFUConfiguration config = new LFUConfiguration();
- regionManager = new RegionManager();
+ regionManager = new RegionManager(new TreeCache());
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
+ // doesn't this need a cache?!?? :-/
+
}
public void tearDown() throws Exception
@@ -53,9 +56,10 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Region region = regionManager.getRegion("/a/b", true);
- LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
+ LFUConfiguration config = new LFUConfiguration();
config.setMaxNodes(0);
config.setMinNodes(20);
+ region.setEvictionPolicy(config);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
try
@@ -77,10 +81,10 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager.getRegion("/a/b", true);
- LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
-
+ LFUConfiguration config = new LFUConfiguration();
config.setMaxNodes(1);
config.setMinNodes(20);
+ region.setEvictionPolicy(config);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
@@ -111,29 +115,34 @@
assertEquals("Queue size should be ", 1, algo.getEvictionQueue().getNumberOfNodes());
}
- public void testMaxNode3() throws Exception
- {
- Region region = regionManager.getRegion("/a/b", true);
- LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
-
- config.setMaxNodes(15000);
- config.setMinNodes(15000);
- for (int i = 0; i < 20000; i++)
- {
- Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
- region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
-
- if ((i % 2) == 0)
- {
- region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
- }
- }
-
- algo.process(region);
-// LFUQueue queue = (LFUQueue) algo.evictionQueue;
-// Iterator it = queue.iterate();
+ // What's this doing here? This should be a stress test, not a functional test. There are no assertions, for
+ // example. :S - Manik, Nov 06
- }
+// public void testMaxNode3() throws Exception
+// {
+// Region region = regionManager.getRegion("/a/b", true);
+// LFUConfiguration config = new LFUConfiguration();
+//
+// config.setMaxNodes(15000);
+// config.setMinNodes(15000);
+//
+// region.setEvictionPolicy(config);
+// for (int i = 0; i < 20000; i++)
+// {
+// Fqn fqn = Fqn.fromString("/a/b/" + Integer.toString(i));
+// region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.ADD_NODE_EVENT));
+//
+// if ((i % 2) == 0)
+// {
+// region.putNodeEvent(new EvictedEventNode(fqn, NodeEventType.VISIT_NODE_EVENT));
+// }
+// }
+//
+// algo.process(region);
+//// LFUQueue queue = (LFUQueue) algo.evictionQueue;
+//// Iterator it = queue.iterate();
+//
+// }
public void testMinNode1() throws Exception
{
1.6 +7 -30 JBossCache/tests/functional/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ProgrammaticLRUPolicyTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ProgrammaticLRUPolicyTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ProgrammaticLRUPolicyTest.java 14 Nov 2006 14:17:10 -0000 1.5
+++ ProgrammaticLRUPolicyTest.java 15 Nov 2006 15:16:39 -0000 1.6
@@ -40,7 +40,7 @@
* Unit tests for programmatic configuration of LRU policy
*
* @author Ben Wang, Oct, 2006
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class ProgrammaticLRUPolicyTest extends TestCase
{
@@ -91,6 +91,7 @@
RegionManager regionManager = cache_.getRegionManager();
EvictionConfig topConfig = cache_.getConfiguration().getEvictionConfig();
EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, topConfig.getDefaultEvictionPolicyClass(), topConfig.getDefaultEventQueueSize());
+ regionManager.setEvictionConfig(topConfig);
// Fqn is the region name
regionManager.getRegion("/programmatic", true).setEvictionPolicy(erc.getEvictionPolicyConfig());
}
@@ -104,42 +105,18 @@
{
String str = rootStr + i;
Fqn fqn = Fqn.fromString(str);
- try
- {
cache_.put(fqn, str, str);
}
- catch (Exception e)
- {
- fail("Failed to insert data" + e);
- e.printStackTrace();
- }
- }
- try
- {
String val = (String) cache_.get(rootStr + "3", rootStr + "3");
assertNotNull("DataNode should be empty ", val);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Failed to get" + e);
- }
System.out.println(cache_.toString());
TestingUtil.sleepThread(2*wakeupIntervalMillis_ + 500);
System.out.println(cache_.toString());
- try
- {
- String val = (String) cache_.get(rootStr + "3", rootStr + "3");
+ val = (String) cache_.get(rootStr + "3", rootStr + "3");
assertNull("DataNode should be empty ", val);
}
- catch (Exception e)
- {
- e.printStackTrace();
- fail("Failed to get" + e);
- }
- }
private void addObjectBasedRegion() throws Exception
{
1.11 +22 -21 JBossCache/tests/functional/org/jboss/cache/eviction/EvictionConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EvictionConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/EvictionConfigurationTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- EvictionConfigurationTest.java 14 Nov 2006 14:17:10 -0000 1.10
+++ EvictionConfigurationTest.java 15 Nov 2006 15:16:39 -0000 1.11
@@ -10,6 +10,7 @@
import org.jboss.cache.TreeCache;
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
+import org.jboss.cache.Fqn;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.lock.IsolationLevel;
@@ -18,7 +19,7 @@
* Unit test to test Eviction configuration types.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class EvictionConfigurationTest extends TestCase
{
@@ -43,7 +44,7 @@
Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
- assertEquals("/org/jboss/data/", region.getFqn());
+ assertEquals(Fqn.fromString("/org/jboss/data"), region.getFqn());
assertTrue(policy instanceof LFUPolicy);
assertTrue(configuration instanceof LFUConfiguration);
assertEquals(5000, ((LFUConfiguration) configuration).getMaxNodes());
@@ -52,7 +53,7 @@
region = regionManager.getRegion("/org/jboss/test/data", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/org/jboss/test/data/", region.getFqn());
+ assertEquals(Fqn.fromString("/org/jboss/test/data"), region.getFqn());
assertTrue(policy instanceof FIFOPolicy);
assertTrue(configuration instanceof FIFOConfiguration);
assertEquals(5, ((FIFOConfiguration) configuration).getMaxNodes());
@@ -60,7 +61,7 @@
region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/test/", region.getFqn());
+ assertEquals(Fqn.fromString("/test"), region.getFqn());
assertTrue(policy instanceof MRUPolicy);
assertTrue(configuration instanceof MRUConfiguration);
assertEquals(10000, ((MRUConfiguration) configuration).getMaxNodes());
@@ -68,7 +69,7 @@
region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/maxAgeTest/", region.getFqn());
+ assertEquals(Fqn.fromString("/maxAgeTest"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
@@ -76,10 +77,10 @@
assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c", true);
+ region = regionManager.getRegion("/a/b/c", false);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/_default_/", region.getFqn());
+ assertEquals(Fqn.ROOT, region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
@@ -97,7 +98,7 @@
Region region = regionManager.getRegion("/org/jboss/data", true);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
- assertEquals("/org/jboss/data/", region.getFqn());
+ assertEquals(Fqn.fromString("/org/jboss/data/"), region.getFqn());
assertTrue(policy instanceof FIFOPolicy);
assertTrue(configuration instanceof FIFOConfiguration);
assertEquals(5000, ((FIFOConfiguration) configuration).getMaxNodes());
@@ -105,26 +106,26 @@
region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/test/", region.getFqn());
+ assertEquals(Fqn.fromString("/test/"), region.getFqn());
assertTrue(policy instanceof MRUPolicy);
assertTrue(configuration instanceof MRUConfiguration);
assertEquals(10000, ((MRUConfiguration) configuration).getMaxNodes());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c", true);
+ region = regionManager.getRegion("/a/b/c", false);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/_default_/", region.getFqn());
+ assertEquals(Fqn.ROOT, region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
assertEquals(0, ((LRUConfiguration) configuration).getMaxAgeSeconds());
- region = regionManager.getRegion("/maxAgeTest", true);
+ region = regionManager.getRegion("/maxAgeTest", false);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/maxAgeTest/", region.getFqn());
+ assertEquals(Fqn.fromString("/maxAgeTest/"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
@@ -139,19 +140,19 @@
this.setupCache("META-INF/local-lru-eviction-service.xml");
assertEquals(5, cache.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds());
- Region region = regionManager.getRegion("/org/jboss/data", true);
+ Region region = regionManager.getRegion("/org/jboss/data", false);
EvictionPolicy policy = region.getEvictionPolicy();
EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
- assertEquals("/org/jboss/data/", region.getFqn());
+ assertEquals(Fqn.fromString("/org/jboss/data/"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
assertEquals(1000, ((LRUConfiguration) configuration).getTimeToLiveSeconds());
- region = regionManager.getRegion("/org/jboss/test/data", true);
+ region = regionManager.getRegion("/org/jboss/test/data", false);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/org/jboss/test/data/", region.getFqn());
+ assertEquals(Fqn.fromString("/org/jboss/test/data/"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5, ((LRUConfiguration) configuration).getMaxNodes());
@@ -160,7 +161,7 @@
region = regionManager.getRegion("/test", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/test/", region.getFqn());
+ assertEquals(Fqn.fromString("/test/"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
@@ -169,7 +170,7 @@
region = regionManager.getRegion("/maxAgeTest", true);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/maxAgeTest/", region.getFqn());
+ assertEquals(Fqn.fromString("/maxAgeTest/"), region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(10000, ((LRUConfiguration) configuration).getMaxNodes());
@@ -177,10 +178,10 @@
assertEquals(10, ((LRUConfiguration) configuration).getMaxAgeSeconds());
// test the default region. use a region name that isn't defined explicitly in conf file.
- region = regionManager.getRegion("/a/b/c", true);
+ region = regionManager.getRegion("/a/b/c", false);
policy = region.getEvictionPolicy();
configuration = region.getEvictionPolicyConfig();
- assertEquals("/_default_/", region.getFqn());
+ assertEquals(Fqn.ROOT, region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
assertEquals(5000, ((LRUConfiguration) configuration).getMaxNodes());
1.17 +62 -113 JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionManagerTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionManagerTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- RegionManagerTest.java 14 Nov 2006 14:17:10 -0000 1.16
+++ RegionManagerTest.java 15 Nov 2006 15:16:39 -0000 1.17
@@ -1,11 +1,10 @@
package org.jboss.cache.eviction;
-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.jboss.cache.TreeCache;
-import org.jboss.cache.RegionManager;
+import org.jboss.cache.Fqn;
import org.jboss.cache.Region;
+import org.jboss.cache.RegionManager;
+import org.jboss.cache.TreeCache;
import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
@@ -15,15 +14,20 @@
import java.util.List;
/**
- * MarshRegion Manager unit tests.
+ * Region Manager unit tests.
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class RegionManagerTest extends TestCase
{
- private final String DEFAULT_REGION = "/_default_/";
+ private final Fqn DEFAULT_REGION = Fqn.ROOT;
+ Fqn A_B_C = Fqn.fromString("/a/b/c");
+ Fqn A_B = Fqn.fromString("/a/b");
+ Fqn A_BC = Fqn.fromString("/a/bc");
+ Fqn AOP = Fqn.fromString("/aop");
+
EvictionPolicy policy;
EvictionPolicyConfig config;
@@ -47,59 +51,53 @@
public void testCreateRegion()
{
- String fqn1 = "/a/b/c";
- String fqn2 = "/a/b";
- String fqn3 = "/aop";
-
RegionManager regionManager = new RegionManager();
+ regionManager.setUsingEvictions(true);
regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_B, true).setEvictionPolicy(config);
+ regionManager.getRegion(AOP, true).setEvictionPolicy(config);
List<Region> regions = regionManager.getAllRegions();
- assertEquals("MarshRegion size ", 4, regions.size());
+ assertEquals("Region size ", 4, regions.size());
}
public void testCreateRegion2()
{
- String fqn1 = DEFAULT_REGION;
- String fqn2 = "/a/b/c";
- String fqn3 = "/a/b/";
RegionManager regionManager = new RegionManager();
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+ regionManager.setUsingEvictions(true);
+ regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_B, true).setEvictionPolicy(config);
+ regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
List<Region> regions = regionManager.getAllRegions();
- assertEquals("MarshRegion size ", 3, regions.size());
- assertEquals("MarshRegion 0", DEFAULT_REGION, regions.get(0).getFqn());
- assertEquals("MarshRegion 1 ", "/a/b/c/", regions.get(1).getFqn());
- assertEquals("MarshRegion 2 ", "/a/b/", regions.get(2).getFqn());
- Region region = regionManager.getRegion("/a/b/c/d", true);
- assertNotNull("MarshRegion ", region);
- assertEquals("MarshRegion ", "/a/b/c/", region.getFqn());
- region = regionManager.getRegion("/a/b", true);
- assertNotNull("MarshRegion ", region);
- assertEquals("MarshRegion ", "/a/b/", region.getFqn());
- region = regionManager.getRegion("/a", true);
+ assertEquals("Region size ", 3, regions.size());
+ assertEquals("Region 0", DEFAULT_REGION, regions.get(0).getFqn());
+ assertEquals("Region 1 ", A_B, regions.get(1).getFqn());
+ assertEquals("Region 2 ", A_B_C, regions.get(2).getFqn());
+ Region region = regionManager.getRegion("/a/b/c/d", false);
+ assertNotNull("Region ", region);
+ assertEquals("Region ", A_B_C, region.getFqn());
+ region = regionManager.getRegion(A_B, false);
+ assertNotNull("Region ", region);
+ assertEquals("Region ", A_B, region.getFqn());
+ region = regionManager.getRegion("/a", false);
// Should be default.
- assertNotNull("MarshRegion ", region);
+ assertNotNull("Region ", region);
+ assertEquals("Region ", DEFAULT_REGION, region.getFqn());
}
public void testNoDefaultRegion()
{
- String fqn1 = "/a/b/c";
- String fqn2 = "/a/b/";
-
RegionManager regionManager = new RegionManager();
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
+ regionManager.setUsingEvictions(true);
+ regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_B, true).setEvictionPolicy(config);
try
{
- regionManager.getRegion("/a", true);
+ regionManager.getRegion("/a", false);
}
catch (Exception e)
{
@@ -109,50 +107,16 @@
fail("If we don't configure the default region, we should throw a RTE!");
}
- public void testRegionConflict()
- {
- String fqn1 = "/a/b";
- String fqn2 = "/a/b/c";
- String fqn3 = "/aop";
- String fqn4 = DEFAULT_REGION;
-
- RegionManager regionManager = new RegionManager();
- regionManager.getRegion(fqn4, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn4, true).setEvictionPolicy(config);
-
- fail("testRegionConflict failed");
- }
-
- public void testRegionConflict2()
- {
- String fqn1 = "/a/b/";
- String fqn2 = "/a/b/c/";
- String fqn3 = "/a/bc";
-
- RegionManager regionManager = new RegionManager();
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
-
- fail("testRegionConflict failed");
- }
-
public void testGetRegion()
{
- String fqn1 = DEFAULT_REGION;
- String fqn2 = "/a/bc";
- String fqn3 = "/a/b";
-
RegionManager regionManager = new RegionManager();
- regionManager.getRegion(fqn1, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn2, true).setEvictionPolicy(config);
- regionManager.getRegion(fqn3, true).setEvictionPolicy(config);
+ regionManager.setUsingEvictions(true);
+ regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_BC, true).setEvictionPolicy(config);
+ regionManager.getRegion(A_B, true).setEvictionPolicy(config);
- Region region = regionManager.getRegion(fqn2, true);
- assertNotSame("MarshRegion ", fqn1, region.getFqn());
+ Region region = regionManager.getRegion(A_BC, true);
+ assertNotSame("Region ", DEFAULT_REGION, region.getFqn());
}
public void testConfigureWithXML() throws Exception
@@ -164,6 +128,7 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
RegionManager regionManager = new RegionManager();
+ regionManager.setUsingEvictions(true);
EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, null, EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
Region region = regionManager.getRegion(erc.getRegionFqn(), true);
region.setEvictionPolicy(erc.getEvictionPolicyConfig());
@@ -173,7 +138,7 @@
LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
assertEquals(20, config.getMaxNodes());
assertEquals(10, config.getMinNodes());
- assertEquals("/test/", region.getFqn());
+ assertEquals(Fqn.fromString("/test/"), region.getFqn());
TreeCache cache = new TreeCache();
@@ -185,6 +150,7 @@
element = XmlHelper.stringToElement(xml);
erc = XmlConfigurationParser.parseEvictionRegionConfig(element, "org.jboss.cache.eviction.LFUPolicy", EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
regionManager = new RegionManager();
+ regionManager.setUsingEvictions(true);
region = regionManager.getRegion(erc.getRegionFqn(), true);
region.setEvictionPolicy(erc.getEvictionPolicyConfig());
@@ -193,27 +159,26 @@
config = (LFUConfiguration) region.getEvictionPolicyConfig();
assertEquals(20, config.getMaxNodes());
assertEquals(10, config.getMinNodes());
- assertEquals("/abc/", region.getFqn());
+ assertEquals(Fqn.fromString("/abc/"), region.getFqn());
}
public void testRegionOrdering() throws Exception
{
- String fqn1 = DEFAULT_REGION;
- String fqn2 = "/a/b/c/d/e/";
- String fqn3 = "/a/b/c/d/";
- String fqn4 = "/a/b/c/";
+ Fqn A_B_C_D_E = Fqn.fromString("/a/b/c/d/e/");
+ Fqn A_B_C_D = Fqn.fromString("/a/b/c/d/");
RegionManager rm = new RegionManager();
- rm.getRegion(fqn1, true).setEvictionPolicy(config);
- rm.getRegion(fqn2, true).setEvictionPolicy(config);
- rm.getRegion(fqn3, true).setEvictionPolicy(config);
- rm.getRegion(fqn4, true).setEvictionPolicy(config);
+ rm.setUsingEvictions(true);
+ rm.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
+ rm.getRegion(A_B_C_D_E, true).setEvictionPolicy(config);
+ rm.getRegion(A_B_C_D, true).setEvictionPolicy(config);
+ rm.getRegion(A_B_C, true).setEvictionPolicy(config);
- Region region = rm.getRegion("/a/b/c/d/e/f", true);
- Region region2 = rm.getRegion("/e/f/g", true);
+ Region region = rm.getRegion("/a/b/c/d/e/f", false);
+ Region region2 = rm.getRegion("/e/f/g", false);
- assertEquals(fqn2, region.getFqn());
- assertEquals(fqn1, region2.getFqn());
+ assertEquals(A_B_C_D_E, region.getFqn());
+ assertEquals(DEFAULT_REGION, region2.getFqn());
List<Region> regions = rm.getAllRegions();
for (int i = 0; i < regions.size(); i++)
@@ -221,16 +186,16 @@
switch (i)
{
case 0:
- assertEquals(fqn1, regions.get(i).getFqn());
+ assertEquals(DEFAULT_REGION, regions.get(i).getFqn());
break;
case 1:
- assertEquals(fqn2, regions.get(i).getFqn());
+ assertEquals(A_B_C, regions.get(i).getFqn());
break;
case 2:
- assertEquals(fqn3, regions.get(i).getFqn());
+ assertEquals(A_B_C_D, regions.get(i).getFqn());
break;
case 3:
- assertEquals(fqn4, regions.get(i).getFqn());
+ assertEquals(A_B_C_D_E, regions.get(i).getFqn());
break;
default:
fail("This error condition should never be reached");
@@ -238,20 +203,4 @@
}
}
}
-
- void log(String msg)
- {
- System.out.println("-- " + msg);
- }
-
- public static Test suite()
- {
- return new TestSuite(RegionManagerTest.class);
- }
-
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(suite());
- }
-
}
1.4 +5 -2 JBossCache/tests/functional/org/jboss/cache/eviction/DummyEvictionConfiguration.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DummyEvictionConfiguration.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/DummyEvictionConfiguration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DummyEvictionConfiguration.java 27 Oct 2006 19:26:06 -0000 1.3
+++ DummyEvictionConfiguration.java 15 Nov 2006 15:16:39 -0000 1.4
@@ -11,7 +11,7 @@
/**
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class DummyEvictionConfiguration implements EvictionPolicyConfig
{
@@ -25,5 +25,8 @@
// no-op
}
-
+ public void reset()
+ {
+ // no-op
+ }
}
More information about the jboss-cvs-commits
mailing list