Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA rename queue in test to avoid collision 

Avoids issue with other tests that could persist same queue name, making intermittent failure.
This commit is contained in:
Michael André Pearce 2018-09-08 02:26:38 +01:00
parent 3cedfbdd87
commit 07aa0f732c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
View File

@ -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");

4
tests/integration-tests/src/test/resources/reload-queue-filter-updated.xml
View File

@ -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>

4
tests/integration-tests/src/test/resources/reload-queue-filter.xml
View File

@ -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>