Repository: activemq-artemis Updated Branches: refs/heads/master 3cedfbdd8 -> fe8a4b78c
NO-JIRA rename queue in test to avoid collision Avoids issue with other tests that could persist same queue name, making intermittent failure. Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/07aa0f73 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/07aa0f73 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/07aa0f73 Branch: refs/heads/master Commit: 07aa0f732c61f1b99e5a89049eb075ccabf2fe73 Parents: 3cedfbd Author: Michael André Pearce <michael.andre.pea...@me.com> Authored: Sat Sep 8 02:26:38 2018 +0100 Committer: Michael André Pearce <michael.andre.pea...@me.com> Committed: Sat Sep 8 02:26:38 2018 +0100 ---------------------------------------------------------------------- .../artemis/tests/integration/jms/RedeployTest.java | 12 ++++++------ .../src/test/resources/reload-queue-filter-updated.xml | 4 ++-- .../src/test/resources/reload-queue-filter.xml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07aa0f73/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 600eead..07bc22e 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 @@ -136,7 +136,7 @@ public class RedeployTest extends ActiveMQTestBase { Connection connection = factory.createConnection(); Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE)) { connection.start(); - Queue queue = session.createQueue("myQueue"); + Queue queue = session.createQueue("myFilterQueue"); MessageProducer producer = session.createProducer(queue); Message message = session.createMessage(); message.setStringProperty("x", "x"); @@ -151,14 +151,14 @@ public class RedeployTest extends ActiveMQTestBase { Connection connection = factory.createConnection(); Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE)) { connection.start(); - Queue queue = session.createQueue("myQueue"); + Queue queue = session.createQueue("myFilterQueue"); MessageProducer producer = session.createProducer(queue); Message message = session.createTextMessage("hello"); message.setStringProperty("x", "x"); producer.send(message); } - Binding binding = embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString("myQueue")); + Binding binding = embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString("myFilterQueue")); Files.copy(url2.openStream(), brokerXML, StandardCopyOption.REPLACE_EXISTING); brokerXML.toFile().setLastModified(System.currentTimeMillis() + 1000); @@ -166,7 +166,7 @@ public class RedeployTest extends ActiveMQTestBase { embeddedActiveMQ.getActiveMQServer().getReloadManager().setTick(tick); latch.await(10, TimeUnit.SECONDS); - Binding bindingAfterChange = embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString("myQueue")); + Binding bindingAfterChange = embeddedActiveMQ.getActiveMQServer().getPostOffice().getBinding(SimpleString.toSimpleString("myFilterQueue")); assertTrue("Instance should be the same (as should be non destructive)", binding == bindingAfterChange); assertEquals(binding.getID(), bindingAfterChange.getID()); @@ -176,7 +176,7 @@ public class RedeployTest extends ActiveMQTestBase { Connection connection = factory.createConnection(); Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE)) { connection.start(); - Queue queue = session.createQueue("myQueue"); + Queue queue = session.createQueue("myFilterQueue"); MessageConsumer consumer = session.createConsumer(queue); Message message = consumer.receive(5000); assertNotNull(message); @@ -188,7 +188,7 @@ public class RedeployTest extends ActiveMQTestBase { Connection connection = factory.createConnection(); Session session = connection.createSession(Session.AUTO_ACKNOWLEDGE)) { connection.start(); - Queue queue = session.createQueue("myQueue"); + Queue queue = session.createQueue("myFilterQueue"); MessageProducer producer = session.createProducer(queue); Message message = session.createMessage(); message.setStringProperty("x", "y"); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07aa0f73/tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml b/tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml index 37ef67d..28a96a8 100644 --- a/tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml +++ b/tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml @@ -30,9 +30,9 @@ under the License. </acceptors> <addresses> - <address name="myQueue"> + <address name="myFilterQueue"> <anycast> - <queue name="myQueue"> + <queue name="myFilterQueue"> <filter string="x = 'y'"/> </queue> </anycast> http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/07aa0f73/tests/integration-tests/src/test/resources/reload-queue-filter.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/resources/reload-queue-filter.xml b/tests/integration-tests/src/test/resources/reload-queue-filter.xml index 47dbadc..bb247b4 100644 --- a/tests/integration-tests/src/test/resources/reload-queue-filter.xml +++ b/tests/integration-tests/src/test/resources/reload-queue-filter.xml @@ -30,9 +30,9 @@ under the License. </acceptors> <addresses> - <address name="myQueue"> + <address name="myFilterQueue"> <anycast> - <queue name="myQueue"> + <queue name="myFilterQueue"> <filter string="x = 'x'"/> </queue> </anycast>