[jbosscache-commits] JBoss Cache SVN: r6242 - core/trunk/src/test/java/org/jboss/cache/eviction.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Jul 10 08:21:11 EDT 2008
Author: manik.surtani at jboss.com
Date: 2008-07-10 08:21:10 -0400 (Thu, 10 Jul 2008)
New Revision: 6242
Modified:
core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java
core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java
Log:
Fixed broken tests
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/BaseEvictionAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -28,6 +28,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import org.jboss.cache.config.ConfigurationException;
import org.jboss.cache.config.EvictionPolicyConfig;
import static org.testng.AssertJUnit.fail;
@@ -57,7 +58,9 @@
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
- regionManager = new RegionManagerImpl();
+ RegionManagerImpl rmi = new RegionManagerImpl();
+ rmi.injectDependencies(null, null, null, null, null, new RegionRegistry());
+ regionManager = rmi;
}
public void testFillUpRecycleQueue() throws Exception
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -10,6 +10,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import static org.testng.AssertJUnit.assertEquals;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -31,6 +32,7 @@
{
algo = new ElementSizeAlgorithm();
regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
ElementSizeConfiguration config = new ElementSizeConfiguration();
// We have to setCache maxElementsPerNode!!
config.setMaxElementsPerNode(0);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -10,6 +10,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
import org.testng.annotations.BeforeMethod;
@@ -38,6 +39,7 @@
// We have to setCache maxNodes!!
config.setMaxNodes(0);
regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -10,6 +10,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -34,6 +35,7 @@
algo = new LFUAlgorithm();
LFUConfiguration config = new LFUConfiguration();
regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
// doesn't this need a cache?!?? :-/
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LRUAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -6,6 +6,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import org.jboss.cache.util.TestingUtil;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertTrue;
@@ -33,9 +34,10 @@
config = new LRUConfiguration();
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
// We have to setCache timeToLiveSeconds!!
- config.setTimeToLiveSeconds(0);
+ config.setTimeToLive(0);
regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/MRUAlgorithmTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -10,6 +10,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -35,6 +36,7 @@
config.setMaxNodes(0);
config.setEvictionPolicyClass(DummyEvictionPolicy.class.getName());
regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.getRegion("/a/b", true).setEvictionPolicy(config);
}
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionManagerTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -4,6 +4,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import org.jboss.cache.config.EvictionPolicyConfig;
import static org.testng.AssertJUnit.*;
import org.testng.annotations.BeforeMethod;
@@ -41,6 +42,7 @@
public void testCreateRegion()
{
RegionManager regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.setUsingEvictions(true);
regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
@@ -55,6 +57,7 @@
{
RegionManager regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.setUsingEvictions(true);
regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
regionManager.getRegion(A_B, true).setEvictionPolicy(config);
@@ -80,6 +83,7 @@
public void testNoDefaultRegion()
{
RegionManager regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.setUsingEvictions(true);
regionManager.getRegion(A_B_C, true).setEvictionPolicy(config);
regionManager.getRegion(A_B, true).setEvictionPolicy(config);
@@ -90,6 +94,7 @@
public void testGetRegion()
{
RegionManager regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
regionManager.setUsingEvictions(true);
regionManager.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
regionManager.getRegion(A_BC, true).setEvictionPolicy(config);
@@ -105,6 +110,7 @@
Fqn A_B_C_D = Fqn.fromString("/a/b/c/d/");
RegionManager rm = new RegionManagerImpl();
+ ((RegionManagerImpl) rm).injectDependencies(null, null, null, null, null, new RegionRegistry());
rm.setUsingEvictions(true);
rm.getRegion(DEFAULT_REGION, true).setEvictionPolicy(config);
rm.getRegion(A_B_C_D_E, true).setEvictionPolicy(config);
Modified: core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-07-10 12:20:51 UTC (rev 6241)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/RegionTest.java 2008-07-10 12:21:10 UTC (rev 6242)
@@ -4,6 +4,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.RegionManager;
import org.jboss.cache.RegionManagerImpl;
+import org.jboss.cache.RegionRegistry;
import org.jboss.cache.config.EvictionConfig;
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;
@@ -17,15 +18,16 @@
@Test(groups = {"functional"})
public class RegionTest
{
- RegionManager regionManager_;
+ RegionManager regionManager;
EvictionAlgorithm algorithm;
@BeforeMethod(alwaysRun = true)
public void setUp() throws Exception
{
algorithm = new LRUAlgorithm();
- regionManager_ = new RegionManagerImpl();
- regionManager_.getRegion("/a/b", true).setEvictionPolicy(new DummyEvictionConfiguration());
+ regionManager = new RegionManagerImpl();
+ ((RegionManagerImpl) regionManager).injectDependencies(null, null, null, null, null, new RegionRegistry());
+ regionManager.getRegion("/a/b", true).setEvictionPolicy(new DummyEvictionConfiguration());
}
public void testAddedQueue()
@@ -34,7 +36,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b", true);
+ Region region = regionManager.getRegion("/a/b", true);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.ADD_NODE_EVENT));
@@ -56,7 +58,7 @@
Fqn fqn2 = Fqn.fromString("/a/b/d");
Fqn fqn3 = Fqn.fromString("/a/b/e");
- Region region = regionManager_.getRegion("/a/b", true);
+ Region region = regionManager.getRegion("/a/b", true);
region.putNodeEvent(new EvictedEventNode(fqn1, NodeEventType.REMOVE_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn2, NodeEventType.ADD_NODE_EVENT));
region.putNodeEvent(new EvictedEventNode(fqn3, NodeEventType.VISIT_NODE_EVENT));
@@ -74,7 +76,7 @@
{
Fqn fqn2 = Fqn.fromString("/a/b/d");
- Region region = regionManager_.getRegion("/a/b", true);
+ Region region = regionManager.getRegion("/a/b", true);
// This should succeed, alhtough it will produce warning over the threshold.
for (int i = 0; i < EvictionConfig.EVENT_QUEUE_SIZE_DEFAULT - 1; i++)
{
More information about the jbosscache-commits
mailing list