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

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

Author: jmesnil
Date: 2009-05-05 16:07:05 -0400 (Tue, 05 May 2009)
New Revision: 6673

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
Log:
management refactoring

* fixed JMSQueueControl tests

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java	2009-05-05 20:00:25 UTC (rev 6672)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java	2009-05-05 20:07:05 UTC (rev 6673)
@@ -149,7 +149,8 @@
 
       // retrieve the first message info
       Map map = (Map)maps[0];
-      String messageID = (String)map.get("JMSMessageID");
+      Map props = (Map)map.get("properties");
+      String messageID = (String)props.get("JMSMessageID");
 
       proxy.invokeOperation("removeMessage", messageID);
 
@@ -238,11 +239,12 @@
 
       assertEquals(1, proxy.retrieveAttributeValue("MessageCount"));
 
-      Object[] maps = (Object[])proxy.invokeOperation("listAllMessages", null);
+      Object[] maps = (Object[])proxy.invokeOperation("listAllMessages");
       // retrieve the first message info
       Map map = (Map)maps[0];
-      String messageID = (String)map.get("JMSMessageID");
-      int currentPriority = (Integer)map.get("JMSPriority");
+      Map props = (Map)map.get("properties");
+      String messageID = (String)props.get("JMSMessageID");
+      int currentPriority = ((Long)map.get("JMSPriority")).intValue();
       int newPriority = 9;
 
       assertTrue(newPriority != currentPriority);
@@ -673,10 +675,10 @@
       server.start();
 
       serverManager = new JMSServerManagerImpl(server);
+      context = new InVMContext();
+      serverManager.setContext(context);
       serverManager.start();
       serverManager.activated();
-      context = new InVMContext();
-      serverManager.setContext(context);
 
       String queueName = randomString();
       serverManager.createQueue(queueName, queueName);