[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/passivation ...
Manik Surtani
manik at jboss.org
Tue May 29 09:51:27 EDT 2007
User: msurtani
Date: 07/05/29 09:51:27
Modified: tests/functional/org/jboss/cache/passivation
LocalPassivationIntegrationTest.java
ReplicatedPassivationIntegrationTest.java
BasicPassivationTest.java
PassivationActivationCallbacksTestCase.java
ConcurrentPassivationTest.java
Log:
optimised tests to use DummyInMemoryCacheLoader as a stub
Revision Changes Path
1.16 +2 -15 JBossCache/tests/functional/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocalPassivationIntegrationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/LocalPassivationIntegrationTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- LocalPassivationIntegrationTest.java 7 Feb 2007 22:06:42 -0000 1.15
+++ LocalPassivationIntegrationTest.java 29 May 2007 13:51:27 -0000 1.16
@@ -14,9 +14,8 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
import java.util.Map;
@@ -40,7 +39,6 @@
public void setUp() throws Exception
{
super.setUp();
- TestingUtil.recursiveFileRemove("/tmp/JBossCacheFileCacheLoader");// clean up any stale files left around by previous unit tests
cache_ = (CacheImpl) DefaultCacheFactory.getInstance().createCache(false);
initCaches(cache_);
cache_.getConfiguration().setUseRegionBasedMarshalling(true);
@@ -62,20 +60,9 @@
{
cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-passivation-service.xml"));// read in generic local xml
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
- // hack in the path to the file store in the cache loaders
- injectCacheLoaderLocation(cache.getConfiguration(), "/tmp/JBossCacheFileCacheLoader");
-
+ cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
}
- private void injectCacheLoaderLocation(Configuration configuration, String location)
- {
- for (CacheLoaderConfig.IndividualCacheLoaderConfig iclc : configuration.getCacheLoaderConfig().getIndividualCacheLoaderConfigs())
- {
- iclc.getProperties().put("location", location);
- }
- }
-
-
public void tearDown() throws Exception
{
super.tearDown();
1.7 +2 -0 JBossCache/tests/functional/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReplicatedPassivationIntegrationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/ReplicatedPassivationIntegrationTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ReplicatedPassivationIntegrationTest.java 7 Feb 2007 22:06:43 -0000 1.6
+++ ReplicatedPassivationIntegrationTest.java 29 May 2007 13:51:27 -0000 1.7
@@ -30,6 +30,7 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
import java.util.Map;
@@ -79,6 +80,7 @@
{
cache.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/replSync-passivation-service.xml"));// read in generic local xml
cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
+ cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
}
public void tearDown() throws Exception
1.16 +3 -2 JBossCache/tests/functional/org/jboss/cache/passivation/BasicPassivationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicPassivationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/BasicPassivationTest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- BasicPassivationTest.java 7 Feb 2007 22:06:42 -0000 1.15
+++ BasicPassivationTest.java 29 May 2007 13:51:27 -0000 1.16
@@ -16,11 +16,12 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
/**
* @author Ben Wang
- * @version $Revision: 1.15 $
+ * @version $Revision: 1.16 $
*/
public class BasicPassivationTest extends TestCase
{
@@ -42,7 +43,6 @@
public void setUp() throws Exception
{
super.setUp();
- TestingUtil.recursiveFileRemove("/tmp/JBossCacheFileCacheLoader");// clean up any stale files left around by previous unit tests
initCaches();
wakeupIntervalMillis_ = cache_.getConfiguration().getEvictionConfig().getWakeupIntervalSeconds() * 1000;
log("wakeupInterval is " + wakeupIntervalMillis_);
@@ -61,6 +61,7 @@
cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-passivation-service.xml"));// read in generic local xml
cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
CacheListener listener = new TestCacheListener();
+ cache_.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
cache_.start();
cache_.getNotifier().addCacheListener(listener);
}
1.5 +7 -18 JBossCache/tests/functional/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PassivationActivationCallbacksTestCase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/PassivationActivationCallbacksTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PassivationActivationCallbacksTestCase.java 23 May 2007 10:28:48 -0000 1.4
+++ PassivationActivationCallbacksTestCase.java 29 May 2007 13:51:27 -0000 1.5
@@ -21,7 +21,7 @@
import org.jboss.cache.config.EvictionRegionConfig;
import org.jboss.cache.eviction.LRUConfiguration;
import org.jboss.cache.loader.CacheLoader;
-import org.jboss.cache.loader.FileCacheLoaderConfig;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.lock.IsolationLevel;
import org.jboss.cache.misc.TestingUtil;
@@ -65,28 +65,17 @@
protected void configureCacheLoader() throws Exception
{
- String tmp_location = "/tmp/fcl";
- String OS = System.getProperty("os.name").toLowerCase();
- if (OS.indexOf("win") > -1 || OS.indexOf("nt") > -1)
- {
- tmp_location = "c:\\tmp\\fcl";
- }
-
- tmp_location = System.getProperty("java.io.tmpdir", tmp_location);
-
-
CacheLoaderConfig clc = new CacheLoaderConfig();
clc.setPassivation(true);
clc.setShared(false);
clc.setPreload("/");
- FileCacheLoaderConfig fclc = new FileCacheLoaderConfig();
- fclc.setAsync(false);
- fclc.setFetchPersistentState(true);
- fclc.setIgnoreModifications(false);
- fclc.setLocation(tmp_location);
-
- clc.addIndividualCacheLoaderConfig(fclc);
+ CacheLoaderConfig.IndividualCacheLoaderConfig dummyConfig = new CacheLoaderConfig.IndividualCacheLoaderConfig();
+ dummyConfig.setAsync(false);
+ dummyConfig.setFetchPersistentState(true);
+ dummyConfig.setIgnoreModifications(false);
+ dummyConfig.setClassName(DummyInMemoryCacheLoader.class.getName());
+ clc.addIndividualCacheLoaderConfig(dummyConfig);
cache.getConfiguration().setCacheLoaderConfig(clc);
}
1.13 +3 -16 JBossCache/tests/functional/org/jboss/cache/passivation/ConcurrentPassivationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConcurrentPassivationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/passivation/ConcurrentPassivationTest.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ConcurrentPassivationTest.java 27 Feb 2007 17:27:45 -0000 1.12
+++ ConcurrentPassivationTest.java 29 May 2007 13:51:27 -0000 1.13
@@ -13,16 +13,15 @@
import org.jboss.cache.CacheImpl;
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
-import org.jboss.cache.config.CacheLoaderConfig;
-import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
+import org.jboss.cache.loader.DummyInMemoryCacheLoader;
import org.jboss.cache.misc.TestingUtil;
/**
* Tests cache behavior in the presence of concurrent passivation.
*
* @author Brian Stansberry
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class ConcurrentPassivationTest extends TestCase
{
@@ -51,25 +50,13 @@
void initCaches() throws Exception
{
- TestingUtil.recursiveFileRemove(tmpDir + cacheLoaderDir);
cache_ = (CacheImpl) DefaultCacheFactory.getInstance().createCache(false);
cache_.setConfiguration(new XmlConfigurationParser().parseFile("META-INF/local-passivation-service.xml"));// read in generic local xml
cache_.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
-
- // hack in the path to the file store in the cache loaders
- injectCacheLoaderLocation(cache_.getConfiguration(), tmpDir + cacheLoaderDir);
+ cache_.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
cache_.start();
}
- private void injectCacheLoaderLocation(Configuration configuration, String location)
- {
- for (CacheLoaderConfig.IndividualCacheLoaderConfig iclc : configuration.getCacheLoaderConfig().getIndividualCacheLoaderConfigs())
- {
- iclc.getProperties().put("location", location);
- }
- }
-
-
public void tearDown() throws Exception
{
super.tearDown();
More information about the jboss-cvs-commits
mailing list