QPID-822 Setting default to false for JMSXUserID cause this test to fail. Now test only validates the JMSXUserID if it exists.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@632070 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 2 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 8cceba6ffd..09886f4736 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -292,8 +292,11 @@ public class PropertyValueTest extends TestCase implements MessageListener
                               ((AMQMessage) m).getPropertyHeaders().containsKey("void"));
 
             //JMSXUserID
-            Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
-                                m.getStringProperty("JMSXUserID"));
+            if (m.getStringProperty("JMSXUserID") != null)
+            {
+                Assert.assertEquals("Check 'JMSXUserID' is supported ", USERNAME,
+                                    m.getStringProperty("JMSXUserID"));
+            }
         }
 
         received.clear();