From 03fac207a3f4a21872beb8d332e3f62f3acb7cd7 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Mon, 26 Jul 2010 14:39:33 +0000 Subject: 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 --- .../main/java/org/apache/qpid/test/unit/message/JMSPropertiesTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qpid/java') 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 -- cgit v1.2.1