[jboss-cvs] JBoss Messaging SVN: r6664 - trunk/tests/src/org/jboss/messaging/tests/integration/management.

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

Author: timfox
Date: 2009-05-05 13:24:29 -0400 (Tue, 05 May 2009)
New Revision: 6664

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
Log:
more fixes

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java	2009-05-05 17:23:57 UTC (rev 6663)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java	2009-05-05 17:24:29 UTC (rev 6664)
@@ -71,13 +71,31 @@
 
    public Object retrieveAttributeValue(String attributeName)
    {
+      return retrieveAttributeValue(attributeName, null);
+   }
+   
+   public Object retrieveAttributeValue(String attributeName, Class desiredType)
+   {
       ClientMessage m = session.createClientMessage(false);
       ManagementHelper.putAttribute(m, resourceName, attributeName);
       ClientMessage reply;
       try
       {
          reply = requestor.request(m);
-         return ManagementHelper.getResult(reply);
+         Object result = ManagementHelper.getResult(reply);
+         
+         if (desiredType != null && desiredType != result.getClass())
+         {
+            //Conversions
+            if (desiredType == Long.class && result.getClass() == Integer.class)
+            {
+               Integer in = (Integer)result;
+               
+               result = new Long(in.intValue());
+            }
+         }
+         
+         return result;
       }
       catch (Exception e)
       {

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java	2009-05-05 17:23:57 UTC (rev 6663)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlTest.java	2009-05-05 17:24:29 UTC (rev 6664)
@@ -81,7 +81,7 @@
       assertEquals(conf.getThreadPoolMaxSize(), serverControl.getThreadPoolMaxSize());
       assertEquals(conf.getSecurityInvalidationInterval(), serverControl.getSecurityInvalidationInterval());
       assertEquals(conf.isSecurityEnabled(), serverControl.isSecurityEnabled());
-      assertEquals(conf.getInterceptorClassNames(), serverControl.getInterceptorClassNames());
+      assertEquals(conf.getInterceptorClassNames().size(), serverControl.getInterceptorClassNames().length);
       assertEquals(conf.getConnectionScanPeriod(), serverControl.getConnectionScanPeriod());
       assertEquals(conf.getConnectionTTLOverride(), serverControl.getConnectionTTLOverride());
       assertEquals(conf.getBackupConnectorName(), serverControl.getBackupConnectorName());

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java	2009-05-05 17:23:57 UTC (rev 6663)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/MessagingServerControlUsingCoreTest.java	2009-05-05 17:24:29 UTC (rev 6664)
@@ -148,12 +148,12 @@
 
          public long getConnectionScanPeriod()
          {
-            return (Long)proxy.retrieveAttributeValue("ConnectionScanPeriod");
+            return (Long)proxy.retrieveAttributeValue("ConnectionScanPeriod", Long.class);
          }
 
          public long getConnectionTTLOverride()
          {
-            return (Long)proxy.retrieveAttributeValue("ConnectionTTLOverride");
+            return (Long)proxy.retrieveAttributeValue("ConnectionTTLOverride", Long.class);
          }
 
          public Object[] getConnectors() throws Exception
@@ -218,7 +218,7 @@
 
          public long getManagementRequestTimeout()
          {
-            return (Long)proxy.retrieveAttributeValue("ManagementRequestTimeout");
+            return (Long)proxy.retrieveAttributeValue("ManagementRequestTimeout", Long.class);
          }
 
          public int getMessageCounterMaxDayCount()
@@ -228,17 +228,17 @@
 
          public long getMessageCounterSamplePeriod()
          {
-            return (Long)proxy.retrieveAttributeValue("MessageCounterSamplePeriod");
+            return (Long)proxy.retrieveAttributeValue("MessageCounterSamplePeriod", Long.class);
          }
 
          public long getMessageExpiryScanPeriod()
          {
-            return (Long)proxy.retrieveAttributeValue("MessageExpiryScanPeriod");
+            return (Long)proxy.retrieveAttributeValue("MessageExpiryScanPeriod", Long.class);
          }
 
          public long getMessageExpiryThreadPriority()
          {
-            return (Long)proxy.retrieveAttributeValue("MessageExpiryThreadPriority");
+            return (Long)proxy.retrieveAttributeValue("MessageExpiryThreadPriority", Long.class);
          }
 
          public String getPagingDirectory()
@@ -253,12 +253,12 @@
 
          public long getPagingMaxGlobalSizeBytes()
          {
-            return (Long)proxy.retrieveAttributeValue("PagingMaxGlobalSizeBytes");
+            return (Long)proxy.retrieveAttributeValue("PagingMaxGlobalSizeBytes", Long.class);
          }
 
          public long getQueueActivationTimeout()
          {
-            return (Long)proxy.retrieveAttributeValue("QueueActivationTimeout");
+            return (Long)proxy.retrieveAttributeValue("QueueActivationTimeout", Long.class);
          }
 
          public int getScheduledThreadPoolMaxSize()
@@ -273,17 +273,17 @@
 
          public long getSecurityInvalidationInterval()
          {
-            return (Long)proxy.retrieveAttributeValue("SecurityInvalidationInterval");
+            return (Long)proxy.retrieveAttributeValue("SecurityInvalidationInterval", Long.class);
          }
 
          public long getTransactionTimeout()
          {
-            return (Long)proxy.retrieveAttributeValue("TransactionTimeout");
+            return (Long)proxy.retrieveAttributeValue("TransactionTimeout", Long.class);
          }
 
          public long getTransactionTimeoutScanPeriod()
          {
-            return (Long)proxy.retrieveAttributeValue("TransactionTimeoutScanPeriod");
+            return (Long)proxy.retrieveAttributeValue("TransactionTimeoutScanPeriod", Long.class);
          }
 
          public String getVersion()