[jboss-cvs] JBossAS SVN: r90348 - in branches/Branch_5_x: testsuite/src/main/org/jboss/test/profileservice/test and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2009-06-17 13:45:42 -0400 (Wed, 17 Jun 2009)
New Revision: 90348

Modified:
   branches/Branch_5_x/messaging/src/main/org/jboss/jms/server/destination/MessageListMapper.java
   branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
Log:
JBAS-7024, use a CompositeValueSupport rather than a MapCompositeValueSupport


Modified: branches/Branch_5_x/messaging/src/main/org/jboss/jms/server/destination/MessageListMapper.java
===================================================================
--- branches/Branch_5_x/messaging/src/main/org/jboss/jms/server/destination/MessageListMapper.java	2009-06-17 17:44:31 UTC (rev 90347)
+++ branches/Branch_5_x/messaging/src/main/org/jboss/jms/server/destination/MessageListMapper.java	2009-06-17 17:45:42 UTC (rev 90348)
@@ -34,7 +34,7 @@
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
 import org.jboss.metatype.api.values.CollectionValueSupport;
-import org.jboss.metatype.api.values.MapCompositeValueSupport;
+import org.jboss.metatype.api.values.CompositeValueSupport;
 import org.jboss.metatype.api.values.MetaValue;
 import org.jboss.metatype.api.values.SimpleValueSupport;
 import org.jboss.metatype.spi.values.MetaMapper;
@@ -64,7 +64,7 @@
       };
       MetaType[] itemTypes = {
             SimpleMetaType.STRING,
-            SimpleMetaType.LONG,
+            SimpleMetaType.LONG_PRIMITIVE,
             SimpleMetaType.STRING
       };
       MSG_TYPE = new ImmutableCompositeMetaType("javax.jms.Message", "JMS Message",
@@ -82,10 +82,10 @@
          {
             try
             {
-               MapCompositeValueSupport cvs = new MapCompositeValueSupport(MSG_TYPE);
-               cvs.put("JMSCorrelationID", SimpleValueSupport.wrap(m.getJMSCorrelationID()));
-               cvs.put("JMSTimestamp", SimpleValueSupport.wrap(m.getJMSTimestamp()));
-               cvs.put("JMSMessageID", SimpleValueSupport.wrap(m.getJMSMessageID()));
+               CompositeValueSupport cvs = new CompositeValueSupport(MSG_TYPE);
+               cvs.set("JMSCorrelationID", SimpleValueSupport.wrap(m.getJMSCorrelationID()));
+               cvs.set("JMSTimestamp", SimpleValueSupport.wrap(m.getJMSTimestamp()));
+               cvs.set("JMSMessageID", SimpleValueSupport.wrap(m.getJMSMessageID()));
                tmp.add(cvs);
             }
             catch(Exception e)

Modified: branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java
===================================================================
--- branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2009-06-17 17:44:31 UTC (rev 90347)
+++ branches/Branch_5_x/testsuite/src/main/org/jboss/test/profileservice/test/JmsDestinationUnitTestCase.java	2009-06-17 17:45:42 UTC (rev 90348)
@@ -56,6 +56,8 @@
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.api.RunState;
 import org.jboss.managed.plugins.ManagedOperationMatcher;
+import org.jboss.metatype.api.types.CollectionMetaType;
+import org.jboss.metatype.api.types.CompositeMetaType;
 import org.jboss.metatype.api.types.MapCompositeMetaType;
 import org.jboss.metatype.api.types.MetaType;
 import org.jboss.metatype.api.types.SimpleMetaType;
@@ -223,10 +225,45 @@
    public void testQueueOperations() throws Exception
    {
       ManagedComponent component = getManagementView().getComponent("testCreateQueue", QueueType);
+
+      // Send a few messages so the message based ops have values
+      sendQueueMsgs("testCreateQueue", component);
+
+      
       ManagedOperation o = getOperation(component, "listMessageCounterAsHTML", new String[0]);
       MetaValue v = o.invoke(new MetaValue[0]);
       assertNotNull("null operation return value", v);
-      log.debug("result" + v);
+      log.debug("result: " + v);
+      
+      
+      // JBAS-7024,
+      ManagedOperation listAllMessages = getOperation(component, "listAllMessages", new String[0]);
+      MetaType listAllMessagesRT = listAllMessages.getReturnType();
+      log.debug("listAllMessagesRT: " + listAllMessagesRT);
+      MetaValue listAllMessagesMV = listAllMessages.invoke(new MetaValue[0]);
+      assertNotNull("null operation return value", listAllMessagesMV);
+      log.debug("result: " + listAllMessagesMV);
+      MetaType resultType = listAllMessagesMV.getMetaType();
+      log.debug("resultType: "+resultType);
+      assertTrue("resultType instanceof CompositeMetaType", resultType instanceof CollectionMetaType);
+      CollectionMetaType resultCMT = (CollectionMetaType) resultType;
+      MetaType resultElementType = resultCMT.getElementType();
+      log.debug("resultElementType: "+resultElementType);
+      assertTrue("resultElementType instanceof CompositeMetaType", resultElementType instanceof CompositeMetaType);
+      log.debug("resultElementType: "+resultElementType);
+      CollectionValue listAllMessagesCV = (CollectionValue) listAllMessagesMV;
+      MetaValue[] listAllMessagesElements = listAllMessagesCV.getElements();
+      log.debug("listAllMessagesElements: "+listAllMessagesElements);
+      if(listAllMessagesElements.length > 0)
+      {
+         MetaValue m0 = listAllMessagesElements[0];
+         MetaType m0MT = m0.getMetaType();
+         assertTrue("m0MT.isComposite", m0MT.isComposite());
+         assertTrue("m0MT instanceof CompositeMetaType", m0MT instanceof CompositeMetaType);
+         assertTrue("m0 instanceof CompositeValue", m0 instanceof CompositeValue);
+         CompositeValue m0MV = (CompositeValue) m0;
+         log.debug("m0MV.values: "+m0MV.values());
+      }
    }
    
    public void testQueueRestart() throws Exception