[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/buddyreplication ...
Brian Stansberry
brian.stansberry at jboss.com
Wed Oct 25 00:50:21 EDT 2006
User: bstansberry
Date: 06/10/25 00:50:21
Modified: tests/functional/org/jboss/cache/buddyreplication
BuddyManagerTest.java
BuddyBackupActivationInactivationTest.java
BuddyReplicationConfigTest.java
BuddyReplicationTestsBase.java
Log:
Handle parsing of config XML in XmlConfigurationParser
Revision Changes Path
1.8 +6 -5 JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyManagerTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyManagerTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyManagerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- BuddyManagerTest.java 23 Oct 2006 05:47:30 -0000 1.7
+++ BuddyManagerTest.java 25 Oct 2006 04:50:21 -0000 1.8
@@ -10,6 +10,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.buddyreplication.NextMemberBuddyLocator.Config;
import org.jboss.cache.config.BuddyReplicationConfig;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -37,7 +38,7 @@
" <buddyLocatorProperties>numBuddies = 3</buddyLocatorProperties>\n" +
" <buddyPoolName>groupOne</buddyPoolName></config>";
Element element = XmlHelper.stringToElement(xmlConfig);
- BuddyReplicationConfig config = new BuddyReplicationConfig(element);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
@@ -60,7 +61,7 @@
" <buddyLocatorProperties>numBuddies = 3</buddyLocatorProperties>\n" +
" <buddyPoolName>groupOne</buddyPoolName></config>";
Element element = XmlHelper.stringToElement(xmlConfig);
- BuddyReplicationConfig config = new BuddyReplicationConfig(element);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
@@ -83,7 +84,7 @@
String xmlConfig = "<config><buddyReplicationEnabled>false</buddyReplicationEnabled></config>";
Element element = XmlHelper.stringToElement(xmlConfig);
- BuddyReplicationConfig config = new BuddyReplicationConfig(element);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(!mgr.isEnabled());
@@ -99,7 +100,7 @@
String xmlConfig = "<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>";
Element element = XmlHelper.stringToElement(xmlConfig);
- BuddyReplicationConfig config = new BuddyReplicationConfig(element);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
@@ -116,7 +117,7 @@
try
{
Element element = XmlHelper.stringToElement("<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>");
- BuddyReplicationConfig cfg = new BuddyReplicationConfig(element);
+ BuddyReplicationConfig cfg = XmlConfigurationParser.parseBuddyReplicationConfig(element);
bm = new BuddyManager(cfg);
}
catch (Exception e)
1.12 +6 -2 JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyBackupActivationInactivationTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- BuddyBackupActivationInactivationTest.java 24 Oct 2006 10:03:43 -0000 1.11
+++ BuddyBackupActivationInactivationTest.java 25 Oct 2006 04:50:21 -0000 1.12
@@ -8,6 +8,7 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.misc.TestingUtil;
import org.w3c.dom.Document;
@@ -198,8 +199,10 @@
}
}
- private Element getBuddyConfig() throws Exception
+ private BuddyReplicationConfig getBuddyConfig() throws Exception
{
+ // TODO just build the object; skip the legacy XML business
+
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
Document doc = db.newDocument();
@@ -211,6 +214,7 @@
Element gravDisabled = doc.createElement("autoDataGravitation");
gravDisabled.appendChild(doc.createTextNode("false"));
config.appendChild(gravDisabled);
- return config;
+
+ return XmlConfigurationParser.parseBuddyReplicationConfig(config);
}
}
1.10 +5 -2 JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyReplicationConfigTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationConfigTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- BuddyReplicationConfigTest.java 23 Oct 2006 05:47:30 -0000 1.9
+++ BuddyReplicationConfigTest.java 25 Oct 2006 04:50:21 -0000 1.10
@@ -9,6 +9,7 @@
import junit.framework.TestCase;
import org.jboss.cache.TreeCache;
import org.jboss.cache.buddyreplication.NextMemberBuddyLocator.Config;
+import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.interceptors.DataGravitatorInterceptor;
@@ -33,7 +34,8 @@
public void testDisabledConfig() throws Exception
{
String xmlConfig = "<config><buddyReplicationEnabled>false</buddyReplicationEnabled></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
TreeCache cache = new TreeCache();
cache.getConfiguration().setBuddyReplicationConfig(config);
assertNull(cache.getBuddyManager());
@@ -42,7 +44,8 @@
public void testBasicConfig() throws Exception
{
String xmlConfig = "<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
TreeCache cache = new TreeCache();
cache.getConfiguration().setCacheMode(Configuration.CacheMode.REPL_SYNC);
cache.getConfiguration().setBuddyReplicationConfig(config);
1.31 +10 -2 JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyReplicationTestsBase.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationTestsBase.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- BuddyReplicationTestsBase.java 7 Sep 2006 17:54:30 -0000 1.30
+++ BuddyReplicationTestsBase.java 25 Oct 2006 04:50:21 -0000 1.31
@@ -10,9 +10,13 @@
import org.jboss.cache.CacheException;
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.config.BuddyReplicationConfig;
+import org.jboss.cache.config.CacheLoaderConfig;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.misc.TestingUtil;
import org.jboss.cache.xml.XmlHelper;
+import org.w3c.dom.Element;
import java.io.File;
@@ -65,7 +69,9 @@
if (buddyPoolName != null) xmlString += "<buddyPoolName>" + buddyPoolName + "</buddyPoolName>";
xmlString += "</config>";
- c.getConfiguration().setBuddyReplicationConfig(XmlHelper.stringToElement(xmlString));
+ Element element = XmlHelper.stringToElement(xmlString);
+ BuddyReplicationConfig config = XmlConfigurationParser.parseBuddyReplicationConfig(element);
+ c.getConfiguration().setBuddyReplicationConfig(config);
c.getConfiguration().setFetchInMemoryState(true);
if (optimisticLocks)
@@ -134,7 +140,9 @@
"</cacheloader>\n" +
"</config>";
- cache.getConfiguration().setCacheLoaderConfiguration(XmlHelper.stringToElement(cloader));
+ Element element = XmlHelper.stringToElement(cloader);
+ CacheLoaderConfig cfg = XmlConfigurationParser.parseCacheLoaderConfig(element);
+ cache.getConfiguration().setCacheLoaderConfig(cfg);
if (start)
cache.start();
More information about the jboss-cvs-commits
mailing list