From df552a1a4862615bad7335409fc6df1a80368911 Mon Sep 17 00:00:00 2001 From: Bhupendra Bhusman Bhardwaj Date: Wed, 7 Mar 2007 11:39:21 +0000 Subject: 1. Fixed the AMQQueueMBeanTest failures due to changes in AMQQueuMBean.getQueueDepth() from queueDepth/1000 to (queueDepth >> 10) 2. Revision: 513748 Author: bhupendrab Date: 13:26:51, 02 March 2007 Message: QPID-390 Added test case for all the AMQQueue alerts ---- Modified : /incubator/qpid/branches/perftesting/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java Added : /incubator/qpid/branches/perftesting/qpid/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@515539 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/queue/AMQQueueMBeanTest.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'java/systests/src/main') diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java index 26332579cb..015138ee6f 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java @@ -42,6 +42,7 @@ import java.util.HashSet; */ public class AMQQueueMBeanTest extends TestCase { + private static long MESSAGE_SIZE = 1000; private AMQQueue _queue; private AMQQueueMBean _queueMBean; private QueueRegistry _queueRegistry; @@ -61,7 +62,8 @@ public class AMQQueueMBeanTest extends TestCase sendMessages(messageCount); assertTrue(_queueMBean.getMessageCount() == messageCount); assertTrue(_queueMBean.getReceivedMessageCount() == messageCount); - assertTrue(_queueMBean.getQueueDepth() == 10); + long queueDepth = (messageCount * MESSAGE_SIZE) >> 10; + assertTrue(_queueMBean.getQueueDepth() == queueDepth); _queueMBean.deleteMessageFromTop(); assertTrue(_queueMBean.getMessageCount() == messageCount - 1); @@ -101,13 +103,14 @@ public class AMQQueueMBeanTest extends TestCase public void testGeneralProperties() { + long maxQueueDepth = 1000; // in bytes _queueMBean.setMaximumMessageCount(50000); _queueMBean.setMaximumMessageSize(2000l); - _queueMBean.setMaximumQueueDepth(1000l); + _queueMBean.setMaximumQueueDepth(maxQueueDepth); assertTrue(_queueMBean.getMaximumMessageCount() == 50000); assertTrue(_queueMBean.getMaximumMessageSize() == 2000); - assertTrue(_queueMBean.getMaximumQueueDepth() == 1000); + assertTrue(_queueMBean.getMaximumQueueDepth() == (maxQueueDepth >> 10)); assertTrue(_queueMBean.getName().equals("testQueue")); assertTrue(_queueMBean.getOwner().equals("AMQueueMBeanTest")); @@ -150,8 +153,10 @@ public class AMQQueueMBeanTest extends TestCase AMQMessage msg = message(false); long id = msg.getMessageId(); _queue.clearQueue(_storeContext); - _queue.process(_storeContext, msg, false); + + msg.enqueue(_queue); msg.routingComplete(_messageStore, _storeContext, new MessageHandleFactory()); + _queue.process(_storeContext, msg, false); _queueMBean.viewMessageContent(id); try { @@ -212,15 +217,12 @@ public class AMQQueueMBeanTest extends TestCase for (int i = 0; i < messages.length; i++) { messages[i] = message(false); + messages[i].enqueue(_queue); + messages[i].routingComplete(_messageStore, _storeContext, new MessageHandleFactory()); } for (int i = 0; i < messageCount; i++) { _queue.process(_storeContext, messages[i], false); } - - for (int i = 0; i < messages.length; i++) - { - messages[i].routingComplete(_messageStore, _storeContext, new MessageHandleFactory()); - } } } -- cgit v1.2.1