[1/2] activemq-artemis git commit: This closes #1769

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[1/2] activemq-artemis git commit: This closes #1769

jbertram
Repository: activemq-artemis
Updated Branches:
  refs/heads/master c959d0c67 -> 629dd2c35


This closes #1769


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/629dd2c3
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/629dd2c3
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/629dd2c3

Branch: refs/heads/master
Commit: 629dd2c35801cc212b5cf8549474e9875f3a8ebe
Parents: c959d0c efec2d3
Author: Justin Bertram <[hidden email]>
Authored: Thu Jan 11 09:38:44 2018 -0600
Committer: Justin Bertram <[hidden email]>
Committed: Thu Jan 11 09:38:44 2018 -0600

----------------------------------------------------------------------
 .../tests/integration/amqp/JMSMessageProducerTest.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


Reply | Threaded
Open this post in threaded view
|

[2/2] activemq-artemis git commit: ARTEMIS-1576 Fix test that was broken with changes on this issue

jbertram
ARTEMIS-1576 Fix test that was broken with changes on this issue

The test is using the wrong indices for the destinations it uses so they
don't match the one's created in the test support class.  Because the
code is now using the default routing type the test fails when it tries
to send a message on a JMS Queue when the auto created address default
to the multicast routing type.

Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/efec2d34
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/efec2d34
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/efec2d34

Branch: refs/heads/master
Commit: efec2d3464ef57c50c1104c7c980d2511a3858ee
Parents: c959d0c
Author: Timothy Bish <[hidden email]>
Authored: Wed Jan 10 16:44:25 2018 -0500
Committer: Justin Bertram <[hidden email]>
Committed: Thu Jan 11 09:38:44 2018 -0600

----------------------------------------------------------------------
 .../tests/integration/amqp/JMSMessageProducerTest.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/efec2d34/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageProducerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageProducerTest.java
index 408dbcb..95f5a4b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSMessageProducerTest.java
@@ -16,6 +16,9 @@
  */
 package org.apache.activemq.artemis.tests.integration.amqp;
 
+import java.util.Random;
+import java.util.UUID;
+
 import javax.jms.Connection;
 import javax.jms.Destination;
 import javax.jms.Message;
@@ -26,8 +29,6 @@ import javax.jms.Session;
 import javax.jms.TemporaryQueue;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
-import java.util.Random;
-import java.util.UUID;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -103,7 +104,7 @@ public class JMSMessageProducerTest extends JMSClientTestSupport {
          Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
          MessageProducer p = session.createProducer(null);
 
-         for (int i = 1; i <= getPrecreatedQueueSize(); i++) {
+         for (int i = 0; i < getPrecreatedQueueSize(); i++) {
             javax.jms.Queue target = session.createQueue(getQueueName(i));
             TextMessage message = session.createTextMessage("message for " + target.getQueueName());
             p.send(target, message);
@@ -115,7 +116,7 @@ public class JMSMessageProducerTest extends JMSClientTestSupport {
          Message m = messageConsumer.receive(200);
          Assert.assertNull(m);
 
-         for (int i = 1; i <= getPrecreatedQueueSize(); i++) {
+         for (int i = 0; i < getPrecreatedQueueSize(); i++) {
             javax.jms.Queue target = session.createQueue(getQueueName(i));
             MessageConsumer consumer = session.createConsumer(target);
             TextMessage tm = (TextMessage) consumer.receive(2000);