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 6e10908c50 ARTEMIS-3153 Add tests for address prefixes for AMQP links
6e10908c50 is described below
commit 6e10908c500a9c2c4b4c8e2afc0745c1b664cc8e
Author: Timothy Bish <[email protected]>
AuthorDate: Thu Jan 26 12:22:27 2023 -0500
ARTEMIS-3153 Add tests for address prefixes for AMQP links
Adds some tests to validate that the destination prefixes if set and
are used properly by the client are honored over the default address
auto create routing type condiguration.
---
.../AutoCreateWithDefaultRoutingTypesTest.java | 165 ++++++++++++++++++++-
1 file changed, 157 insertions(+), 8 deletions(-)
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AutoCreateWithDefaultRoutingTypesTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AutoCreateWithDefaultRoutingTypesTest.java
index d62293233e..bc66518022 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AutoCreateWithDefaultRoutingTypesTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AutoCreateWithDefaultRoutingTypesTest.java
@@ -24,6 +24,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -34,6 +35,7 @@ import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.transport.amqp.client.AmqpClient;
import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
@@ -70,6 +72,12 @@ public class AutoCreateWithDefaultRoutingTypesTest extends
JMSClientTestSupport
// Don't create anything by default since we are testing auto create
}
+ @Override
+ protected void configureAMQPAcceptorParameters(Map<String, Object> params) {
+ params.put("anycastPrefix", "anycast://");
+ params.put("multicastPrefix", "multicast://");
+ }
+
@Override
protected void configureAddressPolicy(ActiveMQServer server) {
Configuration serverConfig = server.getConfiguration();
@@ -83,15 +91,13 @@ public class AutoCreateWithDefaultRoutingTypesTest extends
JMSClientTestSupport
AddressSettings settings = entry.getValue();
settings.setAutoCreateQueues(true);
settings.setDefaultAddressRoutingType(routingType);
- settings.setDefaultQueueRoutingType(routingType);
logger.info("server config, isauto? {}",
entry.getValue().isAutoCreateQueues());
- logger.info("server config, default queue routing type? {}",
entry.getValue().getDefaultQueueRoutingType());
logger.info("server config, default address routing type? {}",
entry.getValue().getDefaultAddressRoutingType());
}
@Test(timeout = 30_000)
public void testCreateSender() throws Exception {
- final String addressName = "sender-address";
+ final String addressName = getTestName();
AmqpClient client = createAmqpClient();
AmqpConnection connection = addConnection(client.connect());
@@ -104,25 +110,49 @@ public class AutoCreateWithDefaultRoutingTypesTest
extends JMSClientTestSupport
assertNotNull(address);
assertEquals(Set.of(routingType), address.getRoutingTypes());
+ final AmqpReceiver receiver = session.createReceiver(addressName);
+ receiver.flow(1);
+
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
sender.close();
connection.close();
}
@Test(timeout = 30_000)
public void testCreateReceiver() throws Exception {
- final String addressName = "receiver-address";
+ final String addressName = getTestName();
AmqpClient client = createAmqpClient();
AmqpConnection connection = addConnection(client.connect());
AmqpSession session = connection.createSession();
- AmqpReceiver receiver = session.createReceiver(addressName);
+ final AmqpReceiver receiver = session.createReceiver(addressName);
+ receiver.flow(1);
AddressQueryResult address = getProxyToAddress(addressName);
assertNotNull(address);
assertEquals(Set.of(routingType), address.getRoutingTypes());
+ final AmqpSender sender = session.createSender(addressName);
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
+ sender.close();
receiver.close();
connection.close();
}
@@ -138,7 +168,7 @@ public class AutoCreateWithDefaultRoutingTypesTest extends
JMSClientTestSupport
}
private void dotestCreateSenderThatRequestsSpecificRoutingType(RoutingType
routingType) throws Exception {
- final String addressName = "sender-defined-address";
+ final String addressName = getTestName();
AmqpClient client = createAmqpClient();
AmqpConnection connection = addConnection(client.connect());
@@ -159,6 +189,18 @@ public class AutoCreateWithDefaultRoutingTypesTest extends
JMSClientTestSupport
assertNotNull(address);
assertEquals(Set.of(routingType), address.getRoutingTypes());
+ final AmqpReceiver receiver = session.createReceiver(addressName);
+ receiver.flow(1);
+
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
sender.close();
connection.close();
}
@@ -174,7 +216,7 @@ public class AutoCreateWithDefaultRoutingTypesTest extends
JMSClientTestSupport
}
private void
dotestCreateReceiverThatRequestsSpecificRoutingType(RoutingType routingType)
throws Exception {
- final String addressName = "receiver-defined-address";
+ final String addressName = getTestName();
AmqpClient client = createAmqpClient();
AmqpConnection connection = addConnection(client.connect());
@@ -188,13 +230,120 @@ public class AutoCreateWithDefaultRoutingTypesTest
extends JMSClientTestSupport
source.setCapabilities(TOPIC_CAPABILITY);
}
- AmqpReceiver receiver = session.createReceiver(source);
+ final AmqpReceiver receiver = session.createReceiver(source);
+ receiver.flow(1);
+
+ AddressQueryResult address = getProxyToAddress(addressName);
+
+ assertNotNull(address);
+ assertEquals(Set.of(routingType), address.getRoutingTypes());
+
+ final AmqpSender sender = session.createSender(addressName);
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
+ sender.close();
+ receiver.close();
+ connection.close();
+ }
+
+ @Test(timeout = 30_000)
+ public void testCreateSenderThatRequestsMultiCastViaPrefix() throws
Exception {
+
dotestCreateSenderThatRequestsSpecificRoutingTypeViaPrefix(RoutingType.MULTICAST);
+ }
+
+ @Test(timeout = 30_000)
+ public void testCreateSenderThatRequestsAnyCastViaPrefix() throws Exception
{
+
dotestCreateSenderThatRequestsSpecificRoutingTypeViaPrefix(RoutingType.ANYCAST);
+ }
+
+ private void
dotestCreateSenderThatRequestsSpecificRoutingTypeViaPrefix(RoutingType
routingType) throws Exception {
+ final String addressName = getTestName();
+
+ AmqpClient client = createAmqpClient();
+ AmqpConnection connection = addConnection(client.connect());
+ AmqpSession session = connection.createSession();
+
+ final String prefixedName;
+ if (routingType == RoutingType.ANYCAST) {
+ prefixedName = "anycast://" + addressName;
+ } else {
+ prefixedName = "multicast://" + addressName;
+ }
+
+ AmqpSender sender = session.createSender(prefixedName);
+
+ AddressQueryResult address = getProxyToAddress(addressName);
+
+ assertNotNull(address);
+ assertEquals(Set.of(routingType), address.getRoutingTypes());
+
+ final AmqpReceiver receiver = session.createReceiver(addressName);
+ receiver.flow(1);
+
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
+ sender.close();
+ receiver.close();
+ connection.close();
+ }
+
+ @Test(timeout = 30_000)
+ public void testCreateReceiverThatRequestsMultiCastViaPrefix() throws
Exception {
+
dotestCreateReceiverThatRequestsSpecificRoutingTypeViaPrefix(RoutingType.MULTICAST);
+ }
+
+ @Test(timeout = 30_000)
+ public void testCreateReceiverThatRequestsAnyCastViaPrefix() throws
Exception {
+
dotestCreateReceiverThatRequestsSpecificRoutingTypeViaPrefix(RoutingType.ANYCAST);
+ }
+
+ private void
dotestCreateReceiverThatRequestsSpecificRoutingTypeViaPrefix(RoutingType
routingType) throws Exception {
+ final String addressName = getTestName();
+
+ AmqpClient client = createAmqpClient();
+ AmqpConnection connection = addConnection(client.connect());
+ AmqpSession session = connection.createSession();
+
+ final String prefixedName;
+ if (routingType == RoutingType.ANYCAST) {
+ prefixedName = "anycast://" + addressName;
+ } else {
+ prefixedName = "multicast://" + addressName;
+ }
+
+ final AmqpReceiver receiver = session.createReceiver(prefixedName);
+ receiver.flow(1);
AddressQueryResult address = getProxyToAddress(addressName);
assertNotNull(address);
assertEquals(Set.of(routingType), address.getRoutingTypes());
+ final AmqpSender sender = session.createSender(addressName);
+ final AmqpMessage message = new AmqpMessage();
+
+ message.setMessageId("msg:1");
+ message.setText("Test-Message");
+
+ sender.send(message);
+
+ assertNotNull(receiver.receive(5, TimeUnit.SECONDS));
+
+ sender.close();
receiver.close();
connection.close();
}
