[jboss-cvs] JBoss Messaging SVN: r4787 - in trunk: src/main/org/jboss/messaging/core/management/impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 8 05:11:24 EDT 2008
Author: jmesnil
Date: 2008-08-08 05:11:24 -0400 (Fri, 08 Aug 2008)
New Revision: 4787
Modified:
trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
Log:
added management attributes to QueueControlMBean & JMSQeueControlMBean
Modified: trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/src/main/org/jboss/messaging/core/management/QueueControlMBean.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -66,6 +66,8 @@
String getExpiryQueue();
String getDLQ();
+
+ boolean isBackup();
// Operations ----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/QueueControl.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -108,6 +108,11 @@
return queue.isTemporary();
}
+ public boolean isBackup()
+ {
+ return queue.isBackup();
+ }
+
public int getMessageCount()
{
return queue.getMessageCount();
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/JMSQueueControlMBean.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -40,10 +40,32 @@
{
// Attributes ----------------------------------------------------
+ String getName();
+
String getExpiryQueue();
String getDLQ();
+ int getMessagesAdded();
+
+ boolean isClustered();
+
+ boolean isTemporary();
+
+ boolean isDurable();
+
+ long getSizeBytes();
+
+ int getMaxSizeBytes();
+
+ int getMessageCount();
+
+ long getScheduledCount();
+
+ int getConsumerCount();
+
+ int getDeliveringCount();
+
// Operations ----------------------------------------------------
@Operation(desc = "List all messages in the queue", impact = INFO)
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSQueueControl.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -106,11 +106,51 @@
return managedQueue.isTemporary();
}
- public int getMessageCount() throws Exception
+ public int getMessageCount()
{
return coreQueue.getMessageCount();
}
+ public int getMessagesAdded()
+ {
+ return coreQueue.getMessagesAdded();
+ }
+
+ public int getConsumerCount()
+ {
+ return coreQueue.getConsumerCount();
+ }
+
+ public int getDeliveringCount()
+ {
+ return coreQueue.getDeliveringCount();
+ }
+
+ public int getMaxSizeBytes()
+ {
+ return coreQueue.getMaxSizeBytes();
+ }
+
+ public long getScheduledCount()
+ {
+ return coreQueue.getScheduledCount();
+ }
+
+ public long getSizeBytes()
+ {
+ return coreQueue.getSizeBytes();
+ }
+
+ public boolean isClustered()
+ {
+ return coreQueue.isClustered();
+ }
+
+ public boolean isDurable()
+ {
+ return coreQueue.isDurable();
+ }
+
public String getJNDIBinding()
{
return binding;
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/management/impl/QueueControlTest.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -189,7 +189,26 @@
verify(queue, storageManager, postOffice, repository);
}
+
+ public void testIsBackup() throws Exception
+ {
+ boolean backup = randomBoolean();
+ Queue queue = createMock(Queue.class);
+ expect(queue.isBackup()).andReturn(backup);
+ StorageManager storageManager = createMock(StorageManager.class);
+ PostOffice postOffice = createMock(PostOffice.class);
+ HierarchicalRepository<QueueSettings> repository = createMock(HierarchicalRepository.class);
+
+ replay(queue, storageManager, postOffice, repository);
+
+ QueueControlMBean control = new QueueControl(queue, storageManager,
+ postOffice, repository);
+ assertEquals(backup, control.isBackup());
+
+ verify(queue, storageManager, postOffice, repository);
+ }
+
public void testGetMessageCount() throws Exception
{
int count = randomInt();
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2008-08-08 07:48:55 UTC (rev 4786)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/jms/server/management/impl/JMSQueueControlTest.java 2008-08-08 09:11:24 UTC (rev 4787)
@@ -145,7 +145,47 @@
verify(coreQueue, serverManager);
}
+
+ public void testIsClustered() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ boolean clustered = randomBoolean();
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.isClustered()).andReturn(clustered);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(clustered, control.isClustered());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testIsDurabled() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ boolean durable = randomBoolean();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.isDurable()).andReturn(durable);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(durable, control.isDurable());
+
+ verify(coreQueue, serverManager);
+ }
+
public void testGetMessageCount() throws Exception
{
String jndiBinding = randomString();
@@ -165,7 +205,127 @@
verify(coreQueue, serverManager);
}
+
+ public void testGetMessagesAdded() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int count = randomInt();
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getMessagesAdded()).andReturn(count);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(count, control.getMessagesAdded());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testGetConsumerCount() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int count = randomInt();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getConsumerCount()).andReturn(count);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(count, control.getConsumerCount());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testGetDeliveringCount() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int count = randomInt();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getDeliveringCount()).andReturn(count);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(count, control.getDeliveringCount());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testGetMaxSizeBytes() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int size = randomInt();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getMaxSizeBytes()).andReturn(size);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(size, control.getMaxSizeBytes());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testGetSizeBytes() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int size = randomInt();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getSizeBytes()).andReturn(size);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(size, control.getSizeBytes());
+
+ verify(coreQueue, serverManager);
+ }
+
+ public void testGetScheduledCount() throws Exception
+ {
+ String jndiBinding = randomString();
+ String name = randomString();
+ int count = randomInt();
+
+ JBossQueue queue = new JBossQueue(name);
+ Queue coreQueue = createMock(Queue.class);
+ expect(coreQueue.getScheduledCount()).andReturn(count);
+ JMSServerManager serverManager = createMock(JMSServerManager.class);
+
+ replay(coreQueue, serverManager);
+
+ JMSQueueControl control = new JMSQueueControl(queue, coreQueue,
+ jndiBinding, serverManager);
+ assertEquals(count, control.getScheduledCount());
+
+ verify(coreQueue, serverManager);
+ }
+
public void testGetDLQ() throws Exception
{
String jndiBinding = randomString();
More information about the jboss-cvs-commits
mailing list