[jboss-cvs] JBoss Messaging SVN: r1758 - in branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging: jms/clustering tools/jmx/rmi
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Dec 10 19:20:02 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-10 19:19:59 -0500 (Sun, 10 Dec 2006)
New Revision: 1758
Modified:
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
Log:
cleaned the testing interfaces a little bit, based on the new Peer.getNodeIDView()
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2006-12-11 00:17:58 UTC (rev 1757)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java 2006-12-11 00:19:59 UTC (rev 1758)
@@ -9,7 +9,6 @@
import org.jboss.test.messaging.MessagingTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
-import javax.management.ObjectName;
import java.util.Set;
/**
@@ -37,17 +36,56 @@
public void testOneNodeCluster() throws Exception
{
+ try
+ {
+ ServerManagement.start("all", 0);
- ServerManagement.start("all", 0);
+ Set view = ServerManagement.getServer(0).getNodeIDView();
- ObjectName on = new ObjectName("jboss.messaging:service=QueuePostOffice");
- Set view = (Set)ServerManagement.getAttribute(on, "NodeIDView");
+ assertEquals(1, view.size());
+ assertTrue(view.contains(new Integer(0)));
+ }
+ finally
+ {
+ ServerManagement.stop(0, false);
+ }
+ }
- assertEquals(1, view.size());
- assertTrue(view.contains(new Integer(0)));
+ public void testTwoNodesCluster() throws Exception
+ {
+ try
+ {
+ ServerManagement.start("all", 0);
+ Set view = ServerManagement.getServer(0).getNodeIDView();
+
+ assertEquals(1, view.size());
+ assertTrue(view.contains(new Integer(0)));
+
+ ServerManagement.start("all", 1);
+
+ view = ServerManagement.getServer(0).getNodeIDView();
+
+ assertEquals(2, view.size());
+ assertTrue(view.contains(new Integer(0)));
+ assertTrue(view.contains(new Integer(1)));
+
+ view = ServerManagement.getServer(1).getNodeIDView();
+
+ assertEquals(2, view.size());
+ assertTrue(view.contains(new Integer(0)));
+ assertTrue(view.contains(new Integer(1)));
+
+ log.info("testTwoNodesCluster sucessful");
+ }
+ finally
+ {
+ ServerManagement.stop(1, false);
+ ServerManagement.stop(0, false);
+ }
}
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-11 00:17:58 UTC (rev 1757)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java 2006-12-11 00:19:59 UTC (rev 1758)
@@ -23,6 +23,7 @@
package org.jboss.test.messaging.jms.clustering;
import java.util.Map;
+import java.util.Set;
import javax.jms.Connection;
import javax.jms.MessageConsumer;
@@ -35,7 +36,6 @@
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.client.delegate.ClusteredClientConnectionFactoryDelegate;
-import org.jboss.jms.client.delegate.DelegateSupport;
import org.jboss.jms.client.state.ConnectionState;
import org.jboss.jms.message.MessageProxy;
import org.jboss.test.messaging.jms.clustering.base.ClusteringTestBase;
@@ -424,9 +424,10 @@
ClusteredClientConnectionFactoryDelegate delegate =
(ClusteredClientConnectionFactoryDelegate)factory.getDelegate();
+
+ Set nodeIDView = ServerManagement.getServer(0).getNodeIDView();
+ assertEquals(3, nodeIDView.size());
- assertEquals(3, ServerManagement.getServer(0).getNumberOfNodesOnCluster());
-
ClientConnectionFactoryDelegate[] delegates = delegate.getDelegates();
ClientConnectionFactoryDelegate cf1 = delegates[0];
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-12-11 00:17:58 UTC (rev 1757)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java 2006-12-11 00:19:59 UTC (rev 1758)
@@ -38,7 +38,6 @@
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.messaging.core.plugin.contract.PostOffice;
-import org.jboss.messaging.core.plugin.postoffice.cluster.DefaultClusteredPostOffice;
import org.jboss.remoting.ServerInvocationHandler;
import org.jboss.test.messaging.tools.ServerManagement;
import org.jboss.test.messaging.tools.jboss.MBeanConfigurationElement;
@@ -857,14 +856,9 @@
return sc.getUserTransaction();
}
-
- public int getNumberOfNodesOnCluster() throws Exception
+ public Set getNodeIDView() throws Exception
{
- log.info("getNumberOfNodesOnCluster being called:: sc=" + sc);
- DefaultClusteredPostOffice postOffice = (DefaultClusteredPostOffice)
- sc.getAttribute(queuePostOfficeObjectName, "Instance");
-
- return postOffice.getNumberOfNodesInCluster();
+ return (Set)sc.getAttribute(queuePostOfficeObjectName, "NodeIDView");
}
// Public --------------------------------------------------------
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-11 00:17:58 UTC (rev 1757)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java 2006-12-11 00:19:59 UTC (rev 1758)
@@ -57,14 +57,13 @@
protected RemoteTestServer server;
private RMINamingDelegate namingDelegate;
- private int index;
public static final String RMI_SERVER_PREFIX = "messaging_rmi_server_";
public static final String NAMING_SERVER_PREFIX = "naming_rmi_server_";
private static Registry registry;
-
+
public static void main(String[] args) throws Exception
{
log.debug("initializing RMI runtime");
@@ -137,7 +136,6 @@
public RMITestServer(int index) throws Exception
{
- this.index = index;
namingDelegate = new RMINamingDelegate(index);
server = new RemoteTestServer(index);
}
@@ -384,9 +382,9 @@
return server.getUserTransaction();
}
- public int getNumberOfNodesOnCluster() throws Exception
+ public Set getNodeIDView() throws Exception
{
- return server.getNumberOfNodesOnCluster();
+ return server.getNodeIDView();
}
private RMINamingDelegate getNamingDelegate()
Modified: branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
===================================================================
--- branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2006-12-11 00:17:58 UTC (rev 1757)
+++ branches/Branch_Client_Failover_Experiment/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java 2006-12-11 00:19:59 UTC (rev 1758)
@@ -218,7 +218,12 @@
UserTransaction getUserTransaction() throws Exception;
- /** use only on Clustering tests */
- int getNumberOfNodesOnCluster() throws Exception;
+ /**
+ * Returns a Set containing the nodeID (as Integers) of all cluster members at the time of the
+ * call.
+ *
+ * USE IT ONLY FOR CLUSTERING TESTS!
+ */
+ Set getNodeIDView() throws Exception;
}
More information about the jboss-cvs-commits
mailing list