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/30 17:35:31 UTC
git commit: More property intercepter tests and some fixes.
Repository: qpid-jms
Updated Branches:
refs/heads/master 560e6fbd6 -> cd51c357f
More property intercepter tests and some fixes.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cd51c357
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cd51c357
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cd51c357
Branch: refs/heads/master
Commit: cd51c357f21fa7022487dde2317c92a5934fb08d
Parents: 560e6fb
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 30 11:34:59 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 30 11:35:05 2014 -0400
----------------------------------------------------------------------
.../message/JmsMessagePropertyIntercepter.java | 8 +-
.../JmsMessagePropertyIntercepterTest.java | 188 +++++++++++++++++++
2 files changed, 192 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd51c357/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
index 6b2d3e3..123f04d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepter.java
@@ -287,7 +287,7 @@ public class JmsMessagePropertyIntercepter {
@Override
public boolean propertyExists(JmsMessageFacade message) {
- return true;
+ return message.getTimestamp() > 0;
}
});
PROPERTY_INTERCEPTERS.put(JMS_CORRELATIONID, new PropertyIntercepter() {
@@ -327,7 +327,7 @@ public class JmsMessagePropertyIntercepter {
@Override
public boolean propertyExists(JmsMessageFacade message) {
- return true;
+ return message.getExpiration() > 0;
}
});
PROPERTY_INTERCEPTERS.put(JMS_REDELIVERED, new PropertyIntercepter() {
@@ -347,7 +347,7 @@ public class JmsMessagePropertyIntercepter {
@Override
public boolean propertyExists(JmsMessageFacade message) {
- return true;
+ return message.isRedelivered();
}
});
PROPERTY_INTERCEPTERS.put(JMSX_GROUPID, new PropertyIntercepter() {
@@ -387,7 +387,7 @@ public class JmsMessagePropertyIntercepter {
@Override
public boolean propertyExists(JmsMessageFacade message) {
- return true;
+ return message.getGroupId() != null;
}
});
PROPERTY_INTERCEPTERS.put(JMSX_USERID, new PropertyIntercepter() {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd51c357/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
index f469956..a5d53e7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java
@@ -36,6 +36,7 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import javax.jms.JMSException;
+import javax.jms.Message;
import org.apache.qpid.jms.JmsDestination;
import org.apache.qpid.jms.JmsQueue;
@@ -75,6 +76,20 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setDestination(queue);
}
+ @Test
+ public void testJMSDestinationInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ JmsDestination queue = new JmsQueue("TestDestination");
+ Mockito.when(message.getDestination()).thenReturn(queue);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_DESTINATION));
+ }
+
+ @Test
+ public void testJMSDestinationNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_DESTINATION));
+ }
+
//---------- JMSReplyTo --------------------------------------------------//
@Test
@@ -105,6 +120,20 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setReplyTo(queue);
}
+ @Test
+ public void testJMSReplyToInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ JmsDestination queue = new JmsQueue("TestDestination");
+ Mockito.when(message.getReplyTo()).thenReturn(queue);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_REPLYTO));
+ }
+
+ @Test
+ public void testJMSReplyToNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_REPLYTO));
+ }
+
//---------- JMSType -----------------------------------------------------//
@Test
@@ -133,6 +162,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setType("SomeType");
}
+ @Test
+ public void testJMSTypeInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getType()).thenReturn("SomeType");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_TYPE));
+ }
+
+ @Test
+ public void testJMSTypeNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_TYPE));
+ }
+
//---------- JMSDeliveryMode ---------------------------------------------//
@Test
@@ -184,6 +226,20 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.reset(message);
}
+ @Test
+ public void testJMSDeliveryModeInGetPropertyNamesWhenPersistent() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.isPersistent()).thenReturn(true);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_DELIVERY_MODE));
+ }
+
+ @Test
+ public void testJMSDeliveryModeInGetPropertyNamesWhenNotPersistent() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.isPersistent()).thenReturn(false);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_DELIVERY_MODE));
+ }
+
//---------- JMSPriority ---------------------------------------------//
@Test
@@ -213,6 +269,20 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setPriority((byte) 9);
}
+ @Test
+ public void testJMSPriorityInGetPropertyNamesWhenDefault() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getPriority()).thenReturn((byte) Message.DEFAULT_PRIORITY);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_PRIORITY));
+ }
+
+ @Test
+ public void testJMSPriorityInGetPropertyNamesWhenNotDefault() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getPriority()).thenReturn((byte) 1);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_PRIORITY));
+ }
+
//---------- JMSMessageID ---------------------------------------------//
@Test
@@ -241,6 +311,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setMessageId("ID:123456-789");
}
+ @Test
+ public void testJMSMessageIDInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getMessageId()).thenReturn("MESSAGE_ID");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_MESSAGEID));
+ }
+
+ @Test
+ public void testJMSMessageIDNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_MESSAGEID));
+ }
+
//---------- JMSTimestamp ---------------------------------------------//
@Test
@@ -270,6 +353,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setTimestamp(65536L);
}
+ @Test
+ public void testJMSTimeStampInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getTimestamp()).thenReturn(900L);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_TIMESTAMP));
+ }
+
+ @Test
+ public void testJMSTimeStampNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_TIMESTAMP));
+ }
+
//---------- JMSCorrelationID ---------------------------------------------//
@Test
@@ -298,6 +394,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setCorrelationId("ID:123456-789");
}
+ @Test
+ public void testJMSCorrelationIDInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getCorrelationId()).thenReturn("MESSAGE_ID");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_CORRELATIONID));
+ }
+
+ @Test
+ public void testJMSCorrelationIDNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_CORRELATIONID));
+ }
+
//---------- JMSExpiration ---------------------------------------------//
@Test
@@ -327,6 +436,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setExpiration(65536L);
}
+ @Test
+ public void testJMSExpirationInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getExpiration()).thenReturn(900L);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_EXPIRATION));
+ }
+
+ @Test
+ public void testJMSExpirationNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_EXPIRATION));
+ }
+
//---------- JMSRedelivered ---------------------------------------------//
@Test
@@ -364,6 +486,20 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setRedelivered(false);
}
+ @Test
+ public void testJMSRedeliveredInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.isRedelivered()).thenReturn(true);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_REDELIVERED));
+ }
+
+ @Test
+ public void testJMSRedeliveredNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.isRedelivered()).thenReturn(false);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMS_REDELIVERED));
+ }
+
//---------- JMSXGroupID ---------------------------------------------//
@Test
@@ -392,6 +528,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setGroupId("MyGroupID");
}
+ @Test
+ public void testJMSXGroupIDInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getGroupId()).thenReturn("GROUP_ID");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_GROUPID));
+ }
+
+ @Test
+ public void testJMSXGroupIDNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_GROUPID));
+ }
+
//---------- JMSXGroupSeq ---------------------------------------------//
@Test
@@ -420,6 +569,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setGroupSequence(65536);
}
+ @Test
+ public void testJMSXGroupSeqInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getGroupId()).thenReturn("GROUP_ID");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_GROUPSEQ));
+ }
+
+ @Test
+ public void testJMSXGroupSeqNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_GROUPSEQ));
+ }
+
//---------- JMSXDeliveryCount ---------------------------------------------//
@Test
@@ -448,6 +610,19 @@ public class JmsMessagePropertyIntercepterTest {
Mockito.verify(message).setRedeliveryCounter(32767);
}
+ @Test
+ public void testJMSXDeliveryCountInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getRedeliveryCounter()).thenReturn(2);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_DELIVERY_COUNT));
+ }
+
+ @Test
+ public void testJMSXDeliveryCountInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_DELIVERY_COUNT));
+ }
+
//---------- JMSXUserID ---------------------------------------------//
@Test
@@ -475,4 +650,17 @@ public class JmsMessagePropertyIntercepterTest {
JmsMessagePropertyIntercepter.setProperty(message, JMSX_USERID, "Administrator");
Mockito.verify(message).setUserId("Administrator");
}
+
+ @Test
+ public void testJMSXUserIdCountInGetPropertyNamesWhenSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ Mockito.when(message.getUserId()).thenReturn("Administrator");
+ assertTrue(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_USERID));
+ }
+
+ @Test
+ public void testJMSXUserIdNotInGetPropertyNamesWhenNotSet() throws JMSException {
+ JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class);
+ assertFalse(JmsMessagePropertyIntercepter.getPropertyNames(message).contains(JMSX_USERID));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org