[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/aop/loader ...
Brian Stansberry
brian.stansberry at jboss.com
Wed Oct 25 00:50:20 EDT 2006
User: bstansberry
Date: 06/10/25 00:50:20
Modified: tests/functional/org/jboss/cache/aop/loader
FileCacheLoaderObjectGraphAopTest.java
FileCacheLoaderAopCollectionsTest.java
BdbjeCacheLoaderTest.java
AbstractCacheLoaderTestBase.java
FileCacheLoaderAopTest.java
Log:
Handle parsing of config XML in XmlConfigurationParser
Revision Changes Path
1.8 +1 -1 JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderObjectGraphAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FileCacheLoaderObjectGraphAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderObjectGraphAopTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- FileCacheLoaderObjectGraphAopTest.java 20 Jul 2006 08:05:17 -0000 1.7
+++ FileCacheLoaderObjectGraphAopTest.java 25 Oct 2006 04:50:20 -0000 1.8
@@ -10,7 +10,7 @@
public class FileCacheLoaderObjectGraphAopTest extends ObjectGraphTestsBase {
protected void configureCache() throws Exception {
String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp");
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
// cache.setCacheLoaderConfiguration(getCacheLoaderConfiguration(tmp_location));
}
1.5 +1 -1 JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FileCacheLoaderAopCollectionsTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopCollectionsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- FileCacheLoaderAopCollectionsTest.java 20 Jul 2006 10:31:10 -0000 1.4
+++ FileCacheLoaderAopCollectionsTest.java 25 Oct 2006 04:50:20 -0000 1.5
@@ -39,7 +39,7 @@
protected void configureCache() throws Exception {
String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp");
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
// cache.setCacheLoaderConfiguration(getCacheLoaderConfiguration(tmp_location));
}
1.3 +2 -2 JBossCache/tests/functional/org/jboss/cache/aop/loader/BdbjeCacheLoaderTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BdbjeCacheLoaderTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/BdbjeCacheLoaderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BdbjeCacheLoaderTest.java 20 Jul 2006 09:03:52 -0000 1.2
+++ BdbjeCacheLoaderTest.java 25 Oct 2006 04:50:20 -0000 1.3
@@ -9,7 +9,7 @@
/**
* Runs the same tests as {@link org.jboss.cache.loader.FileCacheLoaderTest}, but with Berkeley DB instead of a file-based CacheLoader
* @author Bela Ban
- * @version $Id: BdbjeCacheLoaderTest.java,v 1.2 2006/07/20 09:03:52 msurtani Exp $
+ * @version $Id: BdbjeCacheLoaderTest.java,v 1.3 2006/10/25 04:50:20 bstansberry Exp $
*/
public class BdbjeCacheLoaderTest extends CacheLoaderTestsBase {
@@ -42,7 +42,7 @@
}
}
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.bdbje.BdbjeCacheLoader", "", false, true, false));
}
public static Test suite() {
1.4 +5 -2 JBossCache/tests/functional/org/jboss/cache/aop/loader/AbstractCacheLoaderTestBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractCacheLoaderTestBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/AbstractCacheLoaderTestBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractCacheLoaderTestBase.java 5 May 2006 12:06:57 -0000 1.3
+++ AbstractCacheLoaderTestBase.java 25 Oct 2006 04:50:20 -0000 1.4
@@ -8,6 +8,8 @@
import junit.framework.TestCase;
import org.w3c.dom.Element;
+import org.jboss.cache.config.CacheLoaderConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.xml.XmlHelper;
import org.apache.commons.logging.Log;
@@ -23,7 +25,7 @@
protected final Log log = LogFactory.getLog(getClass());
- protected Element getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception
+ protected CacheLoaderConfig getSingleCacheLoaderConfig(String preload, String cacheloaderClass, String properties, boolean async, boolean fetchPersistentState, boolean shared) throws Exception
{
String xml = "<config>\n" +
"<passivation>false</passivation>\n" +
@@ -36,6 +38,7 @@
"<fetchPersistentState>" + fetchPersistentState + "</fetchPersistentState>\n" +
"</cacheloader>\n" +
"</config>";
- return XmlHelper.stringToElement(xml);
+ Element element = XmlHelper.stringToElement(xml);
+ return XmlConfigurationParser.parseCacheLoaderConfig(element);
}
}
1.9 +1 -1 JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FileCacheLoaderAopTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/aop/loader/FileCacheLoaderAopTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- FileCacheLoaderAopTest.java 20 Jul 2006 08:05:17 -0000 1.8
+++ FileCacheLoaderAopTest.java 25 Oct 2006 04:50:20 -0000 1.9
@@ -33,7 +33,7 @@
protected void configureCache() throws Exception {
String tmp_location = System.getProperty("java.io.tmpdir", "c:\\tmp");
- cache.getConfiguration().setCacheLoaderConfiguration(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
+ cache.getConfiguration().setCacheLoaderConfig(getSingleCacheLoaderConfig("", "org.jboss.cache.loader.FileCacheLoader", "", false, true, false));
// cache.setCacheLoaderConfiguration(getCacheLoaderConfiguration(tmp_location));
}
More information about the jboss-cvs-commits
mailing list