You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2021/08/19 11:20:59 UTC
[activemq-artemis] branch main updated: ARTEMIS-3423: remaining
#3697 feedback,
move the non-shared sub test out of the shared sub test class
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new fac1c43 ARTEMIS-3423: remaining #3697 feedback, move the non-shared sub test out of the shared sub test class
fac1c43 is described below
commit fac1c4320d02a81b3f00981ced85b1c920f8e3f3
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Thu Aug 19 11:42:20 2021 +0100
ARTEMIS-3423: remaining #3697 feedback, move the non-shared sub test out of the shared sub test class
---
.../integration/amqp/JMSDurableConsumerTest.java | 43 ++++++++++++++++++++++
.../amqp/JMSSharedDurableConsumerTest.java | 42 ---------------------
2 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSDurableConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSDurableConsumerTest.java
index 00ea410..614b172 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSDurableConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSDurableConsumerTest.java
@@ -35,8 +35,10 @@ import javax.jms.Session;
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.QueueImpl;
import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Assert;
import org.junit.Test;
@@ -268,4 +270,45 @@ public class JMSDurableConsumerTest extends JMSClientTestSupport {
}
}
}
+
+ @Test(timeout = 30000)
+ public void testDurableConsumerWithSelectorChange() throws Exception {
+ SimpleString qName = new SimpleString("foo.SharedConsumer");
+ Connection connection = createConnection("foo", true);
+ try {
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ Topic topic = session.createTopic(getTopicName());
+
+ MessageConsumer consumer = session.createDurableConsumer(topic, "SharedConsumer", "a=b", false);
+ MessageProducer producer = session.createProducer(session.createTopic(getTopicName()));
+ Message message = session.createMessage();
+ message.setStringProperty("a", "1");
+ message.setStringProperty("b", "1");
+ producer.send(message);
+
+ QueueImpl queue = (QueueImpl) server.getPostOffice().getBinding(qName).getBindable();
+ assertEquals(1, queue.getMaxConsumers());
+ Wait.assertEquals(1, queue::getMessageCount);
+ consumer.close();
+ MessageConsumer consumer2 = session.createDurableConsumer(topic, "SharedConsumer", "a=b and b=c", false);
+ queue = (QueueImpl) server.getPostOffice().getBinding(qName).getBindable();
+ assertEquals(1, queue.getMaxConsumers());
+ Wait.assertEquals(0, queue::getMessageCount);
+
+ message = session.createMessage();
+ message.setStringProperty("a", "2");
+ message.setStringProperty("b", "2");
+ message.setStringProperty("c", "2");
+ producer.send(message);
+
+ Wait.assertEquals(1, queue::getMessageCount);
+
+ connection.start();
+
+ Assert.assertNotNull(consumer2.receive(5000));
+ } finally {
+ connection.close();
+ }
+ }
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSharedDurableConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSharedDurableConsumerTest.java
index 3bf07c1..dacbb32 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSharedDurableConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSSharedDurableConsumerTest.java
@@ -36,7 +36,6 @@ import org.apache.activemq.artemis.tests.util.Wait;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
-import org.wildfly.common.Assert;
@RunWith(Parameterized.class)
public class JMSSharedDurableConsumerTest extends JMSClientTestSupport {
@@ -169,45 +168,4 @@ public class JMSSharedDurableConsumerTest extends JMSClientTestSupport {
connection.close();
}
}
-
- @Test(timeout = 30000)
- public void testDurableConsumerWithSelectorChange() throws Exception {
- SimpleString qName = new SimpleString("foo.SharedConsumer");
- Connection connection = createConnection("foo", true);
- try {
- Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- Topic topic = session.createTopic(getTopicName());
-
- MessageConsumer consumer = session.createDurableConsumer(topic, "SharedConsumer", "a=b", false);
- MessageProducer producer = session.createProducer(session.createTopic(getTopicName()));
- Message message = session.createMessage();
- message.setStringProperty("a", "1");
- message.setStringProperty("b", "1");
- producer.send(message);
-
- QueueImpl queue = (QueueImpl) server.getPostOffice().getBinding(qName).getBindable();
- assertEquals(1, queue.getMaxConsumers());
- Wait.assertEquals(1, queue::getMessageCount);
- consumer.close();
- MessageConsumer consumer2 = session.createDurableConsumer(topic, "SharedConsumer", "a=b and b=c", false);
- queue = (QueueImpl) server.getPostOffice().getBinding(qName).getBindable();
- assertEquals(1, queue.getMaxConsumers());
- Wait.assertEquals(0, queue::getMessageCount);
-
- message = session.createMessage();
- message.setStringProperty("a", "2");
- message.setStringProperty("b", "2");
- message.setStringProperty("c", "2");
- producer.send(message);
-
- Wait.assertEquals(1, queue::getMessageCount);
-
- connection.start();
-
- Assert.assertNotNull(consumer2.receive(5000));
- } finally {
- connection.close();
- }
- }
}