Repository: activemq-artemis Updated Branches: refs/heads/2.6.x 9427d0010 -> 97bfaabda
NO-JIRA Tweak RedeployTest 1) Remove use of deprecated EmbeddedJMS. 2) Change test config to use static clustering as discovery may not work in some CI environments. (cherry picked from commit e6dddf823119a8d9317f3043232846c59a1fe104) Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/97bfaabd Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/97bfaabd Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/97bfaabd Branch: refs/heads/2.6.x Commit: 97bfaabdaa23672e15c154b838a4e9ea2aa4df17 Parents: 9427d00 Author: Justin Bertram <[email protected]> Authored: Fri Aug 17 14:06:47 2018 -0500 Committer: Clebert Suconic <[email protected]> Committed: Fri Aug 17 16:06:47 2018 -0400 ---------------------------------------------------------------------- .../tests/integration/jms/RedeployTest.java | 105 +++++++++---------- .../test/resources/reload-backup-changed.xml | 24 +---- .../test/resources/reload-backup-original.xml | 24 +---- .../src/test/resources/reload-live-changed.xml | 24 +---- .../src/test/resources/reload-live-original.xml | 24 +---- 5 files changed, 72 insertions(+), 129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/97bfaabd/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java index 2ba7f3d..b639c72 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java @@ -38,7 +38,6 @@ import org.apache.activemq.artemis.core.security.Role; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; -import org.apache.activemq.artemis.jms.server.embedded.EmbeddedJMS; import org.apache.activemq.artemis.junit.Wait; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.ReusableLatch; @@ -103,8 +102,8 @@ public class RedeployTest extends ActiveMQTestBase { @Test public void testRedeployWithFailover() throws Exception { - EmbeddedJMS live = new EmbeddedJMS(); - EmbeddedJMS backup = new EmbeddedJMS(); + EmbeddedActiveMQ live = new EmbeddedActiveMQ(); + EmbeddedActiveMQ backup = new EmbeddedActiveMQ(); try { // set these system properties to use in the relevant broker.xml files @@ -128,7 +127,7 @@ public class RedeployTest extends ActiveMQTestBase { backup.setConfigResourcePath(backupBrokerXML.toUri().toString()); backup.start(); - Wait.waitFor(() -> backup.getActiveMQServer().isReplicaSync(), 10000, 200); + assertTrue(Wait.waitFor(() -> backup.getActiveMQServer().isReplicaSync(), 15000, 200)); final ReusableLatch liveReloadLatch = new ReusableLatch(1); Runnable liveTick = () -> liveReloadLatch.countDown(); @@ -162,7 +161,7 @@ public class RedeployTest extends ActiveMQTestBase { live.stop(); - Wait.waitFor(() -> (backup.getActiveMQServer().isActive()), 5000, 100); + assertTrue(Wait.waitFor(() -> (backup.getActiveMQServer().isActive()), 5000, 100)); factory = new ActiveMQConnectionFactory("tcp://127.0.0.1:61617"); try (Connection connection = factory.createConnection()) { @@ -280,91 +279,91 @@ public class RedeployTest extends ActiveMQTestBase { URL url2 = RedeployTest.class.getClassLoader().getResource("reload-changed.xml"); Files.copy(url1.openStream(), brokerXML); - EmbeddedJMS embeddedJMS = new EmbeddedJMS(); - embeddedJMS.setConfigResourcePath(brokerXML.toUri().toString()); - embeddedJMS.start(); + EmbeddedActiveMQ embeddedActiveMQ = new EmbeddedActiveMQ(); + embeddedActiveMQ.setConfigResourcePath(brokerXML.toUri().toString()); + embeddedActiveMQ.start(); final ReusableLatch latch = new ReusableLatch(1); Runnable tick = latch::countDown; - embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick); + embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick); try { latch.await(10, TimeUnit.SECONDS); - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").size(), 1); - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").iterator().next().getName(), "b"); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "b"); - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("OriginalDLQ")); - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("OriginalExpiryQueue")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("OriginalDLQ")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("OriginalExpiryQueue")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_address_removal_no_queue")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_address_removal")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal_no_queue")); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal")); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_removal")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_change")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_change").contains("config_test_queue_change_queue")); - Assert.assertEquals(10, getQueue(embeddedJMS, "config_test_queue_change_queue").getMaxConsumers()); - Assert.assertEquals(false, getQueue(embeddedJMS, "config_test_queue_change_queue").isPurgeOnNoConsumers()); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_change")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_change").contains("config_test_queue_change_queue")); + Assert.assertEquals(10, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").getMaxConsumers()); + Assert.assertEquals(false, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").isPurgeOnNoConsumers()); Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING); brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000); latch.setCount(1); - embeddedJMS.getActiveMQServer().getReloadManager().setTick(tick); + embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick); latch.await(10, TimeUnit.SECONDS); //Assert that the security settings change applied - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").size(), 1); - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").iterator().next().getName(), "c"); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "c"); //Assert that the address settings change applied - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("NewDLQ")); - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("NewExpiryQueue")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("NewDLQ")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("NewExpiryQueue")); //Assert the address and queue changes applied - Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal_no_queue")); - Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); - Assert.assertFalse(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); - - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_change")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_change").contains("config_test_queue_change_queue")); - Assert.assertEquals(1, getQueue(embeddedJMS, "config_test_queue_change_queue").getMaxConsumers()); - Assert.assertEquals(true, getQueue(embeddedJMS, "config_test_queue_change_queue").isPurgeOnNoConsumers()); + Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal_no_queue")); + Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal")); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_removal")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); + Assert.assertFalse(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); + + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_change")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_change").contains("config_test_queue_change_queue")); + Assert.assertEquals(1, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").getMaxConsumers()); + Assert.assertEquals(true, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").isPurgeOnNoConsumers()); } finally { - embeddedJMS.stop(); + embeddedActiveMQ.stop(); } try { - embeddedJMS.start(); + embeddedActiveMQ.start(); //Assert that the security settings changes persist a stop and start server (e.g. like what occurs if network health check stops the node), but JVM remains up. - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").size(), 1); - Assert.assertEquals(getSecurityRoles(embeddedJMS, "security_address").iterator().next().getName(), "c"); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").size(), 1); + Assert.assertEquals(getSecurityRoles(embeddedActiveMQ, "security_address").iterator().next().getName(), "c"); //Assert that the address settings changes persist a stop and start server (e.g. like what occurs if network health check stops the node), but JVM remains up. - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("NewDLQ")); - Assert.assertEquals(getAddressSettings(embeddedJMS, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("NewExpiryQueue")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getDeadLetterAddress(), SimpleString.toSimpleString("NewDLQ")); + Assert.assertEquals(getAddressSettings(embeddedActiveMQ, "address_settings_address").getExpiryAddress(), SimpleString.toSimpleString("NewExpiryQueue")); //Assert that the address and queue changes persist a stop and start server (e.g. like what occurs if network health check stops the node), but JVM remains up. - Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal_no_queue")); - Assert.assertNull(getAddressInfo(embeddedJMS, "config_test_address_removal")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_removal")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); - Assert.assertFalse(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); + Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal_no_queue")); + Assert.assertNull(getAddressInfo(embeddedActiveMQ, "config_test_address_removal")); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_removal")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_1")); + Assert.assertFalse(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_removal").contains("config_test_queue_removal_queue_2")); - Assert.assertNotNull(getAddressInfo(embeddedJMS, "config_test_queue_change")); - Assert.assertTrue(listQueuesNamesForAddress(embeddedJMS, "config_test_queue_change").contains("config_test_queue_change_queue")); - Assert.assertEquals(1, getQueue(embeddedJMS, "config_test_queue_change_queue").getMaxConsumers()); - Assert.assertEquals(true, getQueue(embeddedJMS, "config_test_queue_change_queue").isPurgeOnNoConsumers()); + Assert.assertNotNull(getAddressInfo(embeddedActiveMQ, "config_test_queue_change")); + Assert.assertTrue(listQueuesNamesForAddress(embeddedActiveMQ, "config_test_queue_change").contains("config_test_queue_change_queue")); + Assert.assertEquals(1, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").getMaxConsumers()); + Assert.assertEquals(true, getQueue(embeddedActiveMQ, "config_test_queue_change_queue").isPurgeOnNoConsumers()); } finally { - embeddedJMS.stop(); + embeddedActiveMQ.stop(); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/97bfaabd/tests/integration-tests/src/test/resources/reload-backup-changed.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-backup-changed.xml b/tests/integration-tests/src/test/resources/reload-backup-changed.xml index 101871b..8ea9241 100644 --- a/tests/integration-tests/src/test/resources/reload-backup-changed.xml +++ b/tests/integration-tests/src/test/resources/reload-backup-changed.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${backup-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61617</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61617</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61617</connector> + <connector name="other">tcp://127.0.0.1:61616</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/97bfaabd/tests/integration-tests/src/test/resources/reload-backup-original.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-backup-original.xml b/tests/integration-tests/src/test/resources/reload-backup-original.xml index 0061be0..54a01a9 100644 --- a/tests/integration-tests/src/test/resources/reload-backup-original.xml +++ b/tests/integration-tests/src/test/resources/reload-backup-original.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${backup-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61617</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61617</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61617</connector> + <connector name="other">tcp://127.0.0.1:61616</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/97bfaabd/tests/integration-tests/src/test/resources/reload-live-changed.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-live-changed.xml b/tests/integration-tests/src/test/resources/reload-live-changed.xml index 74a2ef2..17120ce 100644 --- a/tests/integration-tests/src/test/resources/reload-live-changed.xml +++ b/tests/integration-tests/src/test/resources/reload-live-changed.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${live-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61616</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61616</connector> + <connector name="other">tcp://127.0.0.1:61617</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/97bfaabd/tests/integration-tests/src/test/resources/reload-live-original.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-live-original.xml b/tests/integration-tests/src/test/resources/reload-live-original.xml index 1cbfe75..9051d58 100644 --- a/tests/integration-tests/src/test/resources/reload-live-original.xml +++ b/tests/integration-tests/src/test/resources/reload-live-original.xml @@ -39,11 +39,12 @@ under the License. <large-messages-directory>${live-data-dir}/large-messages</large-messages-directory> <acceptors> - <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor> + <acceptor name="artemis">tcp://127.0.0.1:61616</acceptor> </acceptors> <connectors> <connector name="artemis">tcp://127.0.0.1:61616</connector> + <connector name="other">tcp://127.0.0.1:61617</connector> </connectors> <ha-policy> @@ -54,29 +55,14 @@ under the License. </replication> </ha-policy> - <broadcast-groups> - <broadcast-group name="bg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <broadcast-period>5000</broadcast-period> - <connector-ref>artemis</connector-ref> - </broadcast-group> - </broadcast-groups> - - <discovery-groups> - <discovery-group name="dg-group1"> - <group-address>231.7.7.7</group-address> - <group-port>9876</group-port> - <refresh-timeout>10000</refresh-timeout> - </discovery-group> - </discovery-groups> - <cluster-connections> <cluster-connection name="my-cluster"> <connector-ref>artemis</connector-ref> <message-load-balancing>STRICT</message-load-balancing> <max-hops>1</max-hops> - <discovery-group-ref discovery-group-name="dg-group1"/> + <static-connectors> + <connector-ref>other</connector-ref> + </static-connectors> </cluster-connection> </cluster-connections>
