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/10/10 23:25:27 UTC

[1/4] git commit: Add test for setType / getType and fix setType to remove the annotation if the value applied is null.

Repository: qpid-jms
Updated Branches:
  refs/heads/master ea1876982 -> df82aeac5


Add test for setType / getType and fix setType to remove the annotation
if the value applied is null.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4b04d693
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4b04d693
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4b04d693

Branch: refs/heads/master
Commit: 4b04d693abcdd336021903bc8cd56ab5588e503d
Parents: ea18769
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 10 15:36:48 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 10 15:36:48 2014 -0400

----------------------------------------------------------------------
 .../amqp/message/AmqpJmsMessageFacade.java      |  6 ++-
 .../amqp/message/AmqpJmsMessageFacadeTest.java  | 51 ++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4b04d693/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index 1fd1048..e7d017f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -534,7 +534,11 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
 
     @Override
     public void setType(String type) {
-        setMessageAnnotation(JMS_TYPE, type);
+        if (type != null) {
+            setMessageAnnotation(JMS_TYPE, type);
+        } else {
+            removeMessageAnnotation(JMS_TYPE);
+        }
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4b04d693/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index 7346559..bee8a92 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -58,6 +58,7 @@ import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
 import org.apache.qpid.proton.amqp.messaging.Properties;
 import org.apache.qpid.proton.codec.impl.DataImpl;
 import org.apache.qpid.proton.message.Message;
+import org.apache.qpid.proton.message.impl.MessageImpl;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -1448,6 +1449,56 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase  {
         assertNull(underlying.getMessageAnnotations());
     }
 
+    // ====== Type =======
+
+    @Test
+    public void testGetJMSTypeIsNullOnNewMessage() throws Exception {
+        AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+        assertNull("did not expect a JMSType value to be present", amqpMessageFacade.getType());
+    }
+
+    @Test
+    public void testSetJMSTypeSetsUnderlyingMessageAnnotation() throws Exception {
+        String jmsType = "myJMSType";
+        AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+        amqpMessageFacade.setType(jmsType);
+
+        assertTrue("MessageAnnotation should exist to hold JMSType value",
+            amqpMessageFacade.messageAnnotationExists(AmqpMessageSupport.JMS_TYPE));
+        assertEquals("MessageAnnotation should be set to the provded JMSType string", jmsType,
+            amqpMessageFacade.getMessageAnnotation(AmqpMessageSupport.JMS_TYPE));
+    }
+
+    @Test
+    public void testSetTypeNullClearsExistingValue() throws Exception {
+        String jmsType = "myJMSType";
+        AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+        amqpMessageFacade.setType(jmsType);
+        assertTrue("MessageAnnotation should exist to hold JMSType value",
+            amqpMessageFacade.messageAnnotationExists(AmqpMessageSupport.JMS_TYPE));
+        amqpMessageFacade.setType(null);
+        assertNull("JMSType value was not as expected", amqpMessageFacade.getType());
+        assertFalse("MessageAnnotation should exist to hold JMSType value",
+            amqpMessageFacade.messageAnnotationExists(AmqpMessageSupport.JMS_TYPE));
+    }
+
+    /**
+     * Test that {@link MessageImpl#getJMSType()} returns the expected value for a message
+     * received with the {@link ClientProperties#X_OPT_JMS_TYPE} message annotation set.
+     */
+    @Test
+    public void testGetJMSTypeWithReceivedMessage() throws Exception {
+        String myJMSType = "myJMSType";
+
+        Message message = Proton.message();
+        Map<Symbol, Object> annotationsMap = new HashMap<Symbol, Object>();
+        annotationsMap.put(Symbol.valueOf(AmqpMessageSupport.JMS_TYPE), myJMSType);
+        message.setMessageAnnotations(new MessageAnnotations(annotationsMap));
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        assertEquals("JMSType value was not as expected", myJMSType, amqpMessageFacade.getType());
+    }
 
     // ====== AMQP Application Properties =======
     // ==========================================


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


[3/4] git commit: Add some testing and some notes about cleanup of delivery / redelivery count methods in the message facades.

Posted by ta...@apache.org.
Add some testing and some notes about cleanup of delivery / redelivery
count methods in the message facades.

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a52e142c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a52e142c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a52e142c

Branch: refs/heads/master
Commit: a52e142cabb7f73a54d96e3613e176d1b79eb6bb
Parents: a7907e0
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 10 16:38:33 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 10 16:38:33 2014 -0400

----------------------------------------------------------------------
 .../amqp/message/AmqpJmsMessageFacade.java      |   8 ++
 .../amqp/message/AmqpJmsMessageFacadeTest.java  | 119 +++++++++++++++++++
 2 files changed, 127 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a52e142c/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
index e7d017f..84dac97 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacade.java
@@ -486,6 +486,14 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
         setRedeliveryCount(deliveryCount - 1);
     }
 
