[hornetq-commits] JBoss hornetq SVN: r9586 - branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Aug 24 07:01:12 EDT 2010
Author: jmesnil
Date: 2010-08-24 07:01:12 -0400 (Tue, 24 Aug 2010)
New Revision: 9586
Modified:
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
Log:
fix management tests
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-08-24 09:23:32 UTC (rev 9585)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-08-24 11:01:12 UTC (rev 9586)
@@ -274,9 +274,9 @@
server.start();
ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnNonDurableSend(true);
ClientSessionFactory sf = locator.createSessionFactory();
- sf.getServerLocator().setBlockOnNonDurableSend(true);
- sf.getServerLocator().setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-08-24 09:23:32 UTC (rev 9585)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-08-24 11:01:12 UTC (rev 9586)
@@ -162,9 +162,9 @@
server.start();
ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnNonDurableSend(true);
ClientSessionFactory sf = locator.createSessionFactory();
- sf.getServerLocator().setBlockOnNonDurableSend(true);
- sf.getServerLocator().setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-08-24 09:23:32 UTC (rev 9585)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-08-24 11:01:12 UTC (rev 9586)
@@ -99,18 +99,15 @@
Object[] connectorPairs = broadcastGroupControl.getConnectorPairs();
Assert.assertEquals(1, connectorPairs.length);
- Object[] connectorPairData = (Object[])connectorPairs[0];
- Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(0), connectorPairData[0]);
- Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(1), connectorPairData[1]);
- fail("fix^^");
+ System.out.println(connectorPairs);
+ String connectorPairData = (String)connectorPairs[0];
+ Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(0), connectorPairData);
String jsonString = broadcastGroupControl.getConnectorPairsAsJSON();
Assert.assertNotNull(jsonString);
JSONArray array = new JSONArray(jsonString);
Assert.assertEquals(1, array.length());
- JSONObject data = array.getJSONObject(0);
- Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(0), data.optString("a"));
- Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(1), data.optString("b", null));
-
+ Assert.assertEquals(broadcastGroupConfig.getConnectorInfos().get(0), array.getString(0));
+
Assert.assertTrue(broadcastGroupControl.isStarted());
}
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-08-24 09:23:32 UTC (rev 9585)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-08-24 11:01:12 UTC (rev 9586)
@@ -32,6 +32,7 @@
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.CoreQueueConfiguration;
+import org.hornetq.core.config.DiscoveryGroupConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
@@ -42,7 +43,6 @@
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.utils.json.JSONArray;
-import org.hornetq.utils.json.JSONObject;
/**
* A BridgeControlTest
@@ -90,18 +90,17 @@
clusterConnectionControl.isForwardWhenNoConsumers());
Assert.assertEquals(clusterConnectionConfig1.getMaxHops(), clusterConnectionControl.getMaxHops());
- Object[] connectorPairs = clusterConnectionControl.getStaticConnectors();
- Assert.assertEquals(1, connectorPairs.length);
- Object[] connectorPairData = (Object[])connectorPairs[0];
- Assert.assertEquals(clusterConnectionConfig1.getStaticConnectors().get(0), connectorPairData[0]);
+ Object[] connectors = clusterConnectionControl.getStaticConnectors();
+ Assert.assertEquals(1, connectors.length);
+ String connector = (String)connectors[0];
+ Assert.assertEquals(clusterConnectionConfig1.getStaticConnectors().get(0), connector);
String jsonString = clusterConnectionControl.getStaticConnectorsAsJSON();
Assert.assertNotNull(jsonString);
JSONArray array = new JSONArray(jsonString);
Assert.assertEquals(1, array.length());
- JSONObject data = array.getJSONObject(0);
- Assert.assertEquals(clusterConnectionConfig1.getStaticConnectors().get(0), data.optString("a"));
-
+ Assert.assertEquals(clusterConnectionConfig1.getStaticConnectors().get(0), array.getString(0));
+
Assert.assertNull(clusterConnectionControl.getDiscoveryGroupName());
Assert.assertTrue(clusterConnectionControl.isStarted());
@@ -203,7 +202,7 @@
false);
List<String> connectors = new ArrayList<String>();
connectors.add(connectorConfig.getName());
-
+
clusterConnectionConfig1 = new ClusterConnectionConfiguration(RandomUtil.randomString(),
queueConfig.getAddress(),
connectorConfig.getName(),
@@ -214,6 +213,9 @@
RandomUtil.randomPositiveInt(),
connectors);
+ String discoveryGroupName = RandomUtil.randomString();
+ DiscoveryGroupConfiguration discoveryGroupConfig = new DiscoveryGroupConfiguration(discoveryGroupName, null, "230.1.2.3", 6745, 500);
+
clusterConnectionConfig2 = new ClusterConnectionConfiguration(RandomUtil.randomString(),
queueConfig.getAddress(),
connectorConfig.getName(),
@@ -222,8 +224,8 @@
RandomUtil.randomBoolean(),
RandomUtil.randomPositiveInt(),
RandomUtil.randomPositiveInt(),
- RandomUtil.randomString());
-
+ discoveryGroupName);
+
Configuration conf_1 = new ConfigurationImpl();
conf_1.setSecurityEnabled(false);
conf_1.setJMXManagementEnabled(true);
@@ -239,6 +241,7 @@
conf_0.getConnectorConfigurations().put(connectorConfig.getName(), connectorConfig);
conf_0.getClusterConfigurations().add(clusterConnectionConfig1);
conf_0.getClusterConfigurations().add(clusterConnectionConfig2);
+ conf_0.getDiscoveryGroupConfigurations().put(discoveryGroupName, discoveryGroupConfig);
mbeanServer_1 = MBeanServerFactory.createMBeanServer();
server_1 = HornetQServers.newHornetQServer(conf_1, mbeanServer_1, false);
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-08-24 09:23:32 UTC (rev 9585)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-08-24 11:01:12 UTC (rev 9586)
@@ -1282,9 +1282,9 @@
server.start();
ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnNonDurableSend(true);
ClientSessionFactory sf = locator.createSessionFactory();
- sf.getServerLocator().setBlockOnNonDurableSend(true);
- sf.getServerLocator().setBlockOnNonDurableSend(true);
session = sf.createSession(false, true, false);
session.start();
}
More information about the hornetq-commits
mailing list