[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/eviction ...
Brian Stansberry
brian.stansberry at jboss.com
Fri Oct 27 15:26:07 EDT 2006
User: bstansberry
Date: 06/10/27 15:26:07
Modified: tests/functional/org/jboss/cache/eviction
ElementSizeConfigurationTest.java
FIFOQueueTest.java LRUConfigurationTest.java
LRUPolicyTest.java ProgrammaticLRUPolicyTest.java
MRUAlgorithmTest.java RegionTest.java
ElementSizeAlgorithmTest.java
EvictionConfigurationTest.java
RegionManagerTest.java MRUConfigurationTest.java
LRUAlgorithmTest.java LFUConfigurationTest.java
DummyEvictionConfiguration.java
FIFOAlgorithmTest.java LFUAlgorithmTest.java
FIFOConfigurationTest.java
Log:
[JBCACHE-823] Refactor eviction configuration away from EvictionConfiguration interface
Revision Changes Path
1.3 +6 -4 JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeConfigurationTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ElementSizeConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.2
+++ ElementSizeConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.3
@@ -9,11 +9,12 @@
import junit.framework.TestCase;
import org.jboss.cache.xml.XmlHelper;
import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.w3c.dom.Element;
/**
* @author Daniel Huang
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ElementSizeConfigurationTest extends TestCase
{
@@ -26,7 +27,7 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(100, config.getMaxElementsPerNode());
assertEquals(1000, config.getMaxNodes());
@@ -43,7 +44,7 @@
Element element = XmlHelper.stringToElement(xml);
try
{
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
}
catch (ConfigurationException ce)
{
@@ -63,7 +64,8 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(100, config.getMaxElementsPerNode());
assertEquals(0, config.getMaxNodes());
1.4 +15 -10 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOQueueTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOQueueTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOQueueTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FIFOQueueTest.java 8 Jun 2006 17:37:39 -0000 1.3
+++ FIFOQueueTest.java 27 Oct 2006 19:26:06 -0000 1.4
@@ -6,16 +6,21 @@
*/
package org.jboss.cache.eviction;
+import org.jboss.cache.config.EvictionConfig;
+import org.jboss.cache.config.EvictionRegionConfig;
+
import junit.framework.TestCase;
/**
* Unit tests for FIFOQueue.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class FIFOQueueTest extends TestCase
{
+ private static final int CAPACITY = EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT;
+
private FIFOQueue queue;
public void setUp() throws Exception
@@ -98,33 +103,33 @@
public void testLargeAddAndRemoval() throws Exception
{
long begin = System.currentTimeMillis();
- for (int i = 0; i < RegionManager.CAPACITY; i++)
+ for (int i = 0; i < CAPACITY; i++)
{
queue.addNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to add " + RegionManager.CAPACITY + " entries to queue");
+ System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to add " + CAPACITY + " entries to queue");
- assertEquals(RegionManager.CAPACITY, queue.getNumberOfNodes());
+ assertEquals(CAPACITY, queue.getNumberOfNodes());
begin = System.currentTimeMillis();
- for (int i = RegionManager.CAPACITY - 1; i >= 0; i--)
+ for (int i = CAPACITY - 1; i >= 0; i--)
{
// pop it backwards for worse case scenario if O(n) = n
queue.removeNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to remove " + RegionManager.CAPACITY + " entries to queue");
+ System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to remove " + CAPACITY + " entries to queue");
assertEquals(0, queue.getNumberOfNodes());
begin = System.currentTimeMillis();
- for (int i = 0; i < RegionManager.CAPACITY; i++)
+ for (int i = 0; i < CAPACITY; i++)
{
queue.addNodeEntry(new NodeEntry("/test/" + Integer.toString(i)));
}
- System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to readd " + RegionManager.CAPACITY + " entries to queue");
+ System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to readd " + CAPACITY + " entries to queue");
- assertEquals(RegionManager.CAPACITY, queue.getNumberOfNodes());
+ assertEquals(CAPACITY, queue.getNumberOfNodes());
NodeEntry ne;
begin = System.currentTimeMillis();
@@ -134,7 +139,7 @@
}
System.out.println("Took " + (System.currentTimeMillis() - begin) + "ms to iterate via getFirstNodeEntry() and remove (pop from top of queue) " +
- RegionManager.CAPACITY + " entries from queue");
+ CAPACITY + " entries from queue");
assertEquals(0, queue.getNumberOfNodes());
}
1.4 +8 -5 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LRUConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.3
+++ LRUConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.4
@@ -8,6 +8,7 @@
import junit.framework.TestCase;
import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +16,7 @@
* Unit tests for LRUConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class LRUConfigurationTest extends TestCase
{
@@ -30,7 +31,8 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(5000, config.getMaxNodes());
assertEquals(1000, config.getTimeToLiveSeconds());
@@ -45,7 +47,8 @@
"<attribute name=\"maxAgeSeconds\">10</attribute>\n" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(10000, config.getMaxNodes());
assertEquals(8, config.getTimeToLiveSeconds());
@@ -63,7 +66,7 @@
boolean caught = false;
try
{
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
}
catch (ConfigurationException ce)
{
@@ -78,7 +81,7 @@
element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(0, config.getMaxNodes());
}
1.15 +3 -3 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- LRUPolicyTest.java 15 Sep 2006 15:11:35 -0000 1.14
+++ LRUPolicyTest.java 27 Oct 2006 19:26:06 -0000 1.15
@@ -14,7 +14,7 @@
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang - dhuang at jboss.org
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class LRUPolicyTest extends TestCase
{
@@ -362,8 +362,8 @@
region.setTimeToLiveSeconds(5);
region.setMaxNodes(5000);
- assertEquals(5000, ((LRUConfiguration) region.getEvictionConfiguration()).getMaxNodes());
- assertEquals(5, ((LRUConfiguration) region.getEvictionConfiguration()).getTimeToLiveSeconds());
+ assertEquals(5000, ((LRUConfiguration) region.getEvictionPolicyConfig()).getMaxNodes());
+ assertEquals(5, ((LRUConfiguration) region.getEvictionPolicyConfig()).getTimeToLiveSeconds());
String rootStr = "/123/node";
for (int i = 0; i < 10; i++)
1.4 +10 -5 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ProgrammaticLRUPolicyTest.java 25 Oct 2006 04:50:21 -0000 1.3
+++ ProgrammaticLRUPolicyTest.java 27 Oct 2006 19:26:06 -0000 1.4
@@ -30,6 +30,7 @@
import org.jboss.cache.xml.XmlHelper;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.lock.IsolationLevel;
+import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.w3c.dom.Element;
@@ -38,7 +39,7 @@
* Unit tests for programmatic configuration of LRU policy
*
* @author Ben Wang, Oct, 2006
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ProgrammaticLRUPolicyTest extends TestCase
{
@@ -87,9 +88,10 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
RegionManager regionManager = cache_.getEvictionRegionManager();
- EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, regionManager.getEvictionConfig().getDefaultEvictionPolicyClass());
+ EvictionConfig topConfig = regionManager.getEvictionConfig();
+ EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, topConfig.getDefaultEvictionPolicyClass(), topConfig.getDefaultEventQueueSize());
// Fqn is the region name
- regionManager.createRegion("/programmatic", erc);
+ regionManager.createRegion("/programmatic", erc.getEvictionPolicyConfig());
}
public void testStringBasedFqnEviction() throws Exception
@@ -147,11 +149,14 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
RegionManager regionManager = cache_.getEvictionRegionManager();
- EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, regionManager.getEvictionConfig().getDefaultEvictionPolicyClass());
+ EvictionConfig topEC = regionManager.getEvictionConfig();
+ EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element,
+ topEC.getDefaultEvictionPolicyClass(),
+ topEC.getDefaultEventQueueSize());
// Fqn is the region name
Integer ii = new Integer(1);
Fqn fqn = new Fqn(ii);
- regionManager.createRegion(fqn, erc);
+ regionManager.createRegion(fqn, erc.getEvictionPolicyConfig());
}
public void testObjectBasedFqnEviction1() throws Exception
1.3 +7 -4 JBossCache/tests/functional/org/jboss/cache/eviction/MRUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/MRUAlgorithmTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- MRUAlgorithmTest.java 15 Apr 2006 00:21:13 -0000 1.2
+++ MRUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.3
@@ -13,7 +13,7 @@
* Unit tests for MRUAlgorithm.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class MRUAlgorithmTest extends TestCase
{
@@ -25,8 +25,11 @@
super.setUp();
algorithm = new MRUAlgorithm();
MRUConfiguration config = new MRUConfiguration();
+ // We have to configure maxNodes!!
+ config.setMaxNodes(0);
+ config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager = new RegionManager();
- regionManager.createRegion("/a/b", new DummyEvictionPolicy(), config);
+ regionManager.createRegion("/a/b", config);
}
public void tearDown() throws Exception
@@ -40,7 +43,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager.getRegion("/a/b");
- MRUConfiguration config = (MRUConfiguration) region.getEvictionConfiguration();
+ MRUConfiguration config = (MRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
region.setAddedNode(fqn1);
region.setAddedNode(fqn2);
@@ -75,7 +78,7 @@
Fqn fqn9 = Fqn.fromString("/a/b/k");
Fqn fqn10 = Fqn.fromString("/a/b/l");
Region region = regionManager.getRegion("/a/b");
- MRUConfiguration config = (MRUConfiguration) region.getEvictionConfiguration();
+ MRUConfiguration config = (MRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(8);
region.setAddedNode(fqn1);
region.setAddedNode(fqn2);
1.8 +3 -2 JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RegionTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/RegionTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- RegionTest.java 23 Oct 2006 17:39:00 -0000 1.7
+++ RegionTest.java 27 Oct 2006 19:26:06 -0000 1.8
@@ -4,6 +4,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.Fqn;
+import org.jboss.cache.config.EvictionConfig;
/**
@@ -25,7 +26,7 @@
super.setUp();
algorithm = new LRUAlgorithm();
regionManager_ = new RegionManager();
- regionManager_.createRegion("/a/b", new DummyEvictionPolicy(), new DummyEvictionConfiguration());
+ regionManager_.createRegion("/a/b", new DummyEvictionConfiguration());
}
public void tearDown() throws Exception
@@ -81,7 +82,7 @@
Region region = regionManager_.getRegion("/a/b");
// This should succeed, alhtough it will produce warning over the threshold.
- for (int i = 0; i < EvictionConfiguration.EVENT_QUEUE_SIZE_DEFAULT - 1; i++)
+ for (int i = 0; i < EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT - 1; i++)
{
region.setAddedNode(fqn2);
}
1.3 +7 -5 JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ElementSizeAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ElementSizeAlgorithmTest.java 12 Oct 2006 03:37:17 -0000 1.2
+++ ElementSizeAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.3
@@ -13,7 +13,7 @@
/**
* @author Daniel Huang
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ElementSizeAlgorithmTest extends TestCase
{
@@ -29,11 +29,13 @@
{
super.setUp();
- DummyEvictionPolicy policy = new DummyEvictionPolicy();
algo = new ElementSizeAlgorithm();
regionManager = new RegionManager();
ElementSizeConfiguration config = new ElementSizeConfiguration();
- regionManager.createRegion("/a/b", policy, config);
+ // We have to configure maxElementsPerNode!!
+ config.setMaxElementsPerNode(0);
+ config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
+ regionManager.createRegion("/a/b", config);
}
public void tearDown() throws Exception
@@ -44,7 +46,7 @@
public void testMaxElements() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionConfiguration();
+ ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(10);
config.setMaxElementsPerNode(6);
@@ -99,7 +101,7 @@
public void testMaxNodesAndMaxElements() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionConfiguration();
+ ElementSizeConfiguration config = (ElementSizeConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(10);
config.setMaxElementsPerNode(100);
1.9 +15 -15 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- EvictionConfigurationTest.java 6 Sep 2006 15:30:57 -0000 1.8
+++ EvictionConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.9
@@ -16,7 +16,7 @@
* Unit test to test Eviction configuration types.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class EvictionConfigurationTest extends TestCase
{
@@ -40,7 +40,7 @@
Region region = regionManager.getRegion("/org/jboss/data");
EvictionPolicy policy = region.getEvictionPolicy();
- EvictionConfiguration configuration = region.getEvictionConfiguration();
+ EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
assertTrue(policy instanceof LFUPolicy);
assertTrue(configuration instanceof LFUConfiguration);
@@ -49,7 +49,7 @@
region = regionManager.getRegion("/org/jboss/test/data");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/test/data/", region.getFqn());
assertTrue(policy instanceof FIFOPolicy);
assertTrue(configuration instanceof FIFOConfiguration);
@@ -57,7 +57,7 @@
region = regionManager.getRegion("/test");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
assertTrue(policy instanceof MRUPolicy);
assertTrue(configuration instanceof MRUConfiguration);
@@ -65,7 +65,7 @@
region = regionManager.getRegion("/maxAgeTest");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -76,7 +76,7 @@
// test the default region. use a region name that isn't defined explicitly in conf file.
region = regionManager.getRegion("/a/b/c");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -94,7 +94,7 @@
Region region = regionManager.getRegion("/org/jboss/data");
EvictionPolicy policy = region.getEvictionPolicy();
- EvictionConfiguration configuration = region.getEvictionConfiguration();
+ EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
assertTrue(policy instanceof FIFOPolicy);
assertTrue(configuration instanceof FIFOConfiguration);
@@ -102,7 +102,7 @@
region = regionManager.getRegion("/test");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
assertTrue(policy instanceof MRUPolicy);
assertTrue(configuration instanceof MRUConfiguration);
@@ -111,7 +111,7 @@
// test the default region. use a region name that isn't defined explicitly in conf file.
region = regionManager.getRegion("/a/b/c");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -121,7 +121,7 @@
region = regionManager.getRegion("/maxAgeTest");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -139,7 +139,7 @@
Region region = regionManager.getRegion("/org/jboss/data");
EvictionPolicy policy = region.getEvictionPolicy();
- EvictionConfiguration configuration = region.getEvictionConfiguration();
+ EvictionPolicyConfig configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/data/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -148,7 +148,7 @@
region = regionManager.getRegion("/org/jboss/test/data");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/org/jboss/test/data/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -157,7 +157,7 @@
region = regionManager.getRegion("/test");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/test/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -166,7 +166,7 @@
region = regionManager.getRegion("/maxAgeTest");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/maxAgeTest/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
@@ -177,7 +177,7 @@
// test the default region. use a region name that isn't defined explicitly in conf file.
region = regionManager.getRegion("/a/b/c");
policy = region.getEvictionPolicy();
- configuration = region.getEvictionConfiguration();
+ configuration = region.getEvictionPolicyConfig();
assertEquals("/_default_/", region.getFqn());
assertTrue(policy instanceof LRUPolicy);
assertTrue(configuration instanceof LRUConfiguration);
1.15 +33 -32 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- RegionManagerTest.java 25 Oct 2006 04:50:21 -0000 1.14
+++ RegionManagerTest.java 27 Oct 2006 19:26:06 -0000 1.15
@@ -4,6 +4,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.EvictionConfig;
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
@@ -14,14 +15,14 @@
*
* @author Ben Wang, Feb 11, 2004
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class RegionManagerTest extends TestCase
{
private final String DEFAULT_REGION = "/_default_/";
EvictionPolicy policy;
- EvictionConfiguration config;
+ EvictionPolicyConfig config;
public RegionManagerTest(String s)
{
@@ -49,10 +50,10 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(DEFAULT_REGION, policy, config);
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
- regionManager.createRegion(fqn3, policy, config);
+ regionManager.createRegion(DEFAULT_REGION, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
+ regionManager.createRegion(fqn3, config);
}
catch (RegionNameConflictException e)
{
@@ -73,9 +74,9 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
- regionManager.createRegion(fqn3, policy, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
+ regionManager.createRegion(fqn3, config);
}
catch (RegionNameConflictException e)
{
@@ -106,8 +107,8 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
}
catch (RegionNameConflictException e)
{
@@ -137,11 +138,11 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(fqn4, policy, config);
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
- regionManager.createRegion(fqn3, policy, config);
- regionManager.createRegion(fqn4, policy, config);
+ regionManager.createRegion(fqn4, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
+ regionManager.createRegion(fqn3, config);
+ regionManager.createRegion(fqn4, config);
}
catch (RegionNameConflictException e)
{
@@ -161,9 +162,9 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
- regionManager.createRegion(fqn3, policy, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
+ regionManager.createRegion(fqn3, config);
}
catch (RegionNameConflictException e)
{
@@ -183,9 +184,9 @@
RegionManager regionManager = new RegionManager();
try
{
- regionManager.createRegion(fqn1, policy, config);
- regionManager.createRegion(fqn2, policy, config);
- regionManager.createRegion(fqn3, policy, config);
+ regionManager.createRegion(fqn1, config);
+ regionManager.createRegion(fqn2, config);
+ regionManager.createRegion(fqn3, config);
}
catch (RegionNameConflictException e)
{
@@ -205,12 +206,12 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
RegionManager regionManager = new RegionManager();
- EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, regionManager.getEvictionConfig().getDefaultEvictionPolicyClass());
+ EvictionRegionConfig erc = XmlConfigurationParser.parseEvictionRegionConfig(element, null, EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
Region region = regionManager.createRegion(erc);
assertTrue(region.getEvictionPolicy() instanceof LFUPolicy);
- assertTrue(region.getEvictionConfiguration() instanceof LFUConfiguration);
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ assertTrue(region.getEvictionPolicyConfig() instanceof LFUConfiguration);
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
assertEquals(20, config.getMaxNodes());
assertEquals(10, config.getMinNodes());
assertEquals("/test/", region.getFqn());
@@ -223,14 +224,14 @@
"<attribute name=\"maxNodes\">20</attribute>" +
"</region>";
element = XmlHelper.stringToElement(xml);
- erc = XmlConfigurationParser.parseEvictionRegionConfig(element, "org.jboss.cache.eviction.LFUPolicy");
+ erc = XmlConfigurationParser.parseEvictionRegionConfig(element, "org.jboss.cache.eviction.LFUPolicy", EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT);
regionManager = new RegionManager();
regionManager.setTreeCache(cache);
region = regionManager.createRegion(erc);
assertTrue(region.getEvictionPolicy() instanceof LFUPolicy);
- assertTrue(region.getEvictionConfiguration() instanceof LFUConfiguration);
- config = (LFUConfiguration) region.getEvictionConfiguration();
+ assertTrue(region.getEvictionPolicyConfig() instanceof LFUConfiguration);
+ config = (LFUConfiguration) region.getEvictionPolicyConfig();
assertEquals(20, config.getMaxNodes());
assertEquals(10, config.getMinNodes());
assertEquals("/abc/", region.getFqn());
@@ -244,10 +245,10 @@
String fqn4 = "/a/b/c/";
RegionManager rm = new RegionManager();
- rm.createRegion(fqn1, policy, config);
- rm.createRegion(fqn2, policy, config);
- rm.createRegion(fqn3, policy, config);
- rm.createRegion(fqn4, policy, config);
+ rm.createRegion(fqn1, config);
+ rm.createRegion(fqn2, config);
+ rm.createRegion(fqn3, config);
+ rm.createRegion(fqn4, config);
Region region = rm.getRegion("/a/b/c/d/e/f");
Region region2 = rm.getRegion("/e/f/g");
1.4 +9 -5 JBossCache/tests/functional/org/jboss/cache/eviction/MRUConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MRUConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/MRUConfigurationTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MRUConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.3
+++ MRUConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.4
@@ -8,6 +8,7 @@
import junit.framework.TestCase;
import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +16,7 @@
* Unit tests for MRUConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class MRUConfigurationTest extends TestCase
{
@@ -39,7 +40,8 @@
"<attribute name=\"maxNodes\">5000</attribute>\n" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(5000, config.getMaxNodes());
}
@@ -50,7 +52,8 @@
"<attribute name=\"maxNodes\">10000</attribute>\n" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(10000, config.getMaxNodes());
}
@@ -63,7 +66,7 @@
boolean caught = false;
try
{
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
}
catch (ConfigurationException ce)
{
@@ -77,7 +80,8 @@
element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
+
assertEquals(10000, config.getMaxNodes());
}
1.6 +16 -12 JBossCache/tests/functional/org/jboss/cache/eviction/LRUAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LRUAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LRUAlgorithmTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- LRUAlgorithmTest.java 5 May 2006 12:06:57 -0000 1.5
+++ LRUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.6
@@ -29,8 +29,12 @@
algo_ = new LRUAlgorithm();
config_ = new LRUConfiguration();
+ config_.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
+ // We have to configure timeToLiveSeconds!!
+ config_.setTimeToLiveSeconds(0);
+
regionManager_ = new RegionManager();
- regionManager_.createRegion("/a/b", new DummyEvictionPolicy(), config_);
+ regionManager_.createRegion("/a/b", config_);
/*
try {
Thread.sleep(10000);
@@ -54,7 +58,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
region.setAddedNode(fqn1);
region.setAddedNode(fqn2);
@@ -94,7 +98,7 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
region.setAddedNode(fqn1);
region.setAddedNode(fqn2);
@@ -121,7 +125,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
region.setAddedNode(fqn1);
region.setAddedNode(fqn2);
@@ -160,7 +164,7 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
region.setAddedNode(fqn1);
@@ -188,7 +192,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(1);
region.setAddedNode(fqn1);
@@ -226,7 +230,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(1);
region.setAddedNode(fqn1);
@@ -267,7 +271,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
config.setMaxAgeSeconds(1);
@@ -292,7 +296,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setTimeToLiveSeconds(0);
@@ -320,7 +324,7 @@
Fqn fqn3 = Fqn.fromString("/a/b/e");
Fqn fqn4 = Fqn.fromString("/a/b/f");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(2);
config.setTimeToLiveSeconds(1);
@@ -376,7 +380,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(2);
config.setTimeToLiveSeconds(1);
@@ -425,7 +429,7 @@
public void testEvictionSortOrder() throws Exception
{
Region region = regionManager_.getRegion("/a/b");
- LRUConfiguration config = (LRUConfiguration) region.getEvictionConfiguration();
+ LRUConfiguration config = (LRUConfiguration) region.getEvictionPolicyConfig();
config.setMaxAgeSeconds(1000);
config.setMaxNodes(0);
1.5 +9 -4 JBossCache/tests/functional/org/jboss/cache/eviction/LFUConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LFUConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/LFUConfigurationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LFUConfigurationTest.java 7 May 2006 03:34:39 -0000 1.4
+++ LFUConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.5
@@ -7,6 +7,8 @@
package org.jboss.cache.eviction;
import junit.framework.TestCase;
+
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -14,7 +16,7 @@
* LFU Configuration test.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class LFUConfigurationTest extends TestCase
{
@@ -29,7 +31,8 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(10, config.getMinNodes());
assertEquals(20, config.getMaxNodes());
@@ -43,7 +46,8 @@
"<attribute name=\"minNodes\">10</attribute>" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(10, config.getMinNodes());
assertEquals(0, config.getMaxNodes());
@@ -57,7 +61,8 @@
"<attribute name=\"maxNodes\">20</attribute>" +
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(0, config.getMinNodes());
assertEquals(20, config.getMaxNodes());
1.3 +12 -5 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.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DummyEvictionConfiguration.java 18 Jul 2006 10:50:46 -0000 1.2
+++ DummyEvictionConfiguration.java 27 Oct 2006 19:26:06 -0000 1.3
@@ -7,16 +7,23 @@
package org.jboss.cache.eviction;
import org.jboss.cache.config.ConfigurationException;
-import org.w3c.dom.Element;
+
/**
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
-public class DummyEvictionConfiguration implements EvictionConfiguration
+public class DummyEvictionConfiguration implements EvictionPolicyConfig
{
- public void parseXMLConfig(Element element) throws ConfigurationException
+ public String getEvictionPolicyClass()
+ {
+ return DummyEvictionPolicy.class.getName();
+ }
+
+ public void validate() throws ConfigurationException
{
- //To change body of implemented methods use File | Settings | File Templates.
+ // no-op
}
+
+
}
1.5 +7 -5 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOAlgorithmTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOAlgorithmTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOAlgorithmTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FIFOAlgorithmTest.java 8 Jun 2006 17:37:39 -0000 1.4
+++ FIFOAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.5
@@ -15,7 +15,7 @@
* Unit tests for FIFOAlgorithm.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class FIFOAlgorithmTest extends TestCase
{
@@ -32,11 +32,13 @@
{
super.setUp();
- DummyEvictionPolicy policy = new DummyEvictionPolicy();
algo = new FIFOAlgorithm();
FIFOConfiguration config = new FIFOConfiguration();
+ // We have to configure maxNodes!!
+ config.setMaxNodes(0);
regionManager = new RegionManager();
- regionManager.createRegion("/a/b", policy, config);
+ config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
+ regionManager.createRegion("/a/b", config);
}
public void tearDown() throws Exception
@@ -47,7 +49,7 @@
public void testMaxNodes1() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- FIFOConfiguration config = (FIFOConfiguration) region.getEvictionConfiguration();
+ FIFOConfiguration config = (FIFOConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(5);
for (int i = 0; i < 8; i++)
@@ -101,7 +103,7 @@
public void testMaxNodes2() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- FIFOConfiguration config = (FIFOConfiguration) region.getEvictionConfiguration();
+ FIFOConfiguration config = (FIFOConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(50000);
for (int i = 0; i < 50000; i++)
1.4 +10 -9 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.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LFUAlgorithmTest.java 7 May 2006 03:34:39 -0000 1.3
+++ LFUAlgorithmTest.java 27 Oct 2006 19:26:06 -0000 1.4
@@ -17,7 +17,7 @@
* Unit test for LFUAlgorithm.
*
* @author Daniel Huang - dhuang at jboss.org - 10/2005
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class LFUAlgorithmTest extends TestCase
{
@@ -37,7 +37,8 @@
algo = new LFUAlgorithm();
LFUConfiguration config = new LFUConfiguration();
regionManager = new RegionManager();
- regionManager.createRegion("/a/b", new DummyEvictionPolicy(), config);
+ config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
+ regionManager.createRegion("/a/b", config);
}
public void tearDown() throws Exception
@@ -50,7 +51,7 @@
Fqn fqn1 = Fqn.fromString("/a/b/c");
Fqn fqn2 = Fqn.fromString("/a/b/d");
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(20);
region.setAddedNode(fqn1);
@@ -75,7 +76,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(1);
config.setMinNodes(20);
@@ -111,7 +112,7 @@
public void testMaxNode3() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(15000);
config.setMinNodes(15000);
@@ -139,7 +140,7 @@
Fqn fqn4 = Fqn.fromString("/a/b/c/d/e/f");
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(2);
@@ -160,7 +161,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(0);
@@ -188,7 +189,7 @@
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(100);
@@ -402,7 +403,7 @@
public void testEvictionQueueSortOrder2() throws Exception
{
Region region = regionManager.getRegion("/a/b");
- LFUConfiguration config = (LFUConfiguration) region.getEvictionConfiguration();
+ LFUConfiguration config = (LFUConfiguration) region.getEvictionPolicyConfig();
config.setMaxNodes(0);
config.setMinNodes(10000);
1.6 +6 -6 JBossCache/tests/functional/org/jboss/cache/eviction/FIFOConfigurationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FIFOConfigurationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/FIFOConfigurationTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- FIFOConfigurationTest.java 18 Jul 2006 10:50:46 -0000 1.5
+++ FIFOConfigurationTest.java 27 Oct 2006 19:26:06 -0000 1.6
@@ -8,6 +8,7 @@
import junit.framework.TestCase;
import org.jboss.cache.config.ConfigurationException;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.w3c.dom.Element;
@@ -15,7 +16,7 @@
* Unit test for FIFOConfiguration.
*
* @author Daniel Huang (dhuang at jboss.org)
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class FIFOConfigurationTest extends TestCase
{
@@ -28,7 +29,8 @@
"</region>";
Element element = XmlHelper.stringToElement(xml);
- config.parseXMLConfig(element);
+
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
assertEquals(1000, config.getMaxNodes());
@@ -44,7 +46,7 @@
try
{
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
}
catch (ConfigurationException ce)
{
@@ -65,14 +67,12 @@
try
{
- config.parseXMLConfig(element);
+ XmlConfigurationParser.parseEvictionPolicyConfig(element, config);
}
catch (ConfigurationException ce)
{
assertTrue("Configure Exception properly thrown", true);
return;
}
-
- fail("Invalid region FIFO configuration did not cause ConfigureException to be thrown");
}
}
More information about the jboss-cvs-commits
mailing list