[jboss-cvs] JBossAS SVN: r69428 - in trunk/testsuite/src/main/org/jboss/test/cluster: hapartition/drm and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 28 23:06:36 EST 2008
Author: bstansberry at jboss.com
Date: 2008-01-28 23:06:36 -0500 (Mon, 28 Jan 2008)
New Revision: 69428
Modified:
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonSupportUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/UnifiedInvokerHaUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/cluster/hapartition/drm/DRMUser.java
trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/InvokerHaInfrastructure.java
Log:
[JBAS-5183] Provide info as to whether topology changes are due to a merge
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2008-01-29 04:04:52 UTC (rev 69427)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/DRMTestCase.java 2008-01-29 04:06:36 UTC (rev 69428)
@@ -116,7 +116,7 @@
drm.registerListener("TEST", this);
}
- public void replicantsChanged(String key, List newReplicants, int newReplicantsViewId)
+ public void replicantsChanged(String key, List newReplicants, int newReplicantsViewId, boolean merge)
{
blocking = true;
synchronized(lock)
@@ -204,7 +204,7 @@
implements DistributedReplicantManager.ReplicantListener
{
public void replicantsChanged(String key, List newReplicants,
- int newReplicantsViewId)
+ int newReplicantsViewId, boolean merge)
{
// no-op
}
@@ -237,7 +237,8 @@
public void replicantsChanged(String key,
List newReplicants,
- int newReplicantsViewId)
+ int newReplicantsViewId,
+ boolean merge)
{
if (this.key.equals(key))
{
@@ -479,7 +480,7 @@
boolean clean = true;
public void replicantsChanged(String key, List newReplicants,
- int newReplicantsViewId)
+ int newReplicantsViewId, boolean merge)
{
this.replicants = newReplicants;
if (clean && newReplicants != null)
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonSupportUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonSupportUnitTestCase.java 2008-01-29 04:04:52 UTC (rev 69427)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonSupportUnitTestCase.java 2008-01-29 04:06:36 UTC (rev 69428)
@@ -81,7 +81,7 @@
// register DRM Listener is expected to call back
singletonSupportTester.__isDRMMasterReplica__ = true;
- singletonSupportTester.partitionTopologyChanged( new ArrayList(2), 1);
+ singletonSupportTester.partitionTopologyChanged( new ArrayList(2), 1, false);
// test whether it was elected
assertTrue("expected to become master", singletonSupportTester.isMasterNode());
@@ -103,7 +103,7 @@
// register DRM Listener is expected to call back
singletonSupportTester.__isDRMMasterReplica__ = false;
- singletonSupportTester.partitionTopologyChanged(new ArrayList(2), 1);
+ singletonSupportTester.partitionTopologyChanged(new ArrayList(2), 1, false);
// this call back should not change the master/slave status
assertEquals("expected to be still in old master/slave state", singletonSupportTester.isMasterNode(), savedIsMasterNode );
@@ -128,7 +128,7 @@
// register DRM Listener is expected to call back
singletonSupportTester.__isDRMMasterReplica__ = true;
- singletonSupportTester.partitionTopologyChanged( new ArrayList(2), 1);
+ singletonSupportTester.partitionTopologyChanged( new ArrayList(2), 1, false);
// test whether it was elected for master
assertTrue("expected to become master", singletonSupportTester.isMasterNode());
@@ -138,7 +138,7 @@
// register DRM Listener is expected to call back
singletonSupportTester.__isDRMMasterReplica__ = false;
// since the only node (this one) in the partition is now removed, the replicants list should be empty
- singletonSupportTester.partitionTopologyChanged(new ArrayList(0), 1);
+ singletonSupportTester.partitionTopologyChanged(new ArrayList(0), 1, false);
assertTrue("expected to have made a call to _stopOldMater(), thus become slave", !singletonSupportTester.isMasterNode() );
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/UnifiedInvokerHaUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/UnifiedInvokerHaUnitTestCase.java 2008-01-29 04:04:52 UTC (rev 69427)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/UnifiedInvokerHaUnitTestCase.java 2008-01-29 04:06:36 UTC (rev 69428)
@@ -124,7 +124,7 @@
/* create ha-target in first server with the list of replicants and register
* it with the MBeanServer. */
HATarget target = new MockHATarget(null, replicantName, null, 2);
- target.replicantsChanged(null, locators, 0);
+ target.replicantsChanged(null, locators, 0, false);
replicant.registerBean(targetName, target);
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/hapartition/drm/DRMUser.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/hapartition/drm/DRMUser.java 2008-01-29 04:04:52 UTC (rev 69427)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/hapartition/drm/DRMUser.java 2008-01-29 04:06:36 UTC (rev 69428)
@@ -117,7 +117,7 @@
return sequence ++;
}
- public void replicantsChanged(String key, List newReplicants, int newReplicantsViewId)
+ public void replicantsChanged(String key, List newReplicants, int newReplicantsViewId, boolean merge)
{
NotifyData data = new NotifyData();
data.key = key;
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/InvokerHaInfrastructure.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/InvokerHaInfrastructure.java 2008-01-29 04:04:52 UTC (rev 69427)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/invokerha/InvokerHaInfrastructure.java 2008-01-29 04:06:36 UTC (rev 69428)
@@ -300,7 +300,7 @@
/* create ha-target in the server with the list of replicants and register
* it with the MBeanServer. */
HATarget target = new MockHATarget(null, replicantName, null, 2);
- target.replicantsChanged(null, replicants, 0);
+ target.replicantsChanged(null, replicants, 0, false);
replicant.registerBean(targetName, target);
}
}
More information about the jboss-cvs-commits
mailing list