From 3b4872e1a2ad98558d74de6098b1c5dd597b374f Mon Sep 17 00:00:00 2001 From: gtully Date: Fri, 26 Mar 2021 14:42:03 +0000 Subject: [PATCH] ARTEMIS-3128 - add test of large message browse opentype support --- .../apache/activemq/artemis/core/server/Queue.java | 2 +- .../SimpleStreamingLargeMessageTest.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java index 5b1d1285af..39abbc4769 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java @@ -392,7 +392,7 @@ public interface Queue extends Bindable,CriticalComponent { Pair checkRedelivery(MessageReference ref, long timeBase, boolean ignoreRedeliveryDelay) throws Exception; /** - * It will iterate thorugh memory only (not paging) + * It will iterate through memory only (not paging) * * @return */ diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java index 58dae39cba..3ab129be7e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/largemessages/SimpleStreamingLargeMessageTest.java @@ -25,17 +25,21 @@ import javax.jms.Message; import javax.jms.MessageConsumer; import javax.jms.MessageProducer; import javax.jms.Session; +import javax.management.openmbean.CompositeData; import java.net.URI; import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; +import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.api.core.management.QueueControl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.LargeServerMessage; import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.tests.integration.amqp.AmqpClientTestSupport; +import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper; import org.apache.activemq.artemis.tests.util.Wait; import org.apache.activemq.artemis.utils.collections.LinkedListIterator; import org.apache.activemq.transport.amqp.client.AmqpClient; @@ -349,6 +353,15 @@ public class SimpleStreamingLargeMessageTest extends AmqpClientTestSupport { server.start(); + + QueueControl queueControl = ManagementControlHelper.createQueueControl(queue.getAddress(), queue.getName(), RoutingType.ANYCAST, this.mBeanServer); + CompositeData[] browseResult = queueControl.browse(); + assertEquals(1, browseResult.length); + + if ((boolean) browseResult[0].get("largeMessage")) { + assertTrue(browseResult[0].containsKey("BodyPreview")); + } + connection = client.createConnection(); addConnection(connection); connection.setMaxFrameSize(2 * 1024);