[jboss-cvs] JBoss Messaging SVN: r1941 - in trunk: src/main/org/jboss/jms/server/messagecounter and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-01-10 04:41:50 -0500 (Wed, 10 Jan 2007)
New Revision: 1941

Modified:
   trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java
   trunk/src/main/org/jboss/jms/server/messagecounter/MessageCounterManager.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
Log:
Fix failing JMX tests



Modified: trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java	2007-01-10 03:30:16 UTC (rev 1940)
+++ trunk/src/main/org/jboss/jms/server/ServerPeerMBean.java	2007-01-10 09:41:50 UTC (rev 1941)
@@ -117,6 +117,13 @@
    
    void setDefaultMessageCounterHistoryDayLimit(int limit);
    
+   List getMessageCounters() throws Exception;
+   
+   List getMessageStatistics() throws Exception;
+   
+   Set getDestinations() throws Exception;
+   
+   
    // JMX operations
    
    String createQueue(String name, String jndiName) throws Exception;
@@ -133,12 +140,6 @@
 
    boolean destroyTopic(String name) throws Exception;
 
-   Set getDestinations() throws Exception;
-   
-   List getMessageCounters() throws Exception;
-
-   List getMessageStatistics() throws Exception;
-
    String listMessageCountersAsHTML() throws Exception;
    
    void resetAllMessageCounters();

Modified: trunk/src/main/org/jboss/jms/server/messagecounter/MessageCounterManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/messagecounter/MessageCounterManager.java	2007-01-10 03:30:16 UTC (rev 1940)
+++ trunk/src/main/org/jboss/jms/server/messagecounter/MessageCounterManager.java	2007-01-10 09:41:50 UTC (rev 1941)
@@ -21,11 +21,11 @@
  */
 package org.jboss.jms.server.messagecounter;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -125,11 +125,11 @@
       }
    }
    
-   public Collection getMessageCounters()
+   public Set getMessageCounters()
    {
       synchronized (messageCounters)
       {
-         return Collections.unmodifiableCollection(messageCounters.values());
+         return new HashSet(messageCounters.values());
       }
    }
    

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java	2007-01-10 03:30:16 UTC (rev 1940)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java	2007-01-10 09:41:50 UTC (rev 1941)
@@ -23,6 +23,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
@@ -389,7 +390,7 @@
          
          
          List counters = (List)
-            ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageCounters", null, null);
+            ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageCounters");
          
          assertNotNull(counters);
          
@@ -408,7 +409,7 @@
          
          
          counters = (List)
-         ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageCounters", null, null);
+         ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageCounters");
       
          assertNotNull(counters);
       
@@ -435,7 +436,7 @@
          TemporaryQueue tempQueue = sess.createTemporaryQueue();
          
          counters = (List)
-         ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageCounters", null, null);
+         ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageCounters");
       
          assertNotNull(counters);
       
@@ -532,7 +533,7 @@
             assertTrue(html.indexOf(counter.getDestinationName()) != -1);           
          }
          
-         List stats = (List)ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageStatistics", null, null);
+         List stats = (List)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageStatistics");
          
          assertNotNull(stats);
          
@@ -559,7 +560,7 @@
          sess.unsubscribe("sub1");
          
          counters = (List)
-         ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageCounters", null, null);
+         ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageCounters");
       
          assertNotNull(counters);
       
@@ -569,7 +570,7 @@
          
          
          counters = (List)
-         ServerManagement.invoke(ServerManagement.getServerPeerObjectName(), "getMessageCounters", null, null);
+         ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "MessageCounters");
       
          assertNotNull(counters);
       
@@ -594,6 +595,48 @@
          ServerManagement.undeployTopic("Topic2");
       }
    }
+   
+   public void testGetDestinations() throws Exception
+   {
+      if (!ServerManagement.isServerPeerStarted())
+      {
+         ServerManagement.startServerPeer();
+      }
+              
+      ServerManagement.deployQueue("Queue1");
+      
+      ServerManagement.deployQueue("Queue2");
+      
+      ServerManagement.deployQueue("Queue3");
+      
+      ServerManagement.deployTopic("Topic1");
+      
+      ServerManagement.deployTopic("Topic2");
+      
+      try
+      {
+      
+         Set destinations =
+            (Set)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "Destinations");
+         
+         assertNotNull(destinations);
+         
+         assertEquals(5, destinations.size());
+      }
+      finally
+      {
+         ServerManagement.undeployQueue("Queue1");
+         
+         ServerManagement.undeployQueue("Queue2");
+         
+         ServerManagement.undeployQueue("Queue3");
+         
+         ServerManagement.undeployTopic("Topic1");
+         
+         ServerManagement.undeployTopic("Topic2");
+      }
+         
+   }
 
 
    // Package protected ---------------------------------------------