[jboss-cvs] JBoss Messaging SVN: r7311 - in trunk: tests/src/org/jboss/messaging/tests/integration/cluster/management and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 11 14:32:55 EDT 2009
Author: jmesnil
Date: 2009-06-11 14:32:55 -0400 (Thu, 11 Jun 2009)
New Revision: 7311
Modified:
trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
Log:
JBMESSAGING-1605: management API needs a portable and complete serialization format
* fixed failing tests
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2009-06-11 17:13:01 UTC (rev 7310)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2009-06-11 18:32:55 UTC (rev 7311)
@@ -120,7 +120,15 @@
}
else
{
- jmsMessage.put(entry.getKey(), entry.getValue());
+ Object value = entry.getValue();
+ if (value instanceof SimpleString)
+ {
+ jmsMessage.put(entry.getKey(), value.toString());
+ }
+ else
+ {
+ jmsMessage.put(entry.getKey(), value);
+ }
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-06-11 17:13:01 UTC (rev 7310)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareQueueControlWrapperTest.java 2009-06-11 18:32:55 UTC (rev 7311)
@@ -87,23 +87,23 @@
Map<String, Object>[] messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- long messageID = (Long)messages[0].get("MessageID");
- assertEquals(oldPriority, messages[0].get("Priority"));
+ long messageID = (Long)messages[0].get("messageID");
+ assertEquals(oldPriority, messages[0].get("priority"));
messages = backupQueueControl.listAllMessages();
assertEquals(1, messages.length);
- assertEquals(oldPriority, messages[0].get("Priority"));
+ assertEquals(oldPriority, messages[0].get("priority"));
assertTrue(liveQueueControl.changeMessagePriority(messageID, newPriority));
// check the priority is changed on both live & backup nodes
messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- assertEquals(newPriority, messages[0].get("Priority"));
+ assertEquals(newPriority, messages[0].get("priority"));
messages = backupQueueControl.listAllMessages();
assertEquals(1, messages.length);
- assertEquals(newPriority, messages[0].get("Priority"));
+ assertEquals(newPriority, messages[0].get("priority"));
}
public void testExpireMessage() throws Exception
@@ -124,7 +124,7 @@
Map<String, Object>[] messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- long messageID = (Long)messages[0].get("MessageID");
+ long messageID = (Long)messages[0].get("messageID");
assertTrue(liveQueueControl.expireMessage(messageID));
@@ -274,7 +274,7 @@
Map<String, Object>[] messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- long messageID = (Long)messages[0].get("MessageID");
+ long messageID = (Long)messages[0].get("messageID");
assertTrue(liveQueueControl.moveMessage(messageID, otherQueue.toString()));
@@ -359,7 +359,7 @@
Map<String, Object>[] messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- long messageID = (Long)messages[0].get("MessageID");
+ long messageID = (Long)messages[0].get("messageID");
assertTrue(liveQueueControl.removeMessage(messageID));
@@ -386,7 +386,7 @@
Map<String, Object>[] messages = liveQueueControl.listAllMessages();
assertEquals(1, messages.length);
- long messageID = (Long)messages[0].get("MessageID");
+ long messageID = (Long)messages[0].get("messageID");
assertTrue(liveQueueControl.sendMessageToDeadLetterAddress(messageID));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-06-11 17:13:01 UTC (rev 7310)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/management/ReplicationAwareTestBase.java 2009-06-11 18:32:55 UTC (rev 7311)
@@ -44,7 +44,7 @@
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
*/
-public class ReplicationAwareTestBase extends UnitTestCase
+public abstract class ReplicationAwareTestBase extends UnitTestCase
{
// Constants -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-06-11 17:13:01 UTC (rev 7310)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-06-11 18:32:55 UTC (rev 7311)
@@ -193,7 +193,7 @@
{
System.out.println(it.next());
}
- SimpleString messageID = (SimpleString)data[0].get("JMSMessageID");
+ String messageID = (String)data[0].get("JMSMessageID");
queueControl.removeMessage(messageID.toString());
@@ -286,8 +286,8 @@
Map<String, Object>[] data = queueControl.listAllMessages();
// retrieve the first message info
- SimpleString messageID = (SimpleString)data[0].get("JMSMessageID");
- int currentPriority = (Byte)data[0].get("JMSPriority");
+ String messageID = (String)data[0].get("JMSMessageID");
+ int currentPriority = ((Number)data[0].get("JMSPriority")).intValue();
int newPriority = 9;
assertTrue(newPriority != currentPriority);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-06-11 17:13:01 UTC (rev 7310)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/QueueControlTest.java 2009-06-11 18:32:55 UTC (rev 7311)
@@ -305,7 +305,7 @@
Map<String, Object>[] messages = queueControl.listScheduledMessages();
assertEquals(1, messages.length);
- assertEquals(intValue, messages[0].get("key"));
+ assertEquals(intValue, ((Number)messages[0].get("key")).intValue());
Thread.sleep(delay);
@@ -395,7 +395,7 @@
Map<String, Object>[] messages = queueControl.listAllMessages();
assertEquals(1, messages.length);
- assertEquals(intValue, messages[0].get("key"));
+ assertEquals(intValue, ((Number)messages[0].get("key")).intValue());
consumeMessages(1, session, queue);
More information about the jboss-cvs-commits
mailing list