diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-07-26 14:39:33 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-07-26 14:39:33 +0000 |
| commit | 03fac207a3f4a21872beb8d332e3f62f3acb7cd7 (patch) | |
| tree | 55759726b50f626536eb50a0a8938bb293b617d2 /qpid/java | |
| parent | 65b81e721fcbb9e56886e077e79dea3b799e6d08 (diff) | |
| download | qpid-python-03fac207a3f4a21872beb8d332e3f62f3acb7cd7.tar.gz | |
QPID-2744: Make JMSPropertiesTest deal with both types of error messages
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@979316 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java index 58bf7e85cf..7e029a862f 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java @@ -100,7 +100,8 @@ public class JMSPropertiesTest extends QpidBrokerTestCase catch (MessageFormatException mfe) { // Check the error message - assertTrue("Incorrect error message: " + mfe.getMessage(), mfe.getMessage().contains("Object is null")); + assertEquals("Incorrect error message", + isBroker010() ? "Object is null" : "Only Primitives objects allowed Object is:null", mfe.getMessage()); } // send it |