[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/buddyreplication ...
Brian Stansberry
brian.stansberry at jboss.com
Mon Oct 23 01:47:30 EDT 2006
User: bstansberry
Date: 06/10/23 01:47:30
Modified: tests/functional/org/jboss/cache/buddyreplication
BuddyReplicationConfigTest.java
BuddyManagerTest.java
NextMemberBuddyLocatorTest.java
Log:
[JBCACHE-809] Pojo-style configuration for use by Microcontainer
Revision Changes Path
1.9 +9 -6 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.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- BuddyReplicationConfigTest.java 11 Sep 2006 17:02:43 -0000 1.8
+++ BuddyReplicationConfigTest.java 23 Oct 2006 05:47:30 -0000 1.9
@@ -8,6 +8,7 @@
import junit.framework.TestCase;
import org.jboss.cache.TreeCache;
+import org.jboss.cache.buddyreplication.NextMemberBuddyLocator.Config;
import org.jboss.cache.config.Configuration;
import org.jboss.cache.factories.XmlConfigurationParser;
import org.jboss.cache.interceptors.DataGravitatorInterceptor;
@@ -51,8 +52,9 @@
assertTrue(mgr.isEnabled());
assertNull(mgr.getBuddyPoolName());
assertEquals(NextMemberBuddyLocator.class, mgr.buddyLocator.getClass());
- assertEquals(1, ((NextMemberBuddyLocator) mgr.buddyLocator).numBuddies);
- assertTrue(((NextMemberBuddyLocator) mgr.buddyLocator).ignoreColocatedBuddies);
+ NextMemberBuddyLocator.Config blc = (Config) mgr.buddyLocator.getConfig();
+ assertEquals(1, blc.getNumBuddies());
+ assertTrue(blc.isIgnoreColocatedBuddies());
}
public void testXmlConfig() throws Exception
@@ -65,10 +67,11 @@
assertTrue(bm.isEnabled());
assertTrue(bm.buddyLocator instanceof NextMemberBuddyLocator);
NextMemberBuddyLocator bl = (NextMemberBuddyLocator) bm.buddyLocator;
- assertTrue(bl.ignoreColocatedBuddies);
- assertEquals(1, bl.numBuddies);
- assertEquals("myBuddyPoolReplicationGroup", bm.buddyPoolName);
- assertEquals(2000, bm.buddyCommunicationTimeout);
+ NextMemberBuddyLocator.Config blc = (Config) bl.getConfig();
+ assertTrue(blc.isIgnoreColocatedBuddies());
+ assertEquals(1, blc.getNumBuddies());
+ assertEquals("myBuddyPoolReplicationGroup", bm.getConfig().getBuddyPoolName());
+ assertEquals(2000, bm.getConfig().getBuddyCommunicationTimeout());
// test Data Gravitator
boolean hasDG = false;
1.7 +24 -11 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.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- BuddyManagerTest.java 30 Aug 2006 17:08:19 -0000 1.6
+++ BuddyManagerTest.java 23 Oct 2006 05:47:30 -0000 1.7
@@ -8,6 +8,8 @@
import junit.framework.TestCase;
import org.jboss.cache.Fqn;
+import org.jboss.cache.buddyreplication.NextMemberBuddyLocator.Config;
+import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -34,14 +36,16 @@
String xmlConfig = "<config><buddyReplicationEnabled>true</buddyReplicationEnabled>\n" +
" <buddyLocatorProperties>numBuddies = 3</buddyLocatorProperties>\n" +
" <buddyPoolName>groupOne</buddyPoolName></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = new BuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
assertEquals("groupOne", mgr.getBuddyPoolName());
assertEquals(NextMemberBuddyLocator.class, mgr.buddyLocator.getClass());
- assertEquals(3, ((NextMemberBuddyLocator) mgr.buddyLocator).numBuddies);
- assertTrue(((NextMemberBuddyLocator) mgr.buddyLocator).ignoreColocatedBuddies);
+ NextMemberBuddyLocator.Config blc = (Config) mgr.buddyLocator.getConfig();
+ assertEquals(3, blc.getNumBuddies());
+ assertTrue(blc.isIgnoreColocatedBuddies());
}
/**
@@ -55,7 +59,8 @@
" <buddyLocatorClass>org.i.dont.exist.PhantomBuddyLocator</buddyLocatorClass>\n" +
" <buddyLocatorProperties>numBuddies = 3</buddyLocatorProperties>\n" +
" <buddyPoolName>groupOne</buddyPoolName></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = new BuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
@@ -63,8 +68,9 @@
assertEquals(NextMemberBuddyLocator.class, mgr.buddyLocator.getClass());
// since the properties are not passed on to the next member buddy locator - they were obviously meant for a different impl.
- assertEquals(1, ((NextMemberBuddyLocator) mgr.buddyLocator).numBuddies);
- assertTrue(((NextMemberBuddyLocator) mgr.buddyLocator).ignoreColocatedBuddies);
+ NextMemberBuddyLocator.Config blc = (Config) mgr.buddyLocator.getConfig();
+ assertEquals(1, blc.getNumBuddies());
+ assertTrue(blc.isIgnoreColocatedBuddies());
}
/**
@@ -75,7 +81,9 @@
public void testConstruction3() throws Exception
{
String xmlConfig = "<config><buddyReplicationEnabled>false</buddyReplicationEnabled></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = new BuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(!mgr.isEnabled());
@@ -89,14 +97,17 @@
public void testConstruction4() throws Exception
{
String xmlConfig = "<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>";
- Element config = XmlHelper.stringToElement(xmlConfig);
+
+ Element element = XmlHelper.stringToElement(xmlConfig);
+ BuddyReplicationConfig config = new BuddyReplicationConfig(element);
BuddyManager mgr = new BuddyManager(config);
assertTrue(mgr.isEnabled());
assertNull(mgr.getBuddyPoolName());
assertEquals(NextMemberBuddyLocator.class, mgr.buddyLocator.getClass());
- assertEquals(1, ((NextMemberBuddyLocator) mgr.buddyLocator).numBuddies);
- assertTrue(((NextMemberBuddyLocator) mgr.buddyLocator).ignoreColocatedBuddies);
+ NextMemberBuddyLocator.Config blc = (Config) mgr.buddyLocator.getConfig();
+ assertEquals(1, blc.getNumBuddies());
+ assertTrue(blc.isIgnoreColocatedBuddies());
}
private BuddyManager createBasicBuddyManager()
@@ -104,7 +115,9 @@
BuddyManager bm = null;
try
{
- bm = new BuddyManager(XmlHelper.stringToElement("<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>"));
+ Element element = XmlHelper.stringToElement("<config><buddyReplicationEnabled>true</buddyReplicationEnabled></config>");
+ BuddyReplicationConfig cfg = new BuddyReplicationConfig(element);
+ bm = new BuddyManager(cfg);
}
catch (Exception e)
{
1.3 +4 -2 JBossCache/tests/functional/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NextMemberBuddyLocatorTest.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NextMemberBuddyLocatorTest.java 24 Apr 2006 19:29:27 -0000 1.2
+++ NextMemberBuddyLocatorTest.java 23 Oct 2006 05:47:30 -0000 1.3
@@ -72,9 +72,11 @@
private List getBuddies(int numBuddies, boolean ignoreColoc, List candidates, Map buddyPool)
{
+ NextMemberBuddyLocator.Config cfg = new NextMemberBuddyLocator.Config();
+ cfg.setIgnoreColocatedBuddies(ignoreColoc);
+ cfg.setNumBuddies(numBuddies);
NextMemberBuddyLocator nmbl = new NextMemberBuddyLocator();
- nmbl.ignoreColocatedBuddies = ignoreColoc;
- nmbl.numBuddies = numBuddies;
+ nmbl.init(cfg);
return nmbl.locateBuddies(buddyPool, candidates, dataOwner);
}
More information about the jboss-cvs-commits
mailing list