Author: robbie
Date: Wed Apr 25 16:07:29 2012
New Revision: 1330378
URL: http://svn.apache.org/viewvc?rev=1330378&view=rev
Log:
NO-JIRA: expand the systest to verify the virtualhost and broker 'total'
statistics when publishing and consuming
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java?rev=1330378&r1=1330377&r2=1330378&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/NewStatisticsSystemTest.java
Wed Apr 25 16:07:29 2012
@@ -29,19 +29,21 @@ import javax.jms.Session;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.BasicMessageConsumer;
+import org.apache.qpid.management.common.mbeans.ManagedBroker;
import org.apache.qpid.management.common.mbeans.ManagedConnection;
+import org.apache.qpid.management.common.mbeans.ServerInformation;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-/** NEW ONE */
public class NewStatisticsSystemTest extends QpidBrokerTestCase
{
private static final String TEST_USER = "admin";
private static final String TEST_PASSWORD = "admin";
+ private static final int MESSAGE_COUNT_TEST = 5;
+ private static final int MESSAGE_COUNT_DEV = 9;
private JMXTestUtils _jmxUtils;
- private Connection _test1, _test2, _dev;
+ private Connection _test1, _dev;
protected Destination _queue;
protected String _brokerUrl;
@@ -56,11 +58,9 @@ public class NewStatisticsSystemTest ext
_brokerUrl = getBroker().toString();
_test1 = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "test");
- //_test2 = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "test");
_dev = new AMQConnection(_brokerUrl, TEST_USER, TEST_PASSWORD,
"clientid", "development");
_test1.start();
- //_test2.start();
_dev.start();
_jmxUtils.open();
@@ -76,25 +76,78 @@ public class NewStatisticsSystemTest ext
public void testStats() throws Exception
{
- Session testSession = _test1.createSession(false,
Session.SESSION_TRANSACTED);
- //Session devSession = _dev.createSession(false,
Session.SESSION_TRANSACTED);
+ final Session testSession = _test1.createSession(true,
Session.SESSION_TRANSACTED);
+ final Session developmentSession = _dev.createSession(true,
Session.SESSION_TRANSACTED);
- //Create queue
- Queue testQueue = testSession.createQueue(getTestQueueName());
+ final Queue developmentQueue =
developmentSession.createQueue(getTestQueueName());
+ final Queue testQueue = testSession.createQueue(getTestQueueName());
+
+ //Create queues by opening and closing consumers
MessageConsumer testConsumer = testSession.createConsumer(testQueue);
testConsumer.close();
+ MessageConsumer developmentConsumer =
developmentSession.createConsumer(developmentQueue);
+ developmentConsumer.close();
//Check initial values
checkSingleConnectionOnVHostStatistics("test", 0, 0, 0, 0);
+ checkVHostStatistics("test", 0, 0, 0, 0);
checkSingleConnectionOnVHostStatistics("development", 0, 0, 0, 0);
+ checkVHostStatistics("development", 0, 0, 0, 0);
+ checkBrokerStatistics(0, 0, 0, 0);
- //Send messages via test session (test vhost) and sync
+ //Send messages via connection on 'test' virtual host and sync
sendMessage(testSession, testQueue, 5);
((AMQSession<?,?>)testSession).sync();
//Check values
- checkSingleConnectionOnVHostStatistics("test", 5, 0, 5 *
DEFAULT_MESSAGE_SIZE, 0);
+ checkSingleConnectionOnVHostStatistics("test", MESSAGE_COUNT_TEST, 0,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE, 0);
+ checkVHostStatistics("test", MESSAGE_COUNT_TEST, 0, MESSAGE_COUNT_TEST
* DEFAULT_MESSAGE_SIZE, 0);
checkSingleConnectionOnVHostStatistics("development", 0, 0, 0, 0);
+ checkVHostStatistics("development", 0, 0, 0, 0);
+ checkBrokerStatistics(MESSAGE_COUNT_TEST, 0, MESSAGE_COUNT_TEST *
DEFAULT_MESSAGE_SIZE, 0);
+
+ //Send messages via connection on 'development' virtual host and sync
+ sendMessage(developmentSession, developmentQueue, 9);
+ ((AMQSession<?,?>)testSession).sync();
+
+ //Check values
+ checkSingleConnectionOnVHostStatistics("test", MESSAGE_COUNT_TEST, 0,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE, 0);
+ checkVHostStatistics("test", MESSAGE_COUNT_TEST, 0, MESSAGE_COUNT_TEST
* DEFAULT_MESSAGE_SIZE, 0);
+ checkSingleConnectionOnVHostStatistics("development",
MESSAGE_COUNT_DEV, 0, MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE, 0);
+ checkVHostStatistics("development", MESSAGE_COUNT_DEV, 0,
MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE, 0);
+ checkBrokerStatistics(MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV, 0,
(MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV) * DEFAULT_MESSAGE_SIZE, 0);
+
+ //consume the messages on the 'test' virtual host
+ testConsumer = testSession.createConsumer(testQueue);
+ for (int i = 0 ; i < MESSAGE_COUNT_TEST ; i++)
+ {
+ assertNotNull("an expected message was not recieved",
testConsumer.receive(1500));
+ }
+ testSession.commit();
+ testConsumer.close();
+
+ //Check values
+ checkSingleConnectionOnVHostStatistics("test", MESSAGE_COUNT_TEST,
MESSAGE_COUNT_TEST, MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE);
+ checkVHostStatistics("test", MESSAGE_COUNT_TEST, MESSAGE_COUNT_TEST,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE, MESSAGE_COUNT_TEST *
DEFAULT_MESSAGE_SIZE);
+ checkSingleConnectionOnVHostStatistics("development",
MESSAGE_COUNT_DEV, 0, MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE, 0);
+ checkVHostStatistics("development", MESSAGE_COUNT_DEV, 0,
MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE, 0);
+ checkBrokerStatistics(MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV,
MESSAGE_COUNT_TEST, (MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV) *
DEFAULT_MESSAGE_SIZE, MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE);
+
+ //consume the messages on the 'development' virtual host
+ developmentConsumer =
developmentSession.createConsumer(developmentQueue);
+ for (int i = 0 ; i < MESSAGE_COUNT_DEV ; i++)
+ {
+ assertNotNull("an expected message was not recieved",
developmentConsumer.receive(1500));
+ }
+ developmentSession.commit();
+ developmentConsumer.close();
+
+ //Check values
+ checkSingleConnectionOnVHostStatistics("test", MESSAGE_COUNT_TEST,
MESSAGE_COUNT_TEST, MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE);
+ checkVHostStatistics("test", MESSAGE_COUNT_TEST, MESSAGE_COUNT_TEST,
MESSAGE_COUNT_TEST * DEFAULT_MESSAGE_SIZE, MESSAGE_COUNT_TEST *
DEFAULT_MESSAGE_SIZE);
+ checkSingleConnectionOnVHostStatistics("development",
MESSAGE_COUNT_DEV, MESSAGE_COUNT_DEV, MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE,
MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE);
+ checkVHostStatistics("development", MESSAGE_COUNT_DEV,
MESSAGE_COUNT_DEV, MESSAGE_COUNT_DEV * DEFAULT_MESSAGE_SIZE, MESSAGE_COUNT_DEV
* DEFAULT_MESSAGE_SIZE);
+ checkBrokerStatistics(MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV,
MESSAGE_COUNT_TEST + MESSAGE_COUNT_DEV, (MESSAGE_COUNT_TEST +
MESSAGE_COUNT_DEV) * DEFAULT_MESSAGE_SIZE, (MESSAGE_COUNT_TEST +
MESSAGE_COUNT_DEV) * DEFAULT_MESSAGE_SIZE);
}
private void checkSingleConnectionOnVHostStatistics(String vHostName, long
messagesSent, long messagesReceived, long dataSent, long dataReceived)
@@ -110,4 +163,26 @@ public class NewStatisticsSystemTest ext
assertEquals(dataSent, managedConnection.getTotalDataReceived());
assertEquals(dataReceived, managedConnection.getTotalDataDelivered());
}
+
+ private void checkVHostStatistics(String vHostName, long messagesSent,
long messagesReceived, long dataSent, long dataReceived)
+ {
+ ManagedBroker vhost = _jmxUtils.getManagedBroker(vHostName);
+
+ assertEquals(messagesSent, vhost.getTotalMessagesReceived());
+ assertEquals(messagesReceived, vhost.getTotalMessagesDelivered());
+
+ assertEquals(dataSent, vhost.getTotalDataReceived());
+ assertEquals(dataReceived, vhost.getTotalDataDelivered());
+ }
+
+ private void checkBrokerStatistics(long messagesSent, long
messagesReceived, long dataSent, long dataReceived)
+ {
+ ServerInformation broker = _jmxUtils.getServerInformation();
+
+ assertEquals(messagesSent, broker.getTotalMessagesReceived());
+ assertEquals(messagesReceived, broker.getTotalMessagesDelivered());
+
+ assertEquals(dataSent, broker.getTotalDataReceived());
+ assertEquals(dataReceived, broker.getTotalDataDelivered());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
