You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/09/23 20:20:35 UTC

[11/27] Initial drop of donated AMQP Client Code.

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4decdc1/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
new file mode 100644
index 0000000..174ba32
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTest.java
@@ -0,0 +1,944 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.message;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Enumeration;
+import java.util.Map;
+
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageFormatException;
+import javax.jms.MessageNotWriteableException;
+
+import org.apache.qpid.jms.JmsDestination;
+import org.apache.qpid.jms.JmsTopic;
+import org.apache.qpid.jms.message.JmsBytesMessage;
+import org.apache.qpid.jms.message.JmsDefaultMessageFactory;
+import org.apache.qpid.jms.message.JmsMessage;
+import org.apache.qpid.jms.message.JmsMessageFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JmsMessageTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(JmsMessageTest.class);
+
+    private final JmsMessageFactory factory = new JmsDefaultMessageFactory();
+
+    protected boolean readOnlyMessage;
+
+    private String jmsMessageID;
+    private String jmsCorrelationID;
+    private JmsDestination jmsDestination;
+    private JmsDestination jmsReplyTo;
+    private int jmsDeliveryMode;
+    private boolean jmsRedelivered;
+    private String jmsType;
+    private long jmsExpiration;
+    private int jmsPriority;
+    private long jmsTimestamp;
+    private long[] consumerIDs;
+
+    @Before
+    public void setUp() throws Exception {
+        this.jmsMessageID = "ID:TEST-ID:0:0:0:1";
+        this.jmsCorrelationID = "testcorrelationid";
+        this.jmsDestination = new JmsTopic("test.topic");
+        this.jmsReplyTo = new JmsTopic("test.replyto.topic:001");
+        this.jmsDeliveryMode = Message.DEFAULT_DELIVERY_MODE;
+        this.jmsRedelivered = true;
+        this.jmsType = "test type";
+        this.jmsExpiration = 100000;
+        this.jmsPriority = 5;
+        this.jmsTimestamp = System.currentTimeMillis();
+        this.readOnlyMessage = false;
+        this.consumerIDs = new long[3];
+        for (int i = 0; i < this.consumerIDs.length; i++) {
+            this.consumerIDs[i] = i;
+        }
+    }
+
+    @Test
+    public void testHashCode() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSMessageID(this.jmsMessageID);
+        assertTrue(msg.getJMSMessageID().hashCode() == jmsMessageID.hashCode());
+    }
+
+    @Test
+    public void testSetReadOnly() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setReadOnlyProperties(true);
+        boolean test = false;
+        try {
+            msg.setIntProperty("test", 1);
+        } catch (MessageNotWriteableException me) {
+            test = true;
+        } catch (JMSException e) {
+            e.printStackTrace(System.err);
+            test = false;
+        }
+        assertTrue(test);
+    }
+
+    @Test
+    public void testSetToForeignJMSID() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSMessageID("ID:EMS-SERVER.8B443C380083:429");
+    }
+
+    @Test
+    public void testEqualsObject() throws Exception {
+        JmsMessage msg1 = factory.createMessage();
+        JmsMessage msg2 = factory.createMessage();
+        msg1.setJMSMessageID(this.jmsMessageID);
+        assertTrue(!msg1.equals(msg2));
+        msg2.setJMSMessageID(this.jmsMessageID);
+        assertTrue(msg1.equals(msg2));
+    }
+
+    @Test
+    public void testShallowCopy() throws Exception {
+        JmsMessage msg1 = factory.createMessage();
+        msg1.setJMSMessageID(jmsMessageID);
+        JmsMessage msg2 = msg1.copy();
+        assertTrue(msg1 != msg2 && msg1.equals(msg2));
+    }
+
+    @Test
+    public void testCopy() throws Exception {
+        this.jmsMessageID = "testid";
+        this.jmsCorrelationID = "testcorrelationid";
+        this.jmsDestination = new JmsTopic("test.topic");
+        this.jmsReplyTo = new JmsTopic("test.replyto.topic:001");
+        this.jmsDeliveryMode = Message.DEFAULT_DELIVERY_MODE;
+        this.jmsRedelivered = true;
+        this.jmsType = "test type";
+        this.jmsExpiration = 100000;
+        this.jmsPriority = 5;
+        this.jmsTimestamp = System.currentTimeMillis();
+        this.readOnlyMessage = false;
+
+        JmsMessage msg1 = factory.createMessage();
+        msg1.setJMSMessageID(this.jmsMessageID);
+        msg1.setJMSCorrelationID(this.jmsCorrelationID);
+        msg1.setJMSDestination(this.jmsDestination);
+        msg1.setJMSReplyTo(this.jmsReplyTo);
+        msg1.setJMSDeliveryMode(this.jmsDeliveryMode);
+        msg1.setJMSRedelivered(this.jmsRedelivered);
+        msg1.setJMSType(this.jmsType);
+        msg1.setJMSExpiration(this.jmsExpiration);
+        msg1.setJMSPriority(this.jmsPriority);
+        msg1.setJMSTimestamp(this.jmsTimestamp);
+        msg1.setReadOnlyProperties(true);
+        JmsMessage msg2 = msg1.copy();
+        assertEquals(msg1.getJMSMessageID(), msg2.getJMSMessageID());
+        assertTrue(msg1.getJMSCorrelationID().equals(msg2.getJMSCorrelationID()));
+        assertTrue(msg1.getJMSDestination().equals(msg2.getJMSDestination()));
+        assertTrue(msg1.getJMSReplyTo().equals(msg2.getJMSReplyTo()));
+        assertTrue(msg1.getJMSDeliveryMode() == msg2.getJMSDeliveryMode());
+        assertTrue(msg1.getJMSRedelivered() == msg2.getJMSRedelivered());
+        assertTrue(msg1.getJMSType().equals(msg2.getJMSType()));
+        assertTrue(msg1.getJMSExpiration() == msg2.getJMSExpiration());
+        assertTrue(msg1.getJMSPriority() == msg2.getJMSPriority());
+        assertTrue(msg1.getJMSTimestamp() == msg2.getJMSTimestamp());
+
+        LOG.info("Message is:  " + msg1);
+    }
+
+    @Test
+    public void testGetAndSetJMSMessageID() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSMessageID(this.jmsMessageID);
+        assertEquals(msg.getJMSMessageID(), this.jmsMessageID);
+    }
+
+    @Test
+    public void testGetAndSetJMSTimestamp() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSTimestamp(this.jmsTimestamp);
+        assertTrue(msg.getJMSTimestamp() == this.jmsTimestamp);
+    }
+
+    @Test
+    public void testGetJMSCorrelationIDAsBytes() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSCorrelationID(this.jmsCorrelationID);
+        byte[] testbytes = msg.getJMSCorrelationIDAsBytes();
+        String str2 = new String(testbytes);
+        assertTrue(this.jmsCorrelationID.equals(str2));
+    }
+
+    @Test
+    public void testSetJMSCorrelationIDAsBytes() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        byte[] testbytes = this.jmsCorrelationID.getBytes();
+        msg.setJMSCorrelationIDAsBytes(testbytes);
+        testbytes = msg.getJMSCorrelationIDAsBytes();
+        String str2 = new String(testbytes);
+        assertTrue(this.jmsCorrelationID.equals(str2));
+    }
+
+    @Test
+    public void testGetAndSetJMSCorrelationID() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSCorrelationID(this.jmsCorrelationID);
+        assertTrue(msg.getJMSCorrelationID().equals(this.jmsCorrelationID));
+    }
+
+    @Test
+    public void testGetAndSetJMSReplyTo() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSReplyTo(this.jmsReplyTo);
+        assertTrue(msg.getJMSReplyTo().equals(this.jmsReplyTo));
+    }
+
+    @Test
+    public void testGetAndSetJMSDestination() throws Exception {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSDestination(this.jmsDestination);
+        assertTrue(msg.getJMSDestination().equals(this.jmsDestination));
+    }
+
+    @Test
+    public void testGetAndSetJMSDeliveryMode() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSDeliveryMode(this.jmsDeliveryMode);
+        assertTrue(msg.getJMSDeliveryMode() == this.jmsDeliveryMode);
+    }
+
+    @Test
+    public void testGetAndSetMSRedelivered() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSRedelivered(this.jmsRedelivered);
+        assertTrue(msg.getJMSRedelivered() == this.jmsRedelivered);
+    }
+
+    @Test
+    public void testGetAndSetJMSType() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSType(this.jmsType);
+        assertTrue(msg.getJMSType().equals(this.jmsType));
+    }
+
+    @Test
+    public void testGetAndSetJMSExpiration() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSExpiration(this.jmsExpiration);
+        assertTrue(msg.getJMSExpiration() == this.jmsExpiration);
+    }
+
+    @Test
+    public void testGetAndSetJMSPriority() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSPriority(this.jmsPriority);
+        assertTrue(msg.getJMSPriority() == this.jmsPriority);
+
+        msg.setJMSPriority(-90);
+        assertEquals(0, msg.getJMSPriority());
+
+        msg.setJMSPriority(90);
+        assertEquals(9, msg.getJMSPriority());
+    }
+
+    @Test
+    public void testClearProperties() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setStringProperty("test", "test");
+        msg.setJMSMessageID(this.jmsMessageID);
+        msg.clearProperties();
+        assertNull(msg.getStringProperty("test"));
+        assertNotNull(msg.getJMSMessageID());
+    }
+
+    @Test
+    public void testPropertyExists() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setStringProperty("test", "test");
+        assertTrue(msg.propertyExists("test"));
+
+        msg.setIntProperty("JMSXDeliveryCount", 1);
+        assertTrue(msg.propertyExists("JMSXDeliveryCount"));
+    }
+
+    @Test
+    public void testGetBooleanProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "booleanProperty";
+        msg.setBooleanProperty(name, true);
+        assertTrue(msg.getBooleanProperty(name));
+    }
+
+    @Test
+    public void testGetByteProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "byteProperty";
+        msg.setByteProperty(name, (byte) 1);
+        assertTrue(msg.getByteProperty(name) == 1);
+    }
+
+    @Test
+    public void testGetShortProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "shortProperty";
+        msg.setShortProperty(name, (short) 1);
+        assertTrue(msg.getShortProperty(name) == 1);
+    }
+
+    @Test
+    public void testGetIntProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "intProperty";
+        msg.setIntProperty(name, 1);
+        assertTrue(msg.getIntProperty(name) == 1);
+    }
+
+    @Test
+    public void testGetLongProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "longProperty";
+        msg.setLongProperty(name, 1);
+        assertTrue(msg.getLongProperty(name) == 1);
+    }
+
+    @Test
+    public void testGetFloatProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "floatProperty";
+        msg.setFloatProperty(name, 1.3f);
+        assertTrue(msg.getFloatProperty(name) == 1.3f);
+    }
+
+    @Test
+    public void testGetDoubleProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "doubleProperty";
+        msg.setDoubleProperty(name, 1.3d);
+        assertTrue(msg.getDoubleProperty(name) == 1.3);
+    }
+
+    @Test
+    public void testGetStringProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "stringProperty";
+        msg.setStringProperty(name, name);
+        assertTrue(msg.getStringProperty(name).equals(name));
+    }
+
+    @Test
+    public void testGetObjectProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "floatProperty";
+        msg.setFloatProperty(name, 1.3f);
+        assertTrue(msg.getObjectProperty(name) instanceof Float);
+        assertTrue(((Float) msg.getObjectProperty(name)).floatValue() == 1.3f);
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testGetPropertyNames() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name1 = "floatProperty";
+        msg.setFloatProperty(name1, 1.3f);
+        String name2 = "JMSXDeliveryCount";
+        msg.setIntProperty(name2, 1);
+        String name3 = "JMSRedelivered";
+        msg.setBooleanProperty(name3, false);
+        boolean found1 = false;
+        boolean found2 = false;
+        boolean found3 = false;
+        for (Enumeration iter = msg.getPropertyNames(); iter.hasMoreElements();) {
+            Object element = iter.nextElement();
+            found1 |= element.equals(name1);
+            found2 |= element.equals(name2);
+            found3 |= element.equals(name3);
+        }
+        assertTrue("prop name1 found", found1);
+        // spec compliance, only non JMS (and JMSX) props returned
+        assertFalse("prop name2 not found", found2);
+        assertFalse("prop name4 not found", found3);
+    }
+
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testGetAllPropertyNames() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name1 = "floatProperty";
+        msg.setFloatProperty(name1, 1.3f);
+        String name2 = "JMSXDeliveryCount";
+        msg.setIntProperty(name2, 1);
+        String name3 = "JMSRedelivered";
+        msg.setBooleanProperty(name3, false);
+        boolean found1 = false;
+        boolean found2 = false;
+        boolean found3 = false;
+        for (Enumeration iter = msg.getAllPropertyNames(); iter.hasMoreElements();) {
+            Object element = iter.nextElement();
+            found1 |= element.equals(name1);
+            found2 |= element.equals(name2);
+            found3 |= element.equals(name3);
+        }
+        assertTrue("prop name1 found", found1);
+        assertTrue("prop name2 found", found2);
+        assertTrue("prop name4 found", found3);
+    }
+
+    @Test
+    public void testSetObjectProperty() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String name = "property";
+
+        try {
+            msg.setObjectProperty(name, "string");
+            msg.setObjectProperty(name, Byte.valueOf("1"));
+            msg.setObjectProperty(name, Short.valueOf("1"));
+            msg.setObjectProperty(name, Integer.valueOf("1"));
+            msg.setObjectProperty(name, Long.valueOf("1"));
+            msg.setObjectProperty(name, Float.valueOf("1.1f"));
+            msg.setObjectProperty(name, Double.valueOf("1.1"));
+            msg.setObjectProperty(name, Boolean.TRUE);
+            msg.setObjectProperty(name, null);
+        } catch (MessageFormatException e) {
+            fail("should accept object primitives and String");
+        }
+        try {
+            msg.setObjectProperty(name, new byte[5]);
+            fail("should accept only object primitives and String");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.setObjectProperty(name, new Object());
+            fail("should accept only object primitives and String");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testConvertProperties() throws Exception {
+
+        JmsMessage msg = factory.createMessage();
+
+        msg.setStringProperty("stringProperty", "string");
+        msg.setByteProperty("byteProperty", Byte.valueOf("1"));
+        msg.setShortProperty("shortProperty", Short.valueOf("1"));
+        msg.setIntProperty("intProperty", Integer.valueOf("1"));
+        msg.setLongProperty("longProperty", Long.valueOf("1"));
+        msg.setFloatProperty("floatProperty", Float.valueOf("1.1f"));
+        msg.setDoubleProperty("doubleProperty", Double.valueOf("1.1"));
+        msg.setBooleanProperty("booleanProperty", Boolean.TRUE);
+        msg.setObjectProperty("nullProperty", null);
+
+        Map<String, Object> properties = msg.getProperties();
+        assertEquals(properties.get("stringProperty"), "string");
+        assertEquals(((Byte) properties.get("byteProperty")).byteValue(), 1);
+        assertEquals(((Short) properties.get("shortProperty")).shortValue(), 1);
+        assertEquals(((Integer) properties.get("intProperty")).intValue(), 1);
+        assertEquals(((Long) properties.get("longProperty")).longValue(), 1);
+        assertEquals(((Float) properties.get("floatProperty")).floatValue(), 1.1f, 0);
+        assertEquals(((Double) properties.get("doubleProperty")).doubleValue(), 1.1, 0);
+        assertEquals(((Boolean) properties.get("booleanProperty")).booleanValue(), true);
+        assertNull(properties.get("nullProperty"));
+    }
+
+    @Test
+    public void testSetNullProperty() throws JMSException {
+        Message msg = factory.createMessage();
+        String name = "cheese";
+        msg.setStringProperty(name, "Cheddar");
+        assertEquals("Cheddar", msg.getStringProperty(name));
+
+        msg.setStringProperty(name, null);
+        assertEquals(null, msg.getStringProperty(name));
+    }
+
+    @Test
+    public void testSetNullPropertyName() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+
+        try {
+            msg.setStringProperty(null, "Cheese");
+            fail("Should have thrown exception");
+        } catch (IllegalArgumentException e) {
+            LOG.info("Worked, caught: " + e);
+        }
+    }
+
+    @Test
+    public void testSetEmptyPropertyName() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+
+        try {
+            msg.setStringProperty("", "Cheese");
+            fail("Should have thrown exception");
+        } catch (IllegalArgumentException e) {
+            LOG.info("Worked, caught: " + e);
+        }
+    }
+
+    @Test
+    public void testGetAndSetJMSXDeliveryCount() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setIntProperty("JMSXDeliveryCount", 1);
+        int count = msg.getIntProperty("JMSXDeliveryCount");
+        assertTrue("expected delivery count = 1 - got: " + count, count == 1);
+    }
+
+    @Test
+    public void testClearBody() throws JMSException {
+        JmsBytesMessage message = factory.createBytesMessage();
+        message.clearBody();
+        assertFalse(message.isReadOnlyBody());
+        assertNull(message.getContent());
+    }
+
+    @Test
+    public void testBooleanPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setBooleanProperty(propertyName, true);
+
+        assertEquals(((Boolean) msg.getObjectProperty(propertyName)).booleanValue(), true);
+        assertTrue(msg.getBooleanProperty(propertyName));
+        assertEquals(msg.getStringProperty(propertyName), "true");
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getLongProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testBytePropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setByteProperty(propertyName, (byte) 1);
+
+        assertEquals(((Byte) msg.getObjectProperty(propertyName)).byteValue(), 1);
+        assertEquals(msg.getByteProperty(propertyName), 1);
+        assertEquals(msg.getShortProperty(propertyName), 1);
+        assertEquals(msg.getIntProperty(propertyName), 1);
+        assertEquals(msg.getLongProperty(propertyName), 1);
+        assertEquals(msg.getStringProperty(propertyName), "1");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testShortPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setShortProperty(propertyName, (short) 1);
+
+        assertEquals(((Short) msg.getObjectProperty(propertyName)).shortValue(), 1);
+        assertEquals(msg.getShortProperty(propertyName), 1);
+        assertEquals(msg.getIntProperty(propertyName), 1);
+        assertEquals(msg.getLongProperty(propertyName), 1);
+        assertEquals(msg.getStringProperty(propertyName), "1");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testIntPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setIntProperty(propertyName, 1);
+
+        assertEquals(((Integer) msg.getObjectProperty(propertyName)).intValue(), 1);
+        assertEquals(msg.getIntProperty(propertyName), 1);
+        assertEquals(msg.getLongProperty(propertyName), 1);
+        assertEquals(msg.getStringProperty(propertyName), "1");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testLongPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setLongProperty(propertyName, 1);
+
+        assertEquals(((Long) msg.getObjectProperty(propertyName)).longValue(), 1);
+        assertEquals(msg.getLongProperty(propertyName), 1);
+        assertEquals(msg.getStringProperty(propertyName), "1");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testFloatPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setFloatProperty(propertyName, (float) 1.5);
+        assertEquals(((Float) msg.getObjectProperty(propertyName)).floatValue(), 1.5, 0);
+        assertEquals(msg.getFloatProperty(propertyName), 1.5, 0);
+        assertEquals(msg.getDoubleProperty(propertyName), 1.5, 0);
+        assertEquals(msg.getStringProperty(propertyName), "1.5");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getLongProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testDoublePropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setDoubleProperty(propertyName, 1.5);
+        assertEquals(((Double) msg.getObjectProperty(propertyName)).doubleValue(), 1.5, 0);
+        assertEquals(msg.getDoubleProperty(propertyName), 1.5, 0);
+        assertEquals(msg.getStringProperty(propertyName), "1.5");
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getLongProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+    }
+
+    @Test
+    public void testStringPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        String stringValue = "true";
+        msg.setStringProperty(propertyName, stringValue);
+        assertEquals(msg.getStringProperty(propertyName), stringValue);
+        assertEquals(msg.getObjectProperty(propertyName), stringValue);
+        assertEquals(msg.getBooleanProperty(propertyName), true);
+
+        stringValue = "1";
+        msg.setStringProperty(propertyName, stringValue);
+        assertEquals(msg.getByteProperty(propertyName), 1);
+        assertEquals(msg.getShortProperty(propertyName), 1);
+        assertEquals(msg.getIntProperty(propertyName), 1);
+        assertEquals(msg.getLongProperty(propertyName), 1);
+
+        stringValue = "1.5";
+        msg.setStringProperty(propertyName, stringValue);
+        assertEquals(msg.getFloatProperty(propertyName), 1.5, 0);
+        assertEquals(msg.getDoubleProperty(propertyName), 1.5, 0);
+
+        stringValue = "bad";
+        msg.setStringProperty(propertyName, stringValue);
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        try {
+            msg.getLongProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (NumberFormatException e) {
+        }
+        assertFalse(msg.getBooleanProperty(propertyName));
+    }
+
+    @Test
+    public void testObjectPropertyConversion() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        Object obj = new Object();
+        try {
+            msg.setProperty(propertyName, obj);
+        } catch (Exception e) {
+        }
+        try {
+            msg.getStringProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getBooleanProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getByteProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getShortProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getIntProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getLongProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getFloatProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+        try {
+            msg.getDoubleProperty(propertyName);
+            fail("Should have thrown exception");
+        } catch (MessageFormatException e) {
+        }
+
+    }
+
+    @Test
+    public void testReadOnlyProperties() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        String propertyName = "property";
+        msg.setReadOnlyProperties(true);
+
+        try {
+            msg.setObjectProperty(propertyName, new Object());
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setStringProperty(propertyName, "test");
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setBooleanProperty(propertyName, true);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setByteProperty(propertyName, (byte) 1);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setShortProperty(propertyName, (short) 1);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setIntProperty(propertyName, 1);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setLongProperty(propertyName, 1);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setFloatProperty(propertyName, (float) 1.5);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+        try {
+            msg.setDoubleProperty(propertyName, 1.5);
+            fail("Should have thrown exception");
+        } catch (MessageNotWriteableException e) {
+        }
+    }
+
+    @Test
+    public void testIsExpired() throws JMSException {
+        JmsMessage msg = factory.createMessage();
+        msg.setJMSExpiration(System.currentTimeMillis() - 1);
+        assertTrue(msg.isExpired());
+        msg.setJMSExpiration(System.currentTimeMillis() + 10000);
+        assertFalse(msg.isExpired());
+    }
+}

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/e4decdc1/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
new file mode 100644
index 0000000..b5e2e98
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsObjectMessageTest.java
@@ -0,0 +1,260 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.qpid.jms.message;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.jms.JMSException;
+import javax.jms.MessageFormatException;
+import javax.jms.MessageNotReadableException;
+import javax.jms.MessageNotWriteableException;
+import javax.jms.ObjectMessage;
+
+import org.apache.qpid.jms.message.JmsDefaultMessageFactory;
+import org.apache.qpid.jms.message.JmsMessageFactory;
+import org.apache.qpid.jms.message.JmsObjectMessage;
+import org.apache.qpid.jms.message.facade.JmsObjectMessageFacade;
+import org.apache.qpid.jms.message.facade.defaults.JmsDefaultObjectMessageFacade;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ *
+ */
+public class JmsObjectMessageTest {
+
+    private final JmsMessageFactory factory = new JmsDefaultMessageFactory();
+
+    /**
+     * Test that attempting to write bytes to a received message (without calling {@link ObjectMessage#clearBody()} first)
+     * causes a {@link MessageNotWriteableException} to be thrown due to being read-only.
+     */
+    @Test
+    public void testReceivedObjectMessageThrowsMessageNotWriteableExceptionOnSetObject() throws Exception {
+        String content = "myStringContent";
+        JmsObjectMessageFacade facade = new JmsDefaultObjectMessageFacade();
+        facade.setObject(content);
+        JmsObjectMessage objectMessage = new JmsObjectMessage(facade);
+        objectMessage.onSend();
+
+        try {
+            objectMessage.setObject("newObject");
+            fail("Expected exception to be thrown");
+        } catch (MessageNotWriteableException mnwe) {
+            // expected
+        }
+    }
+
+    /**
+     * Test that calling {@link ObjectMessage#clearBody()} causes a received
+     * message to become writable
+     */
+    @Test
+    public void testClearBodyOnReceivedObjectMessageMakesMessageWritable() throws Exception {
+        String content = "myStringContent";
+        JmsObjectMessageFacade facade = new JmsDefaultObjectMessageFacade();
+        facade.setObject(content);
+        JmsObjectMessage objectMessage = new JmsObjectMessage(facade);
+        objectMessage.onSend();
+
+        assertTrue("Message should not be writable", objectMessage.isReadOnlyBody());
+        objectMessage.clearBody();
+        assertFalse("Message should be writable", objectMessage.isReadOnlyBody());
+    }
+
+    /**
+     * Test that calling {@link ObjectMessage#clearBody()} of a received message
+     * causes the body of the underlying {@link AmqpObjectMessage} to be emptied.
+     */
+    @Test
+    public void testClearBodyOnReceivedObjectMessageClearsUnderlyingMessageBody() throws Exception {
+        String content = "myStringContent";
+        JmsDefaultObjectMessageFacade facade = new JmsDefaultObjectMessageFacade();
+        facade.setObject(content);
+        JmsObjectMessage objectMessage = new JmsObjectMessage(facade);
+        objectMessage.onSend();
+
+        assertNotNull("Expected body section but none was present", facade.getSerializedObject());
+        objectMessage.clearBody();
+
+        // check that the returned object is now null
+        assertNull("Unexpected object value", objectMessage.getObject());
+
+        // verify the underlying message facade has no body
+        assertNull("Expected no body section", facade.getSerializedObject());
+    }
+
+    /**
+     * Test that setting an object on a new message and later getting the value, returns an
+     * equal but different object that does not pick up intermediate changes to the set object.
+     */
+    @Test
+    public void testSetThenGetObjectReturnsSnapshot() throws Exception
+    {
+        Map<String,String> origMap = new HashMap<String,String>();
+        origMap.put("key1", "value1");
+
+        JmsDefaultObjectMessageFacade facade = new JmsDefaultObjectMessageFacade();
+        facade.setObject((Serializable) origMap);
+        JmsObjectMessage objectMessage = new JmsObjectMessage(facade);
+        objectMessage.onSend();
+
+        // verify we get a different-but-equal object back
+        Serializable serialized = objectMessage.getObject();
+        assertTrue("Unexpected object type returned", serialized instanceof Map<?,?>);
+        Map<?,?> returnedObject1 = (Map<?,?>) serialized;
+        assertNotSame("Expected different objects, due to snapshot being taken", origMap, returnedObject1);
+        assertEquals("Expected equal objects, due to snapshot being taken", origMap, returnedObject1);
+
+        // mutate the original object
+        origMap.put("key2", "value2");
+
+        // verify we get a different-but-equal object back when compared to the previously retrieved object
+        Serializable serialized2 = objectMessage.getObject();
+        assertTrue("Unexpected object type returned", serialized2 instanceof Map<?,?>);
+        Map<?,?> returnedObject2 = (Map<?,?>) serialized2;
+        assertNotSame("Expected different objects, due to snapshot being taken", origMap, returnedObject2);
+        assertEquals("Expected equal objects, due to snapshot being taken", returnedObject1, returnedObject2);
+
+        // verify the mutated map is a different and not equal object
+        assertNotSame("Expected different objects, due to snapshot being taken", returnedObject1, returnedObject2);
+        assertNotEquals("Expected objects to differ, due to snapshot being taken", origMap, returnedObject2);
+    }
+
+    /**
+     * Test that setting an object on a new message which contains non-serializable content results
+     * in an {@link MessageFormatException} being thrown due to failure to encode the object.
+     */
+    @Test
+    public void testSetObjectWithNonSerializableThrowsJMSMFE() throws Exception {
+        Map<String, Object> origMap = new HashMap<String, Object>();
+        origMap.put("key1", "value1");
+        origMap.put("notSerializable", new NotSerializable());
+
+        JmsObjectMessage objectMessage = factory.createObjectMessage();
+
+        try {
+            objectMessage.setObject((Serializable) origMap);
+            fail("Expected exception to be thrown");
+        } catch (MessageFormatException mfe) {
+            // expected
+        }
+    }
+
+    //Test class
+    private static class NotSerializable
+    {
+        public NotSerializable()
+        {
+        }
+    }
+
+    /**
+     * Test that failure during deserialization of an object in a message results
+     * in an {@link MessageFormatException} being throw.
+     */
+    @Test(expected=MessageFormatException.class)
+    public void testGetObjectWithFailedDeserialisationThrowsJMSMFE() throws Exception {
+        JmsObjectMessageFacade facade = Mockito.mock(JmsDefaultObjectMessageFacade.class);
+        Mockito.when(facade.getObject()).thenThrow(new ClassCastException("Failed to get object"));
+        JmsObjectMessage objectMessage = new JmsObjectMessage(facade);
+        objectMessage.getObject();
+    }
+
+    @Test
+    public void testBytes() throws JMSException, IOException {
+        JmsObjectMessage msg = factory.createObjectMessage();
+        String str = "testText";
+        msg.setObject(str);
+
+        msg = msg.copy();
+        assertEquals(msg.getObject(), str);
+    }
+
+    @Test
+    public void testSetObject() throws JMSException {
+        JmsObjectMessage msg = factory.createObjectMessage();
+        String str = "testText";
+        msg.setObject(str);
+        assertEquals(str, msg.getObject());
+    }
+
+    @Test
+    public void testClearBody() throws JMSException {
+        JmsObjectMessage objectMessage = factory.createObjectMessage();
+        try {
+            objectMessage.setObject("String");
+            objectMessage.clearBody();
+            assertFalse(objectMessage.isReadOnlyBody());
+            assertNull(objectMessage.getObject());
+            objectMessage.setObject("String");
+            objectMessage.getObject();
+        } catch (MessageNotWriteableException mnwe) {
+            fail("should be writeable");
+        }
+    }
+
+    @Test
+    public void testReadOnlyBody() throws JMSException {
+        JmsObjectMessage msg = factory.createObjectMessage();
+        msg.setObject("test");
+        msg.setReadOnlyBody(true);
+        try {
+            msg.getObject();
+        } catch (MessageNotReadableException e) {
+            fail("should be readable");
+        }
+        try {
+            msg.setObject("test");
+            fail("should throw exception");
+        } catch (MessageNotWriteableException e) {
+        }
+    }
+
+    @Test
+    public void testWriteOnlyBody() throws JMSException { // should always be readable
+        JmsObjectMessage msg = factory.createObjectMessage();
+        msg.setReadOnlyBody(false);
+        try {
+            msg.setObject("test");
+            msg.getObject();
+        } catch (MessageNotReadableException e) {
+            fail("should be readable");
+        }
+        msg.setReadOnlyBody(true);
+        try {
+            msg.getObject();
+            msg.setObject("test");
+            fail("should throw exception");
+        } catch (MessageNotReadableException e) {
+            fail("should be readable");
+        } catch (MessageNotWriteableException mnwe) {
+        }
+    }
+}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org