QPID-2744: Unify 0-10 and 0-8 error messages for invalid object types in properties

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@981231 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 11 insertions, 1 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
index 179d371b1b..d4691ba097 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
@@ -529,9 +529,19 @@ public class PropertyFieldTableTest extends TestCase
         catch (AMQPInvalidClassException aice)
         {
             assertEquals("Null values are not allowed to be set",
-                         "Only Primitives objects allowed Object is:null", aice.getMessage());
+                    AMQPInvalidClassException.INVALID_OBJECT_MSG + "null", aice.getMessage());
         }
 
+        try
+        {
+            table.setObject("Unsupported-object", new Exception());
+            fail("Non primitive values are not allowed");
+        }
+        catch (AMQPInvalidClassException aice)
+        {
+            assertEquals("Non primitive values are not allowed to be set",
+                    AMQPInvalidClassException.INVALID_OBJECT_MSG + Exception.class, aice.getMessage());
+        }
 
         Assert.assertEquals((Boolean) true, table.getBoolean("bool"));
         Assert.assertEquals((Byte) Byte.MAX_VALUE, table.getByte("byte"));