+    // TODO - We can probably remove these set / get redelivery count and just use
+    //        the delivery count and is / set redelivered bits for the JMS mapping.
+    //
+    // possibly add an increment to make the consumer code more readable when doing
+    // a recover or rollback if we do local redeliveries.
+    //
+    //  public void incrementRedeliveryCount()
+
     @Override
     public int getRedeliveryCount() {
         if (message.getHeader() != null) {

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a52e142c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index 7acc3d5..8faf7e1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -201,6 +201,125 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase  {
         assertEquals("TTL has not been overriden", overrideTtl, message.getTtl());
     }
 
+    // --- delivery count  ---
+
+    @Test
+    public void testGetDeliveryCountIs1ForNewMessage() {
+        AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+        // JMS delivery count starts at one.
+        assertEquals("expected delivery count value not found", 1, amqpMessageFacade.getDeliveryCount());
+
+        // Redelivered state inferred from delivery count
+        assertFalse(amqpMessageFacade.isRedelivered());
+        assertEquals(0, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testGetDeliveryCountForReceivedMessageWithNoHeader() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        assertNull("expected no header section to exist", message.getHeader());
+        // JMS delivery count starts at one.
+        assertEquals("expected delivery count value not found", 1, amqpMessageFacade.getDeliveryCount());
+
+        // Redelivered state inferred from delivery count
+        assertFalse(amqpMessageFacade.isRedelivered());
+        assertEquals(0, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testGetDeliveryCountForReceivedMessageWithHeaderButNoDeliveryCount() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        Header header = new Header();
+        message.setHeader(header);
+
+        // JMS delivery count starts at one.
+        assertEquals("expected delivery count value not found", 1, amqpMessageFacade.getDeliveryCount());
+
+        // Redelivered state inferred from delivery count
+        assertFalse(amqpMessageFacade.isRedelivered());
+        assertEquals(0, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testGetDeliveryCountForReceivedMessageWithHeaderWithDeliveryCount() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        Header header = new Header();
+        header.setDeliveryCount(new UnsignedInteger(1));
+        message.setHeader(header);
+
+        // JMS delivery count starts at one.
+        assertEquals("expected delivery count value not found", 2, amqpMessageFacade.getDeliveryCount());
+
+        // Redelivered state inferred from delivery count
+        assertTrue(amqpMessageFacade.isRedelivered());
+        assertEquals(1, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testSetRedeliveredAltersDeliveryCount() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        // Redelivered state inferred from delivery count
+        assertFalse(amqpMessageFacade.isRedelivered());
+        assertEquals(0, amqpMessageFacade.getRedeliveryCount());;
+
+        amqpMessageFacade.setRedelivered(true);
+        assertTrue(amqpMessageFacade.isRedelivered());
+        assertEquals(1, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testSetRedeliveredWhenAlreadyRedeliveredDoesNotChangeDeliveryCount() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        Header header = new Header();
+        header.setDeliveryCount(new UnsignedInteger(1));
+        message.setHeader(header);
+
+        // Redelivered state inferred from delivery count
+        assertTrue(amqpMessageFacade.isRedelivered());
+        assertEquals(1, amqpMessageFacade.getRedeliveryCount());;
+
+        amqpMessageFacade.setRedelivered(true);
+        assertTrue(amqpMessageFacade.isRedelivered());
+        assertEquals(1, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testSetRedeliveredFalseClearsDeliveryCount() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+        Header header = new Header();
+        header.setDeliveryCount(new UnsignedInteger(1));
+        message.setHeader(header);
+
+        // Redelivered state inferred from delivery count
+        assertTrue(amqpMessageFacade.isRedelivered());
+        assertEquals(1, amqpMessageFacade.getRedeliveryCount());;
+
+        amqpMessageFacade.setRedelivered(false);
+        assertFalse(amqpMessageFacade.isRedelivered());
+        assertEquals(0, amqpMessageFacade.getRedeliveryCount());;
+    }
+
+    @Test
+    public void testSetRedeliveryCountToZeroWhenNoHeadersNoNPE() {
+        Message message = Proton.message();
+        AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+        assertNull("expected no header section to exist", message.getHeader());
+        amqpMessageFacade.setRedeliveryCount(0);
+    }
+
     // --- priority field  ---
 
     @Test


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


[4/4] git commit: Cover text message code with tests for isEmpty

Posted by ta...@apache.org.
Cover text message code with tests for isEmpty

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/df82aeac
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/df82aeac
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/df82aeac

Branch: refs/heads/master
Commit: df82aeac53def5726ebeaa7d83b07e88ebb19ec7
Parents: a52e142
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 10 17:22:39 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 10 17:22:39 2014 -0400

----------------------------------------------------------------------
 .../amqp/message/AmqpJmsTextMessageFacade.java  |  2 +
 .../message/AmqpJmsTextMessageFacadeTest.java   | 69 ++++++++++++++++++--
 2 files changed, 67 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/df82aeac/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java
index e1da812..6a4850e 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacade.java
@@ -160,6 +160,8 @@ public class AmqpJmsTextMessageFacade extends AmqpJmsMessageFacade implements Jm
             if (data.getValue() == null || data.getValue().getLength() == 0) {
                 return true;
             }
+        } else {
+            return true;  // This should never happen but report empty in case
         }
 
         return false;

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/df82aeac/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacadeTest.java
index d7cecca..e4169eb 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsTextMessageFacadeTest.java
@@ -80,6 +80,71 @@ public class AmqpJmsTextMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
     }
 
     @Test
+    public void testMessageWithNullBodyRetportsIsEmpty() throws Exception {
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createNewTextMessageFacade();
+        amqpTextMessageFacade.getAmqpMessage().setBody(null);
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testIsEmptyUsingReceivedMessageWithZeroLengthDataSection() throws Exception {
+        org.apache.qpid.proton.codec.Data payloadData = new DataImpl();
+        payloadData.putDescribedType(new DataDescribedType(new Binary(new byte[0])));
+        Binary b = payloadData.encode();
+
+        Message message = Message.Factory.create();
+        int decoded = message.decode(b.getArray(), b.getArrayOffset(), b.getLength());
+        assertEquals(decoded, b.getLength());
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testMessageWithEmptyDataRetportsIsEmpty() throws Exception {
+        Message message = Message.Factory.create();
+        message.setBody(new Data(null));
+
+        // This shouldn't happen with actual received messages, since Data sections can't really
+        // have a null value in them, they would have an empty byte array, but just in case...
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testMessageWithEmptyDataBinaryRetportsIsEmpty() throws Exception {
+        Message message = Message.Factory.create();
+        message.setBody(new Data(new Binary(new byte[0])));
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testMessageWithNonEmptyDataBinaryRetportsIsEmpty() throws Exception {
+        Message message = Message.Factory.create();
+        message.setBody(new Data(new Binary(new byte[1])));
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+        assertFalse(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testMessageWithEmptyAmqpValueStringRetportsIsEmpty() throws Exception {
+        Message message = Message.Factory.create();
+        message.setBody(new AmqpValue(""));
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
+    public void testMessageWithUnexpectedContentsReturnsEmpty() throws Exception {
+        Message message = Message.Factory.create();
+        message.setBody(new AmqpSequence(null));
+        AmqpJmsTextMessageFacade amqpTextMessageFacade = createReceivedTextMessageFacade(createMockAmqpConsumer(), message);
+        assertTrue(amqpTextMessageFacade.isEmpty());
+    }
+
+    @Test
     public void testNewMessageToSendReturnsNullText() throws Exception {
         AmqpJmsTextMessageFacade amqpTextMessageFacade = createNewTextMessageFacade();
         amqpTextMessageFacade.clearBody();
@@ -186,8 +251,6 @@ public class AmqpJmsTextMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
         payloadData.putDescribedType(new DataDescribedType(new Binary(new byte[0])));
         Binary b = payloadData.encode();
 
-        System.out.println("Using encoded AMQP message payload: " + b);
-
         Message message = Message.Factory.create();
         int decoded = message.decode(b.getArray(), b.getArrayOffset(), b.getLength());
         assertEquals(decoded, b.getLength());
@@ -205,8 +268,6 @@ public class AmqpJmsTextMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
         payloadData.putDescribedType(new DataDescribedType(new Binary(encodedBytes)));
         Binary b = payloadData.encode();
 
-        System.out.println("Using encoded AMQP message payload: " + b);
-
         Message message = Message.Factory.create();
         int decoded = message.decode(b.getArray(), b.getArrayOffset(), b.getLength());
         assertEquals(decoded, b.getLength());


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


[2/4] git commit: Add additional check to ensure that when the value is null we don't NPE

Posted by ta...@apache.org.
Add additional check to ensure that when the value is null we don't NPE

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a7907e09
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a7907e09
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a7907e09

Branch: refs/heads/master
Commit: a7907e0981bc8f0d332c88a1f19e937135bda5d4
Parents: 4b04d69
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Oct 10 15:55:05 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Oct 10 15:55:05 2014 -0400

----------------------------------------------------------------------
 .../qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a7907e09/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index bee8a92..7acc3d5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -141,6 +141,7 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase  {
         AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
 
         assertFalse("Should not have a ttl override", amqpMessageFacade.hasAmqpTimeToLiveOverride());
+        assertEquals(0, amqpMessageFacade.getAmqpTimeToLiveOverride());
 
         amqpMessageFacade.setAmqpTimeToLiveOverride(ttl);
 


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