You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/10/06 18:40:03 UTC
[1/3] git commit: ignore test for now,
handling not implemented. Add related note.
Repository: qpid-jms
Updated Branches:
refs/heads/master dd00b90e5 -> 7a7bec710
ignore test for now, handling not implemented. Add related note.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/7a7bec71
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/7a7bec71
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/7a7bec71
Branch: refs/heads/master
Commit: 7a7bec710e10eb5fba749dce1663594ce673b847
Parents: 37871f0
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 17:31:25 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 17:32:44 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/jms/message/JmsMessage.java | 1 +
.../qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7a7bec71/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
index d170e3b..24cdc5a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessage.java
@@ -238,6 +238,7 @@ public class JmsMessage implements javax.jms.Message {
public void setJMSPriority(int priority) throws JMSException {
byte scaled = 0;
+ //TODO: should we leave this to the facade to do if it wants? We simply trust its return value.
if (priority < 0) {
scaled = 0;
} else if (priority > 9) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/7a7bec71/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 80d9cff..2b7e476 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
@@ -55,6 +55,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.junit.Ignore;
import org.junit.Test;
import org.mockito.Mockito;
@@ -272,6 +273,7 @@ public class AmqpJmsMessageFacadeTest {
* When messages have a header section, which have a priority value outside the JMS range, ensure it is constrained.
*/
@Test
+ @Ignore //TODO: currently we aren't ensuring we map the value into the JMS range
public void testGetPriorityForReceivedMessageWithPriorityOutsideJmsRange() {
// value over 9 deliberately
byte priority = 11;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] git commit: add unit tests for AmqpJmsMessageFacade handling of
AMQP header
Posted by ro...@apache.org.
add unit tests for AmqpJmsMessageFacade handling of AMQP header
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/37871f02
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/37871f02
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/37871f02
Branch: refs/heads/master
Commit: 37871f0209562367d65134f8e2456bdc1d06193b
Parents: 375278b
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 17:29:54 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 17:32:44 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacadeTest.java | 214 +++++++++++++++++++
1 file changed, 214 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/37871f02/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 14cefa2..80d9cff 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
@@ -22,6 +22,7 @@ package org.apache.qpid.jms.provider.amqp.message;
import static org.junit.Assert.assertArrayEquals;
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.assertSame;
@@ -46,7 +47,10 @@ import org.apache.qpid.jms.test.testpeer.describedtypes.sections.PropertiesDescr
import org.apache.qpid.proton.Proton;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedByte;
+import org.apache.qpid.proton.amqp.UnsignedInteger;
import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.messaging.Header;
import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
import org.apache.qpid.proton.amqp.messaging.Properties;
import org.apache.qpid.proton.codec.impl.DataImpl;
@@ -96,9 +100,219 @@ public class AmqpJmsMessageFacadeTest {
amqpMessageFacade.setAmqpTimeToLiveOverride(0X100000000L);
}
+
+ /**
+ * To satisfy the JMS requirement that messages are durable by default, the
+ * {@link AmqpJmsMessageFacade} objects created for sending new messages are
+ * populated with a header section with durable set to true.
+ */
+ @Test
+ public void testNewMessageHasUnderlyingHeaderSectionWithDurableTrue() {
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ Message underlying = amqpMessageFacade.getAmqpMessage();
+ assertNotNull("Expected message to have Header section", underlying.getHeader());
+ assertTrue("Durable not as expected", underlying.getHeader().getDurable());
+ }
+
+ @Test
+ public void testNewMessageHasUnderlyingHeaderSectionWithNoTtlSet() {
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ Message underlying = amqpMessageFacade.getAmqpMessage();
+ assertNotNull("Expected message to have Header section", underlying.getHeader());
+ assertNull("Ttl field should not be set", underlying.getHeader().getTtl());
+ }
+
+ @Test
+ public void testGetTtlSynthesizedExpirationOnReceivedMessageWithTtlButNoAbsoluteExpiration() {
+ Long ttl = 123L;
+
+ Message message = Proton.message();
+ Header header = new Header();
+ header.setTtl(UnsignedInteger.valueOf(ttl));
+ message.setHeader(header);
+
+ long start = System.currentTimeMillis();
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+ long end = System.currentTimeMillis();
+
+ long expiration = amqpMessageFacade.getExpiration();
+
+ assertTrue("Should have sythesized expiration based on current time + ttl", start + ttl <= expiration);
+ assertTrue("Should have sythesized expiration based on current time + ttl", expiration <= end + ttl);
+
+ long expiration2 = amqpMessageFacade.getExpiration();
+ assertEquals("Second retrieval should return same result", expiration, expiration2);
+ }
+
+ @Test
+ public void testSetGetTtlOverrideOnNewMessage() throws Exception {
+ long ttl = 123L;
+
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ assertFalse("Should not have a ttl override", amqpMessageFacade.hasAmqpTimeToLiveOverride());
+
+ amqpMessageFacade.setAmqpTimeToLiveOverride(ttl);
+
+ assertTrue("Should have a ttl override", amqpMessageFacade.hasAmqpTimeToLiveOverride());
+ assertEquals(ttl, amqpMessageFacade.getAmqpTimeToLiveOverride());
+ // check value on underlying TTL field is NOT set
+ assertNull("TTL field on underlying message should NOT be set", amqpMessageFacade.getAmqpMessage().getHeader().getTtl());
+ }
+
+ @Test
+ public void testOnSendClearsTtlOnMessageReceivedWithTtl() throws Exception {
+ Message message = Proton.message();
+ int origTtl = 5;
+ message.setTtl(origTtl);
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("TTL has been unset already", origTtl, message.getTtl());
+
+ amqpMessageFacade.onSend(false, false, 0);
+
+ // check value on underlying TTL field is NOT set
+ assertEquals("TTL has not been cleared", 0, message.getTtl());
+ assertNull("TTL field on underlying message should NOT be set", amqpMessageFacade.getAmqpMessage().getHeader().getTtl());
+ }
+
+ @Test
+ public void testOnSendOverridesTtlOnMessageReceivedWithTtl() throws Exception {
+ Message message = Proton.message();
+ int origTtl = 5;
+ int newTtl = 10;
+ message.setTtl(origTtl);
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("TTL has been unset already", origTtl, message.getTtl());
+
+ amqpMessageFacade.onSend(false, false, newTtl);
+
+ // check value on underlying TTL field is NOT set
+ assertEquals("TTL has not been overriden", newTtl, message.getTtl());
+ assertEquals("TTL field on underlying message should be set", UnsignedInteger.valueOf(newTtl), amqpMessageFacade.getAmqpMessage().getHeader().getTtl());
+ }
+
+ @Test
+ public void testOnSendOverridesProviderTtlWithSpecifiedOverrideTtl() throws Exception {
+ Message message = Proton.message();
+ int overrideTtl = 5;
+ int producerTtl = 10;
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+ amqpMessageFacade.setAmqpTimeToLiveOverride(overrideTtl);
+
+ amqpMessageFacade.onSend(false, false, producerTtl);
+
+ // check value on underlying TTL field is set to the override
+ assertEquals("TTL has not been overriden", overrideTtl, message.getTtl());
+ }
+
+
+ @Test
+ public void testGetPriorityIs4ForNewMessage() {
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ assertEquals("expected priority value not found", 4, amqpMessageFacade.getPriority());
+ }
+
+ /**
+ * When messages have no header section, the AMQP spec says the priority has default value of 4.
+ */
+ @Test
+ public void testGetPriorityIs4ForReceivedMessageWithNoHeader() {
+ Message message = Proton.message();
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertNull("expected no header section to exist", message.getHeader());
+ assertEquals("expected priority value not found", 4, amqpMessageFacade.getPriority());
+ }
+
+ // TODO: start of section marker
+
+ /**
+ * When messages have a header section, but lack the priority field,
+ * the AMQP spec says the priority has default value of 4.
+ */
+ @Test
+ public void testGetPriorityIs4ForReceivedMessageWithHeaderButWithoutPriority() {
+ Message message = Proton.message();
+
+ Header header = new Header();
+ message.setHeader(header);
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("expected priority value not found", 4, amqpMessageFacade.getPriority());
+ }
+
+ /**
+ * When messages have a header section, which have a priority value, ensure it is returned.
+ */
+ @Test
+ public void testGetPriorityForReceivedMessageWithHeaderWithPriority() {
+ // value over 10 deliberately
+ byte priority = 7;
+
+ Message message = Proton.message();
+ Header header = new Header();
+ message.setHeader(header);
+ header.setPriority(UnsignedByte.valueOf(priority));
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("expected priority value not found", priority, amqpMessageFacade.getPriority());
+ }
+
+ /**
+ * When messages have a header section, which have a priority value outside the JMS range, ensure it is constrained.
+ */
+ @Test
+ public void testGetPriorityForReceivedMessageWithPriorityOutsideJmsRange() {
+ // value over 9 deliberately
+ byte priority = 11;
+
+ Message message = Proton.message();
+ Header header = new Header();
+ message.setHeader(header);
+ header.setPriority(UnsignedByte.valueOf(priority));
+
+ AmqpJmsMessageFacade amqpMessageFacade = createReceivedMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("expected priority value not found", 9, amqpMessageFacade.getPriority());
+ }
+
+ /**
+ * Test that setting the Priority to a non-default value results in the underlying
+ * message field being populated appropriately, and the value being returned from the Getter.
+ */
+ @Test
+ public void testSetGetNonDefaultPriorityForNewMessage() {
+ byte priority = 6;
+
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+ amqpMessageFacade.setPriority(priority);
+
+ assertEquals("expected priority value not found", priority, amqpMessageFacade.getPriority());
+
+ Message underlying = amqpMessageFacade.getAmqpMessage();
+ assertEquals("expected priority value not found", priority, underlying.getPriority());
+ }
+
// ====== AMQP Properties Section =======
// ======================================
+ @Test
+ public void testGetExpirationIsZeroForNewMessage() {
+ AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
+
+ assertEquals("Expected no expiration", 0, amqpMessageFacade.getExpiration());
+ }
+
// --- message-id and correlation-id ---
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] git commit: rename methods for clarity
Posted by ro...@apache.org.
rename methods for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/375278b9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/375278b9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/375278b9
Branch: refs/heads/master
Commit: 375278b9dbbb6a0c3ddcd1924b1689fca23726f1
Parents: dd00b90
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 16:34:22 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 17:32:44 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageFacade.java | 18 +++++++++++++-----
.../AmqpJmsMessagePropertyIntercepter.java | 8 ++++----
.../amqp/message/AmqpJmsMessageFacadeTest.java | 6 +++---
.../AmqpJmsMessagePropertyIntercepterTest.java | 10 +++++-----
4 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/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 55671df..e8a170c 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
@@ -215,8 +215,8 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
// Set the ttl field of the Header field if needed, complementing the expiration
// field of Properties for any peers that only inspect the mutable ttl field.
long ttl = 0;
- if (hasUserSpecifiedTimeToLive()) {
- ttl = getAmqpTimeToLive();
+ if (hasAmqpTimeToLiveOverride()) {
+ ttl = getAmqpTimeToLiveOverride();
} else {
ttl = producerTtl;
}
@@ -597,7 +597,15 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
- public void setAmqpTimeToLive(long ttl) throws MessageFormatException {
+ /**
+ * Sets a value which will be used to override any ttl value that may otherwise be set
+ * based on the expiration value when sending the underlying AMQP message. A value of 0
+ * means to clear the ttl field rather than set it to anything.
+ *
+ * @param ttl the value to use, in range 0 <= x <= 2^32 - 1
+ * @throws MessageFormatException
+ */
+ public void setAmqpTimeToLiveOverride(long ttl) throws MessageFormatException {
if (ttl >= 0 && ttl <= UINT_MAX) {
userSpecifiedTTL = ttl;
} else {
@@ -605,11 +613,11 @@ public class AmqpJmsMessageFacade implements JmsMessageFacade {
}
}
- public boolean hasUserSpecifiedTimeToLive() {
+ public boolean hasAmqpTimeToLiveOverride() {
return userSpecifiedTTL != null;
}
- public long getAmqpTimeToLive() {
+ public long getAmqpTimeToLiveOverride() {
return userSpecifiedTTL != null ? userSpecifiedTTL : 0;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
index c9607aa..530904f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepter.java
@@ -88,8 +88,8 @@ public class AmqpJmsMessagePropertyIntercepter {
PROPERTY_INTERCEPTERS.put(JMS_AMQP_TTL, new PropertyIntercepter() {
@Override
public Object getProperty(AmqpJmsMessageFacade message) throws JMSException {
- if (message.hasUserSpecifiedTimeToLive()) {
- return message.getAmqpTimeToLive();
+ if (message.hasAmqpTimeToLiveOverride()) {
+ return message.getAmqpTimeToLiveOverride();
}
return null;
}
@@ -100,12 +100,12 @@ public class AmqpJmsMessagePropertyIntercepter {
if (rc == null) {
throw new JMSException("Property " + JMS_AMQP_TTL + " cannot be set from a " + value.getClass().getName() + ".");
}
- message.setAmqpTimeToLive(rc.longValue());
+ message.setAmqpTimeToLiveOverride(rc.longValue());
}
@Override
public boolean propertyExists(AmqpJmsMessageFacade message) {
- return message.hasUserSpecifiedTimeToLive();
+ return message.hasAmqpTimeToLiveOverride();
}
});
PROPERTY_INTERCEPTERS.put(JMS_AMQP_REPLY_TO_GROUP_ID, new PropertyIntercepter() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/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 b3c8af1..14cefa2 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
@@ -86,14 +86,14 @@ public class AmqpJmsMessageFacadeTest {
public void testSetAmqpTimeToLiveRejectsNegatives() throws Exception {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
- amqpMessageFacade.setAmqpTimeToLive(-1L);
+ amqpMessageFacade.setAmqpTimeToLiveOverride(-1L);
}
@Test(expected = MessageFormatException.class)
public void testSetAmqpTimeToLiveRejectsValuesFromTwoToThirtyTwo() throws Exception {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
// check values over 2^32 - 1 are rejected
- amqpMessageFacade.setAmqpTimeToLive(0X100000000L);
+ amqpMessageFacade.setAmqpTimeToLiveOverride(0X100000000L);
}
// ====== AMQP Properties Section =======
@@ -513,7 +513,7 @@ public class AmqpJmsMessageFacadeTest {
AmqpJmsMessageFacade source = createNewMessageFacade();
long amqpTtl = 17L;
- source.setAmqpTimeToLive(amqpTtl);
+ source.setAmqpTimeToLiveOverride(amqpTtl);
AmqpJmsMessageFacade copy = source.copy();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/375278b9/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
index 972622b..d835eb5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessagePropertyIntercepterTest.java
@@ -49,14 +49,14 @@ public class AmqpJmsMessagePropertyIntercepterTest {
public void testSetJmsAmqpTtl() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
AmqpJmsMessagePropertyIntercepter.setProperty(message, JMS_AMQP_TTL, 65536L);
- Mockito.verify(message).setAmqpTimeToLive(65536L);
+ Mockito.verify(message).setAmqpTimeToLiveOverride(65536L);
}
@Test
public void testGetJmsAmqpTtlWhenSet() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
- Mockito.when(message.hasUserSpecifiedTimeToLive()).thenReturn(true);
- Mockito.when(message.getAmqpTimeToLive()).thenReturn(65536L);
+ Mockito.when(message.hasAmqpTimeToLiveOverride()).thenReturn(true);
+ Mockito.when(message.getAmqpTimeToLiveOverride()).thenReturn(65536L);
assertNotNull(AmqpJmsMessagePropertyIntercepter.getProperty(message, JMS_AMQP_TTL));
assertEquals(65536L, AmqpJmsMessagePropertyIntercepter.getProperty(message, JMS_AMQP_TTL));
@@ -72,8 +72,8 @@ public class AmqpJmsMessagePropertyIntercepterTest {
@Test
public void testJmsAmqpTtlInPropertyNamesWhenSet() throws JMSException {
AmqpJmsMessageFacade message = Mockito.mock(AmqpJmsMessageFacade.class);
- Mockito.when(message.hasUserSpecifiedTimeToLive()).thenReturn(true);
- Mockito.when(message.getAmqpTimeToLive()).thenReturn(65536L);
+ Mockito.when(message.hasAmqpTimeToLiveOverride()).thenReturn(true);
+ Mockito.when(message.getAmqpTimeToLiveOverride()).thenReturn(65536L);
assertTrue(AmqpJmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_AMQP_TTL));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org