update group related MessageIntegrationTest to assert on propertyNames + propertyExists status, ignore as currently failing
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/aa92d995 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/aa92d995 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/aa92d995 Branch: refs/heads/master Commit: aa92d995555583ab07c131b901fae501b562a573 Parents: b01232d Author: Robert Gemmell <[email protected]> Authored: Wed Oct 8 12:04:00 2014 +0100 Committer: Robert Gemmell <[email protected]> Committed: Wed Oct 8 12:28:34 2014 +0100 ---------------------------------------------------------------------- .../jms/integration/MessageIntegrationTest.java | 38 ++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/aa92d995/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java index f257ec3..bc12995 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/MessageIntegrationTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import java.util.Date; +import java.util.Enumeration; import java.util.UUID; import javax.jms.Connection; @@ -58,6 +59,7 @@ import org.apache.qpid.proton.amqp.DescribedType; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.UnsignedInteger; import org.apache.qpid.proton.amqp.UnsignedLong; +import org.junit.Ignore; import org.junit.Test; public class MessageIntegrationTest extends QpidJmsTestCase @@ -860,9 +862,10 @@ public class MessageIntegrationTest extends QpidJmsTestCase /** * Tests that when receiving a message with the group-id, reply-to-group-id, and group-sequence - * fields of the AMQP properties section set, that the expected values are returned when getting - * the appropriate JMSX or JMS_AMQP properties from the JMS message. + * fields of the AMQP properties section set, that the expected JMSX or JMS_AMQP properties + * are present, and the expected values are returned when retrieved from the JMS message. */ + @Ignore //TODO: currently failing on propertyNames handling @Test(timeout = 2000) public void testReceivedMessageWithGroupRelatedPropertiesSet() throws Exception { try (TestAmqpPeer testPeer = new TestAmqpPeer(IntegrationTestFixture.PORT);) { @@ -896,6 +899,37 @@ public class MessageIntegrationTest extends QpidJmsTestCase testPeer.waitForAllHandlersToComplete(3000); assertNotNull("did not receive the message", receivedMessage); + + boolean foundGroupId = false; + boolean foundGroupSeq = false; + boolean foundReplyToGroupId = false; + + Enumeration<?> names = receivedMessage.getPropertyNames(); + assertTrue("Message had no property names", names.hasMoreElements()); + while (names.hasMoreElements()) { + Object element = names.nextElement(); + + if (JmsClientProperties.JMSXGROUPID.equals(element)) { + foundGroupId = true; + } + + if (JmsClientProperties.JMSXGROUPSEQ.equals(element)) { + foundGroupSeq = true; + } + + if (AmqpMessageSupport.JMS_AMQP_REPLY_TO_GROUP_ID.equals(element)) { + foundReplyToGroupId = true; + } + } + + assertTrue("JMSXGroupID not in property names", foundGroupId); + assertTrue("JMSXGroupSeq not in property names", foundGroupSeq); + assertTrue("JMS_AMQP_REPLY_TO_GROUP_ID not in property names", foundReplyToGroupId); + + assertTrue("JMSXGroupID does not exist", receivedMessage.propertyExists(JmsClientProperties.JMSXGROUPID)); + assertTrue("JMSXGroupSeq does not exist", receivedMessage.propertyExists(JmsClientProperties.JMSXGROUPSEQ)); + assertTrue("JMS_AMQP_REPLY_TO_GROUP_ID does not exist", receivedMessage.propertyExists(AmqpMessageSupport.JMS_AMQP_REPLY_TO_GROUP_ID)); + assertEquals("did not get the expected JMSXGroupID", expectedGroupId, receivedMessage.getStringProperty(JmsClientProperties.JMSXGROUPID)); assertEquals("did not get the expected JMSXGroupSeq", expectedGroupSeq, receivedMessage.getIntProperty(JmsClientProperties.JMSXGROUPSEQ)); assertEquals("did not get the expected JMS_AMQP_REPLY_TO_GROUP_ID", expectedReplyToGroupId, receivedMessage.getStringProperty(AmqpMessageSupport.JMS_AMQP_REPLY_TO_GROUP_ID)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
