QPID-4908: Expose queue attributes MessageGroupKey and MessageGroupSharedGroups via queue MBean

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1489872 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 35 insertions, 0 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
index 448886d056..cf066e3c01 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
@@ -28,6 +28,7 @@ import org.apache.qpid.management.common.mbeans.ManagedBroker;
 import org.apache.qpid.management.common.mbeans.ManagedQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.NotificationCheckTest;
+import org.apache.qpid.server.queue.SimpleAMQQueue;
 import org.apache.qpid.server.queue.SimpleAMQQueueTest;
 import org.apache.qpid.test.client.destination.AddressBasedDestinationTest;
 import org.apache.qpid.test.utils.JMXTestUtils;
@@ -635,6 +636,40 @@ public class QueueManagementTest extends QpidBrokerTestCase
         assertMessageIndicesOn(_sourceQueue, 1,2,3,4,5,6,13);
     }
 
+    public void testGetMessageGroupKey() throws Exception
+    {
+        final String queueName = getName();
+        final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
+
+        final Object messageGroupKey = "test";
+        final Map<String, Object> arguments = Collections.singletonMap(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey);
+        managedBroker.createNewQueue(queueName, null, true, arguments);
+
+        final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
+
+        assertNotNull("Manager queue expected to be available", managedQueue);
+        assertEquals("Unexpected message group key", messageGroupKey, managedQueue.getMessageGroupKey());
+        assertEquals("Unexpected message group sharing", false, managedQueue.isMessageGroupSharedGroups());
+    }
+
+    public void testIsMessageGroupSharedGroups() throws Exception
+    {
+        final String queueName = getName();
+        final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST);
+
+        final Object messageGroupKey = "test";
+        final Map<String, Object> arguments = new HashMap<String, Object>(2);
+        arguments.put(SimpleAMQQueue.QPID_GROUP_HEADER_KEY, messageGroupKey);
+        arguments.put(SimpleAMQQueue.QPID_SHARED_MSG_GROUP, SimpleAMQQueue.SHARED_MSG_GROUP_ARG_VALUE);
+        managedBroker.createNewQueue(queueName, null, true, arguments);
+
+        final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName);
+
+        assertNotNull("Manager queue expected to be available", managedQueue);
+        assertEquals("Unexpected message group key", messageGroupKey, managedQueue.getMessageGroupKey());
+        assertEquals("Unexpected message group sharing", true, managedQueue.isMessageGroupSharedGroups());
+    }
+
     @Override
     public Message createNextMessage(Session session, int messageNumber) throws JMSException
     {